diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:16 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:16 +0200 |
| commit | 0553d10867217e30a86c88c17ccb15a06030ce07 (patch) | |
| tree | 4d85a5a78ea132f8fd53b26ce93e94ae30dad1f9 | |
| parent | d0ac8f1e7866c637be15f081b59ef456aacb954a (diff) | |
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit c0de36f21ef8f0afd7667f53a5d97dbc264a1cfb (tag: refs/tags/OOO_BUILD_3_2_98_1)
Author: Petr Mladek <pmladek@walk.suse.cz>
Date: Wed Sep 15 19:03:26 2010 +0200
Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1)
commit e31a45314a5a2f1e7e2bbea4a2bb6eca7beb7962
Merge: 7234327 29a7259
Author: Jan Holesovsky <kendy@suse.cz>
Date: Wed Sep 8 11:34:03 2010 +0200
Merge commit 'ooo/OOO330_m7'
commit 29a72592b0046498a30e87a7beedae4d29161f9b (tag: refs/tags/ooo/OOO330_m7)
Merge: 10146e0 6b04480
Author: Kurt Zenker <kz@openoffice.org>
Date: Tue Aug 31 15:10:03 2010 +0200
CWS-TOOLING: integrate CWS impress197
commit 6b04480dd88a5bd048d12874dc8c07630670c239
Author: sj <sj@openoffice.org>
Date: Mon Aug 9 14:11:58 2010 +0200
impress197: #163250# fixed string handling, improved polygon splitting
sd/source/filter/ppt/propread.cxx | 128 ++++++++++++++++++++++++-------------
1 files changed, 83 insertions(+), 45 deletions(-)
commit a37d85f979d1616b158c918762821ed82b1e0691
Merge: 1380a03 d766efe
Author: Christian Lippka <christian.lippka@sun.com>
Date: Fri Aug 6 14:53:07 2010 +0200
merge
commit 1380a03aaf7464643eb99de1488ab5b372663ccd
Author: Christian Lippka <christian.lippka@sun.com>
Date: Wed Aug 4 10:48:35 2010 +0200
#i113603# only change layout shape size on init or of user call is set
sd/source/core/sdpage.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit d766efe9f601a65cd22b46e0f4131d9acd74b1a8
Author: Andre Fischer<andre.f.fischer <Andre Fischer<andre.f.fischer@oracle.com>
Date: Thu Jan 1 00:00:00 1970 +0000
impress197: #i112420# Create accessibility object of ToolPanelViewShell in constructor.
sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 17 +++++++++++++++--
sd/source/ui/view/sdwindow.cxx | 4 ++--
2 files changed, 17 insertions(+), 4 deletions(-)
Notes
split repo tag: impress_OOO_BUILD_3_2_98_1
1303 files changed, 19300 insertions, 19249 deletions
diff --git a/animations/inc/animations/animationnodehelper.hxx b/animations/inc/animations/animationnodehelper.hxx index 8857c52942ce..9f8dc1c13780 100644 --- a/animations/inc/animations/animationnodehelper.hxx +++ b/animations/inc/animations/animationnodehelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ namespace anim /** Apply given functor to every animation node child. - @param xNode + @param xNode Parent node @param rFunctor @@ -57,23 +57,23 @@ namespace anim @return true, if the functor was successfully applied to all children, false otherwise. */ - template< typename Functor > inline bool for_each_childNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, - Functor& rFunctor ) + template< typename Functor > inline bool for_each_childNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, + Functor& rFunctor ) { try { // get an XEnumerationAccess to the children - ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess > - xEnumerationAccess( xNode, + ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess > + xEnumerationAccess( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ); - ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > - xEnumeration( xEnumerationAccess->createEnumeration(), + ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > + xEnumeration( xEnumerationAccess->createEnumeration(), ::com::sun::star::uno::UNO_QUERY_THROW ); - + while( xEnumeration->hasMoreElements() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > - xChildNode( xEnumeration->nextElement(), + ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > + xChildNode( xEnumeration->nextElement(), ::com::sun::star::uno::UNO_QUERY_THROW ); rFunctor( xChildNode ); @@ -98,22 +98,22 @@ namespace anim try { // get an XEnumerationAccess to the children - ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess > - xEnumerationAccess( xNode, + ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess > + xEnumerationAccess( xNode, ::com::sun::star::uno::UNO_QUERY ); if( xEnumerationAccess.is() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > - xEnumeration( xEnumerationAccess->createEnumeration(), + ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > + xEnumeration( xEnumerationAccess->createEnumeration(), ::com::sun::star::uno::UNO_QUERY ); - + if( xEnumeration.is() ) { while( xEnumeration->hasMoreElements() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > - xChildNode( xEnumeration->nextElement(), + ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > + xChildNode( xEnumeration->nextElement(), ::com::sun::star::uno::UNO_QUERY_THROW ); create_deep_vector( xChildNode, rVector ); diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx index 7b18a83e2fe4..59a619b21ccf 100644 --- a/animations/source/animcore/animcore.cxx +++ b/animations/source/animcore/animcore.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -109,7 +109,7 @@ typedef ::std::list< Reference< XAnimationNode > > ChildList_t; // ==================================================================== -class AnimationNodeBase : public XAnimateMotion, +class AnimationNodeBase : public XAnimateMotion, public XAnimateColor, public XTransitionFilter, public XAnimateSet, @@ -293,7 +293,7 @@ public: void fireChangeListener(); private: - OInterfaceContainerHelper maChangeListener; + OInterfaceContainerHelper maChangeListener; static void initTypeProvider( sal_Int16 nNodeType ) throw(); @@ -311,11 +311,11 @@ private: Sequence< NamedValue > maUserData; // parent interface for XChild interface implementation - Reference<XInterface> mxParent; - AnimationNode* mpParent; + Reference<XInterface> mxParent; + AnimationNode* mpParent; // attributes for XAnimate - Any maTarget; + Any maTarget; OUString maAttributeName, maFormula; Sequence< Any > maValues; Sequence< double > maKeyTimes; @@ -350,10 +350,10 @@ private: // XIterateContainer sal_Int16 mnIterateType; - double mfIterateInterval; + double mfIterateInterval; /** sorted list of child nodes for XTimeContainer*/ - ChildList_t maChilds; + ChildList_t maChilds; }; // ==================================================================== @@ -370,13 +370,13 @@ public: private: /** sorted list of child nodes */ - ChildList_t maChilds; + ChildList_t maChilds; /** current iteration position */ - ChildList_t::iterator maIter; + ChildList_t::iterator maIter; /** our first, last and only protection from mutli-threads! */ - Mutex maMutex; + Mutex maMutex; }; TimeContainerEnumeration::TimeContainerEnumeration( const ChildList_t &rChilds ) @@ -397,7 +397,7 @@ sal_Bool SAL_CALL TimeContainerEnumeration::hasMoreElements() throw (RuntimeExce return maIter != maChilds.end(); } -Any SAL_CALL TimeContainerEnumeration::nextElement() +Any SAL_CALL TimeContainerEnumeration::nextElement() throw (NoSuchElementException, WrappedTargetException, RuntimeException) { Guard< Mutex > aGuard( maMutex ); @@ -414,7 +414,7 @@ Sequence< Type >* AnimationNode::mpTypes[] = { NULL, NULL, NULL, NULL, NULL, NUL Sequence< sal_Int8 >* AnimationNode::mpId[] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; AnimationNode::AnimationNode( sal_Int16 nNodeType ) -: maChangeListener(maMutex), +: maChangeListener(maMutex), mnNodeType( nNodeType ), mnFill( AnimationFill::DEFAULT ), mnFillDefault( AnimationFill::INHERIT ), @@ -445,7 +445,7 @@ AnimationNode::AnimationNode( sal_Int16 nNodeType ) } AnimationNode::AnimationNode( const AnimationNode& rNode ) -: AnimationNodeBase(), +: AnimationNodeBase(), maChangeListener(maMutex), mnNodeType( rNode.mnNodeType ), @@ -492,7 +492,7 @@ AnimationNode::AnimationNode( const AnimationNode& rNode ) // attributes for XAnimateTransform mnTransformType( rNode.mnTransformType ), - + // attributes for XTransitionFilter mnTransition( rNode.mnTransition ), mnSubtype( rNode.mnSubtype ), @@ -646,7 +646,7 @@ void AnimationNode::initTypeProvider( sal_Int16 nNodeType ) throw() mpId[nNodeType] = new Sequence< sal_Int8 >( 16 ); rtl_createUuid( (sal_uInt8 *)mpId[nNodeType]->getArray(), 0, sal_True ); - static sal_Int32 type_numbers[] = + static sal_Int32 type_numbers[] = { 7, // CUSTOM 9, // PAR @@ -1161,7 +1161,7 @@ void SAL_CALL AnimationNode::setParent( const Reference< XInterface >& Parent ) mpParent = 0; Reference< XUnoTunnel > xTunnel( mxParent, UNO_QUERY ); if( xTunnel.is() ) - mpParent = reinterpret_cast< AnimationNode* >( sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething( getUnoTunnelId() ))); + mpParent = reinterpret_cast< AnimationNode* >( sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething( getUnoTunnelId() ))); fireChangeListener(); } @@ -1826,7 +1826,7 @@ Reference< XEnumeration > SAL_CALL AnimationNode::createEnumeration() throw (RuntimeException) { Guard< Mutex > aGuard( maMutex ); - + return new TimeContainerEnumeration( maChilds); } diff --git a/animations/source/animcore/animcore.xml b/animations/source/animcore/animcore.xml index 9ccca0f02081..028008fc74ec 100644 --- a/animations/source/animcore/animcore.xml +++ b/animations/source/animcore/animcore.xml @@ -6,25 +6,25 @@ <component-description> <author> Christian Lippka </author> <name> todo </name> - <description> + <description> This component provides ... </description> - <loader-name> com.sun.star.loader.SharedLibrary </loader-name> - <language> c++ </language> - <status value="draft"/> - <supported-service> </supported-service> + <loader-name> com.sun.star.loader.SharedLibrary </loader-name> + <language> c++ </language> + <status value="draft"/> + <supported-service> </supported-service> <service-dependency> ... </service-dependency> <type> ... </type> </component-description> - <project-build-dependency> cppuhelper </project-build-dependency> - <project-build-dependency> cppu </project-build-dependency> - <project-build-dependency> vos </project-build-dependency> - <project-build-dependency> sal </project-build-dependency> + <project-build-dependency> cppuhelper </project-build-dependency> + <project-build-dependency> cppu </project-build-dependency> + <project-build-dependency> vos </project-build-dependency> + <project-build-dependency> sal </project-build-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> cppu2 </runtime-module-dependency> - <runtime-module-dependency> vos2MSC </runtime-module-dependency> - <runtime-module-dependency> sal2 </runtime-module-dependency> + <runtime-module-dependency> cppuhelper </runtime-module-dependency> + <runtime-module-dependency> cppu2 </runtime-module-dependency> + <runtime-module-dependency> vos2MSC </runtime-module-dependency> + <runtime-module-dependency> sal2 </runtime-module-dependency> </module-description> diff --git a/animations/source/animcore/factreg.cxx b/animations/source/animcore/factreg.cxx index 3cfc350d405d..3dbdf5b10abe 100644 --- a/animations/source/animcore/factreg.cxx +++ b/animations/source/animcore/factreg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) { return g_moduleCount.canUnload( &g_moduleCount , pTime ); } - + //================================================================================================== void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) diff --git a/animations/source/animcore/factreg.hxx b/animations/source/animcore/factreg.hxx index b76fc1067e0c..d066db028406 100644 --- a/animations/source/animcore/factreg.hxx +++ b/animations/source/animcore/factreg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ namespace animcore { extern rtl_StandardModuleCount g_moduleCount; - + #define DECL_NODE_FACTORY(N)\ extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance_##N( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rSMgr ) throw (::com::sun::star::uno::Exception);\ extern ::rtl::OUString getImplementationName_##N();\ diff --git a/animations/source/animcore/targetpropertiescreator.cxx b/animations/source/animcore/targetpropertiescreator.cxx index 0bba7b55d918..160a084fd151 100644 --- a/animations/source/animcore/targetpropertiescreator.cxx +++ b/animations/source/animcore/targetpropertiescreator.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -103,7 +103,7 @@ namespace animcore { return TargetPropertiesCreator::createInstance( rSMgr ); } - + ::rtl::OUString getImplementationName_TargetPropertiesCreator() { return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); @@ -122,7 +122,7 @@ namespace animcore { // Vector containing all properties for a given shape typedef ::std::vector< beans::NamedValue > VectorOfNamedValues; - + /** The hash map key This key contains both XShape reference and a paragraph @@ -132,14 +132,14 @@ namespace animcore struct ShapeHashKey { /// Shape target - uno::Reference< drawing::XShape > mxRef; + uno::Reference< drawing::XShape > mxRef; /** Paragraph index. If this is a pure shape target, mnParagraphIndex is set to -1. */ - sal_Int16 mnParagraphIndex; + sal_Int16 mnParagraphIndex; /// Comparison needed for hash_map bool operator==( const ShapeHashKey& rRHS ) const @@ -164,7 +164,7 @@ namespace animcore // x = (x & 0x00F000F0) << 4) | (x >> 4) & 0x00F000F0 | x & 0xF00FF00F; // x = (x & 0x0C0C0C0C) << 2) | (x >> 2) & 0x0C0C0C0C | x & 0xC3C3C3C3; // x = (x & 0x22222222) << 1) | (x >> 1) & 0x22222222 | x & 0x99999999; - // + // // Costs about 17 cycles on a RISC machine with infinite // instruction level parallelism (~42 basic // instructions). Thus I truly doubt this pays off... @@ -182,9 +182,9 @@ namespace animcore { } - NodeFunctor( XShapeHash& rShapeHash, - const uno::Reference< drawing::XShape >& rTargetShape, - sal_Int16 nParagraphIndex ) : + NodeFunctor( XShapeHash& rShapeHash, + const uno::Reference< drawing::XShape >& rTargetShape, + sal_Int16 nParagraphIndex ) : mrShapeHash( rShapeHash ), mxTargetShape( rTargetShape ), mnParagraphIndex( nParagraphIndex ) @@ -201,7 +201,7 @@ namespace animcore } uno::Reference< drawing::XShape > xTargetShape( mxTargetShape ); - sal_Int16 nParagraphIndex( mnParagraphIndex ); + sal_Int16 nParagraphIndex( mnParagraphIndex ); switch( xNode->getType() ) { @@ -221,12 +221,12 @@ namespace animcore "animcore: NodeFunctor::operator(): no target on ITERATE node" ); return; } - + xTargetShape.set( xIterNode->getTarget(), uno::UNO_QUERY ); if( !xTargetShape.is() ) - { + { ::com::sun::star::presentation::ParagraphTarget aTarget; // no shape provided. Maybe a ParagraphTarget? @@ -237,7 +237,7 @@ namespace animcore "target information" ); return; } - + xTargetShape = aTarget.Shape; nParagraphIndex = aTarget.Paragraph; @@ -257,10 +257,10 @@ namespace animcore NodeFunctor aFunctor( mrShapeHash, xTargetShape, nParagraphIndex ); - if( !::anim::for_each_childNode( xNode, + if( !::anim::for_each_childNode( xNode, aFunctor ) ) { - OSL_ENSURE( false, + OSL_ENSURE( false, "AnimCore: NodeFunctor::operator(): child node iteration failed, " "or extraneous container nodes encountered" ); } @@ -288,9 +288,9 @@ namespace animcore case animations::AnimationNodeType::SET: { // evaluate set node content - uno::Reference< animations::XAnimate > xAnimateNode( xNode, + uno::Reference< animations::XAnimate > xAnimateNode( xNode, uno::UNO_QUERY ); - + if( !xAnimateNode.is() ) break; // invalid node @@ -317,26 +317,26 @@ namespace animcore // not a pure shape target - maybe a // ParagraphTarget? presentation::ParagraphTarget aUnoTarget; - + if( !(xAnimateNode->getTarget() >>= aUnoTarget) ) { OSL_ENSURE( false, "AnimCore: NodeFunctor::operator(): unknown target type encountered" ); break; } - + aTarget.mxRef = aUnoTarget.Shape; aTarget.mnParagraphIndex = aUnoTarget.Paragraph; } } - + if( !aTarget.mxRef.is() ) { OSL_ENSURE( false, "AnimCore: NodeFunctor::operator(): Found target, but XShape is NULL" ); break; // invalid target XShape } - + // check whether we already have an entry for // this target (we only take the first set // effect for every shape) @@ -361,7 +361,7 @@ namespace animcore ::rtl::OUString aString; if( (aAny >>= aString) ) { - // we also take the strings "true" and "false", + // we also take the strings "true" and "false", // as well as "on" and "off" here if( aString.equalsIgnoreAsciiCaseAscii("true") || aString.equalsIgnoreAsciiCaseAscii("on") ) @@ -382,10 +382,10 @@ namespace animcore // first relevant effect. Thus, target // must be initially _hidden_, for the // effect to have visible impact. - mrShapeHash.insert( - XShapeHash::value_type( + mrShapeHash.insert( + XShapeHash::value_type( aTarget, - VectorOfNamedValues( + VectorOfNamedValues( 1, beans::NamedValue( xAnimateNode->getAttributeName(), @@ -398,9 +398,9 @@ namespace animcore } private: - XShapeHash& mrShapeHash; - uno::Reference< drawing::XShape > mxTargetShape; - sal_Int16 mnParagraphIndex; + XShapeHash& mrShapeHash; + uno::Reference< drawing::XShape > mxTargetShape; + sal_Int16 mnParagraphIndex; }; } @@ -422,17 +422,17 @@ namespace animcore // XTargetPropertiesCreator uno::Sequence< animations::TargetProperties > SAL_CALL TargetPropertiesCreator::createInitialTargetProperties - ( - const uno::Reference< animations::XAnimationNode >& xRootNode + ( + const uno::Reference< animations::XAnimationNode >& xRootNode ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); // scan all nodes for visibility changes, and record first // 'visibility=true' for each shape - XShapeHash aShapeHash( 101, + XShapeHash aShapeHash( 101, &refhasher ); - + NodeFunctor aFunctor( aShapeHash ); // TODO(F1): Maybe limit functor application to main sequence @@ -449,25 +449,25 @@ namespace animcore uno::Sequence< animations::TargetProperties > aRes( aShapeHash.size() ); - ::std::size_t nCurrIndex(0); - XShapeHash::const_iterator aCurr( aShapeHash.begin() ); - const XShapeHash::const_iterator aEnd ( aShapeHash.end() ); + ::std::size_t nCurrIndex(0); + XShapeHash::const_iterator aCurr( aShapeHash.begin() ); + const XShapeHash::const_iterator aEnd ( aShapeHash.end() ); while( aCurr != aEnd ) { animations::TargetProperties& rCurrProps( aRes[ nCurrIndex++ ] ); - if( aCurr->first.mnParagraphIndex == -1 ) - { + if( aCurr->first.mnParagraphIndex == -1 ) + { rCurrProps.Target = uno::makeAny( aCurr->first.mxRef ); } else { - rCurrProps.Target = uno::makeAny( + rCurrProps.Target = uno::makeAny( presentation::ParagraphTarget( aCurr->first.mxRef, aCurr->first.mnParagraphIndex ) ); } - + rCurrProps.Properties = ::comphelper::containerToSequence( aCurr->second ); ++aCurr; @@ -491,7 +491,7 @@ namespace animcore { uno::Sequence< ::rtl::OUString > aRet(1); aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); - + return aRet; } diff --git a/sd/inc/CustomAnimationCloner.hxx b/sd/inc/CustomAnimationCloner.hxx index e8b658ebe1d3..abe2bc7844ef 100644 --- a/sd/inc/CustomAnimationCloner.hxx +++ b/sd/inc/CustomAnimationCloner.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx index 0ad2e855261e..40ddce3db490 100644 --- a/sd/inc/CustomAnimationEffect.hxx +++ b/sd/inc/CustomAnimationEffect.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,88 +81,88 @@ public: CustomAnimationEffectPtr clone() const; // attributes - const rtl::OUString& getPresetId() const { return maPresetId; } - const rtl::OUString& getPresetSubType() const { return maPresetSubType; } - const rtl::OUString& getProperty() const { return maProperty; } - - sal_Int16 getPresetClass() const { return mnPresetClass; } - void setPresetClass( sal_Int16 nPresetClass ); + const rtl::OUString& getPresetId() const { return maPresetId; } + const rtl::OUString& getPresetSubType() const { return maPresetSubType; } + const rtl::OUString& getProperty() const { return maProperty; } - sal_Int16 getNodeType() const { return mnNodeType; } - SD_DLLPUBLIC void setNodeType( sal_Int16 nNodeType ); + sal_Int16 getPresetClass() const { return mnPresetClass; } + void setPresetClass( sal_Int16 nPresetClass ); - ::com::sun::star::uno::Any getRepeatCount() const; - void setRepeatCount( const ::com::sun::star::uno::Any& rRepeatCount ); + sal_Int16 getNodeType() const { return mnNodeType; } + SD_DLLPUBLIC void setNodeType( sal_Int16 nNodeType ); - ::com::sun::star::uno::Any getEnd() const; - void setEnd( const ::com::sun::star::uno::Any& rEnd ); + ::com::sun::star::uno::Any getRepeatCount() const; + void setRepeatCount( const ::com::sun::star::uno::Any& rRepeatCount ); - sal_Int16 getFill() const; - void setFill( sal_Int16 nFill ); + ::com::sun::star::uno::Any getEnd() const; + void setEnd( const ::com::sun::star::uno::Any& rEnd ); - double getBegin() const { return mfBegin; } - SD_DLLPUBLIC void setBegin( double fBegin ); + sal_Int16 getFill() const; + void setFill( sal_Int16 nFill ); + + double getBegin() const { return mfBegin; } + SD_DLLPUBLIC void setBegin( double fBegin ); - double getDuration() const { return mfDuration; } - SD_DLLPUBLIC void setDuration( double fDuration ); + double getDuration() const { return mfDuration; } + SD_DLLPUBLIC void setDuration( double fDuration ); + + double getAbsoluteDuration() const { return mfAbsoluteDuration; } - double getAbsoluteDuration() const { return mfAbsoluteDuration; } + const String& getName() const { return maName; } + void setName( const String& rName ) { maName = rName; } - const String& getName() const { return maName; } - void setName( const String& rName ) { maName = rName; } + sal_Int16 getIterateType() const { return mnIterateType; } + SD_DLLPUBLIC void setIterateType( sal_Int16 nIterateType ); - sal_Int16 getIterateType() const { return mnIterateType; } - SD_DLLPUBLIC void setIterateType( sal_Int16 nIterateType ); + double getIterateInterval() const { return mfIterateInterval; } + SD_DLLPUBLIC void setIterateInterval( double fIterateInterval ); - double getIterateInterval() const { return mfIterateInterval; } - SD_DLLPUBLIC void setIterateInterval( double fIterateInterval ); + ::com::sun::star::uno::Any getTarget() const { return maTarget; } + SD_DLLPUBLIC void setTarget( const ::com::sun::star::uno::Any& rTarget ); - ::com::sun::star::uno::Any getTarget() const { return maTarget; } - SD_DLLPUBLIC void setTarget( const ::com::sun::star::uno::Any& rTarget ); + sal_Bool hasAfterEffect() const { return mbHasAfterEffect; } + void setHasAfterEffect( sal_Bool bHasAfterEffect ) { mbHasAfterEffect = bHasAfterEffect; } - sal_Bool hasAfterEffect() const { return mbHasAfterEffect; } - void setHasAfterEffect( sal_Bool bHasAfterEffect ) { mbHasAfterEffect = bHasAfterEffect; } + ::com::sun::star::uno::Any getDimColor() const { return maDimColor; } + void setDimColor( ::com::sun::star::uno::Any aDimColor ) { maDimColor = aDimColor; } - ::com::sun::star::uno::Any getDimColor() const { return maDimColor; } - void setDimColor( ::com::sun::star::uno::Any aDimColor ) { maDimColor = aDimColor; } + bool IsAfterEffectOnNext() const { return mbAfterEffectOnNextEffect; } + void setAfterEffectOnNext( bool bOnNextEffect ) { mbAfterEffectOnNextEffect = bOnNextEffect; } - bool IsAfterEffectOnNext() const { return mbAfterEffectOnNextEffect; } - void setAfterEffectOnNext( bool bOnNextEffect ) { mbAfterEffectOnNextEffect = bOnNextEffect; } + sal_Int32 getParaDepth() const { return mnParaDepth; } - sal_Int32 getParaDepth() const { return mnParaDepth; } + sal_Bool hasText() const { return mbHasText; } - sal_Bool hasText() const { return mbHasText; } + sal_Int16 getCommand() const { return mnCommand; } - sal_Int16 getCommand() const { return mnCommand; } + double getAcceleration() const { return mfAcceleration; } + void setAcceleration( double fAcceleration ); - double getAcceleration() const { return mfAcceleration; } - void setAcceleration( double fAcceleration ); + double getDecelerate() const { return mfDecelerate; } + void setDecelerate( double fDecelerate ); - double getDecelerate() const { return mfDecelerate; } - void setDecelerate( double fDecelerate ); + sal_Bool getAutoReverse() const { return mbAutoReverse; } + void setAutoReverse( sal_Bool bAutoReverse ); - sal_Bool getAutoReverse() const { return mbAutoReverse; } - void setAutoReverse( sal_Bool bAutoReverse ); + ::com::sun::star::uno::Any getProperty( sal_Int32 nNodeType, const rtl::OUString& rAttributeName, EValue eValue ); + bool setProperty( sal_Int32 nNodeType, const rtl::OUString& rAttributeName, EValue eValue, const ::com::sun::star::uno::Any& rValue ); - ::com::sun::star::uno::Any getProperty( sal_Int32 nNodeType, const rtl::OUString& rAttributeName, EValue eValue ); - bool setProperty( sal_Int32 nNodeType, const rtl::OUString& rAttributeName, EValue eValue, const ::com::sun::star::uno::Any& rValue ); + ::com::sun::star::uno::Any getTransformationProperty( sal_Int32 nTransformType, EValue eValue ); + bool setTransformationProperty( sal_Int32 nTransformType, EValue eValue, const ::com::sun::star::uno::Any& rValue ); - ::com::sun::star::uno::Any getTransformationProperty( sal_Int32 nTransformType, EValue eValue ); - bool setTransformationProperty( sal_Int32 nTransformType, EValue eValue, const ::com::sun::star::uno::Any& rValue ); + ::com::sun::star::uno::Any getColor( sal_Int32 nIndex ); + void setColor( sal_Int32 nIndex, const ::com::sun::star::uno::Any& rColor ); - ::com::sun::star::uno::Any getColor( sal_Int32 nIndex ); - void setColor( sal_Int32 nIndex, const ::com::sun::star::uno::Any& rColor ); + ::com::sun::star::uno::Any getRotation(); + void setRotation( const ::com::sun::star::uno::Any& rRotation ); - ::com::sun::star::uno::Any getRotation(); - void setRotation( const ::com::sun::star::uno::Any& rRotation ); + sal_Int32 getGroupId() const { return mnGroupId; } + void setGroupId( sal_Int32 nGroupId ); - sal_Int32 getGroupId() const { return mnGroupId; } - void setGroupId( sal_Int32 nGroupId ); + sal_Int16 getTargetSubItem() const { return mnTargetSubItem; } + SD_DLLPUBLIC void setTargetSubItem( sal_Int16 nSubItem ); - sal_Int16 getTargetSubItem() const { return mnTargetSubItem; } - SD_DLLPUBLIC void setTargetSubItem( sal_Int16 nSubItem ); - - ::rtl::OUString getPath() const; + ::rtl::OUString getPath() const; void setPath( const ::rtl::OUString& rPath ); bool checkForText(); @@ -175,7 +175,7 @@ public: void removeAudio(); const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAudio >& getAudio() const { return mxAudio; } - EffectSequenceHelper* getEffectSequence() const { return mpEffectSequence; } + EffectSequenceHelper* getEffectSequence() const { return mpEffectSequence; } // helper ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > createAfterEffectNode() const throw (com::sun::star::uno::Exception); @@ -193,36 +193,36 @@ protected: void setEffectSequence( EffectSequenceHelper* pSequence ) { mpEffectSequence = pSequence; } private: - sal_Int16 mnNodeType; - rtl::OUString maPresetId; - rtl::OUString maPresetSubType; - rtl::OUString maProperty; - sal_Int16 mnPresetClass; - double mfBegin; - double mfDuration; // this is the maximum duration of the subeffects - double mfAbsoluteDuration; // this is the maximum duration of the subeffects including possible iterations - sal_Int32 mnGroupId; - sal_Int16 mnIterateType; - double mfIterateInterval; - sal_Int32 mnParaDepth; - sal_Bool mbHasText; - double mfAcceleration; - double mfDecelerate; - sal_Bool mbAutoReverse; - sal_Int16 mnTargetSubItem; - sal_Int16 mnCommand; + sal_Int16 mnNodeType; + rtl::OUString maPresetId; + rtl::OUString maPresetSubType; + rtl::OUString maProperty; + sal_Int16 mnPresetClass; + double mfBegin; + double mfDuration; // this is the maximum duration of the subeffects + double mfAbsoluteDuration; // this is the maximum duration of the subeffects including possible iterations + sal_Int32 mnGroupId; + sal_Int16 mnIterateType; + double mfIterateInterval; + sal_Int32 mnParaDepth; + sal_Bool mbHasText; + double mfAcceleration; + double mfDecelerate; + sal_Bool mbAutoReverse; + sal_Int16 mnTargetSubItem; + sal_Int16 mnCommand; EffectSequenceHelper* mpEffectSequence; - String maName; + String maName; ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxNode; ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAudio > mxAudio; ::com::sun::star::uno::Any maTarget; - sal_Bool mbHasAfterEffect; + sal_Bool mbHasAfterEffect; ::com::sun::star::uno::Any maDimColor; - bool mbAfterEffectOnNextEffect; + bool mbAfterEffectOnNextEffect; }; struct stl_CustomAnimationEffect_search_node_predict @@ -266,7 +266,7 @@ public: private: EffectSequence maEffects; ::com::sun::star::uno::Reference< com::sun::star::drawing::XShape > maTarget; - + sal_Int32 mnTextGrouping; sal_Bool mbAnimateForm; sal_Bool mbTextReverse; @@ -332,7 +332,7 @@ public: // text group methods CustomAnimationTextGroupPtr findGroup( sal_Int32 nGroupId ); - SD_DLLPUBLIC CustomAnimationTextGroupPtr createTextGroup( CustomAnimationEffectPtr pEffect, sal_Int32 nTextGrouping, double fTextGroupingAuto, sal_Bool bAnimateForm, sal_Bool bTextReverse ); + SD_DLLPUBLIC CustomAnimationTextGroupPtr createTextGroup( CustomAnimationEffectPtr pEffect, sal_Int32 nTextGrouping, double fTextGroupingAuto, sal_Bool bAnimateForm, sal_Bool bTextReverse ); void setTextGrouping( CustomAnimationTextGroupPtr pTextGroup, sal_Int32 nTextGrouping ); void setAnimateForm( CustomAnimationTextGroupPtr pTextGroup, sal_Bool bAnimateForm ); void setTextGroupingAuto( CustomAnimationTextGroupPtr pTextGroup, double fTextGroupingAuto ); @@ -383,7 +383,7 @@ public: private: virtual void implRebuild(); - MainSequence* mpMainSequence; + MainSequence* mpMainSequence; }; typedef boost::shared_ptr< InteractiveSequence > InteractiveSequencePtr; diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx index fb605f5415d8..fdf577fb8d3c 100644 --- a/sd/inc/CustomAnimationPreset.hxx +++ b/sd/inc/CustomAnimationPreset.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -110,8 +110,8 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getRandomPreset( sal_Int16 nPresetClass ) const; SD_DLLPUBLIC CustomAnimationPresetPtr getEffectDescriptor( const rtl::OUString& rPresetId ) const; -// const AnimationEffect* getEffect( const rtl::OUString& rPresetId ) const; -// const AnimationEffect* getEffect( const rtl::OUString& rPresetId, const rtl::OUString& rPresetSubType ) const; +// const AnimationEffect* getEffect( const rtl::OUString& rPresetId ) const; +// const AnimationEffect* getEffect( const rtl::OUString& rPresetId, const rtl::OUString& rPresetSubType ) const; const rtl::OUString& getUINameForPresetId( const rtl::OUString& rPresetId ) const; const rtl::OUString& getUINameForProperty( const rtl::OUString& rProperty ) const; @@ -144,7 +144,7 @@ private: PresetCategoryList maMotionPathsPresets; PresetCategoryList maMiscPresets; - static CustomAnimationPresets* mpCustomAnimationPresets; + static CustomAnimationPresets* mpCustomAnimationPresets; }; typedef boost::shared_ptr< CustomAnimationPresets > CustomAnimationPresetsPtr; diff --git a/sd/inc/EffectMigration.hxx b/sd/inc/EffectMigration.hxx index eb173f495de2..f9a0f166333f 100644 --- a/sd/inc/EffectMigration.hxx +++ b/sd/inc/EffectMigration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/inc/FactoryIds.hxx b/sd/inc/FactoryIds.hxx index 66477a1faf67..d3e38e38527f 100644 --- a/sd/inc/FactoryIds.hxx +++ b/sd/inc/FactoryIds.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index dfc7e3e3bf88..749093619e17 100755 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,7 +25,7 @@ * ************************************************************************/ -#ifndef SD_OUTLINER_HXX +#ifndef SD_OUTLINER_HXX #define SD_OUTLINER_HXX #include <svx/svdobj.hxx> @@ -92,7 +92,7 @@ class Window; <p>Some related pieces of information: The search dialog (<type>SvxSearchDialog</type>) can be controlled in more than one way: - <ul><li>A set of option flags returned by the slot call + <ul><li>A set of option flags returned by the slot call SID_SEARCH_OPTIONS handled by the <member>SdDrawDocument::GetState()</member> method.</li> <li>The contents of the search item of type @@ -103,7 +103,7 @@ class Window; queried. This is only sufficient for searching the outline view. </p> */ -class Outliner +class Outliner : public SdrOutliner { public: @@ -130,7 +130,7 @@ public: checking. */ void PrepareSpelling (void); - + /** Initialize a spell check but do not start it yet. This method is a better candiate for the name PrepareSpelling. */ @@ -161,9 +161,9 @@ public: /** callback for textconversion */ sal_Bool ConvertNextDocument (void); - /** Starts the text conversion (hangul/hanja or Chinese simplified/traditional) + /** Starts the text conversion (hangul/hanja or Chinese simplified/traditional) for the current viewshell */ - void StartConversion( INT16 nSourceLanguage, INT16 nTargetLanguage, + void StartConversion( INT16 nSourceLanguage, INT16 nTargetLanguage, const Font *pTargetFont, INT32 nOptions, BOOL bIsInteractive ); /** This is called internaly when text conversion is started. @@ -179,9 +179,9 @@ public: enum ChangeHint { CH_VIEW_SHELL_INVALID, CH_VIEW_SHELL_VALID }; - int GetIgnoreCurrentPageChangesLevel() const { return mnIgnoreCurrentPageChangesLevel; }; - void IncreIgnoreCurrentPageChangesLevel() { mnIgnoreCurrentPageChangesLevel++; }; - void DecreIgnoreCurrentPageChangesLevel() { mnIgnoreCurrentPageChangesLevel--; }; + int GetIgnoreCurrentPageChangesLevel() const { return mnIgnoreCurrentPageChangesLevel; }; + void IncreIgnoreCurrentPageChangesLevel() { mnIgnoreCurrentPageChangesLevel++; }; + void DecreIgnoreCurrentPageChangesLevel() { mnIgnoreCurrentPageChangesLevel--; }; private: class Implementation; @@ -223,7 +223,7 @@ private: /// The number of pages in the current view. USHORT mnPageCount; - + /// Number of objects on the current page / in the current selection. INT32 mnObjectCount; @@ -326,7 +326,7 @@ private: /** This flag remebers a selection change between a call to the selection change listener callback and the next - <member>DetectChange()</member> method call. + <member>DetectChange()</member> method call. */ bool mbSelectionHasChanged; @@ -334,7 +334,7 @@ private: to a programatical change of the selection. */ bool mbExpectingSelectionChangeEvent; - + /** This flag is set to true when the whole document has been processed once 'officially', i.e. a message box has been shown that tells the user so. @@ -366,7 +366,7 @@ private: /** Do search and replace for whole document. */ bool SearchAndReplaceAll (void); - + /** Do search and replace for next match. @return The return value specifies whether the search ended (</TRUE>) or @@ -450,7 +450,7 @@ private: void PrepareSearchAndReplace (void); /** Prepare to do a text conversion on the current text - object. This includes putting it into edit mode. + object. This includes putting it into edit mode. */ void PrepareConversion (void); @@ -463,7 +463,7 @@ private: /** Switch to the page or master page specified by the <member>mnPage</member> index. Master page mode is specified by - <member>meEditMode</member>. + <member>meEditMode</member>. @param eEditMode The new edit mode. @param nPageIndex diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx index 92301f06289c..4413709d6cee 100755 --- a/sd/inc/OutlinerIterator.hxx +++ b/sd/inc/OutlinerIterator.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ class SdDrawDocument; -namespace sd { +namespace sd { class ViewShell; class Outliner; @@ -74,16 +74,16 @@ enum IteratorType {SELECTION,SINGLE_VIEW,DOCUMENT}; /** This iterator can be used to iterate over all <type>SdrObject</type> objects of one of three set denoted by the <type>IteratorType</type>: <ul><li>All objects of the current mark list (selection) - (type==SELECTION).</li> + (type==SELECTION).</li> <li>All objects in the current view (type==SINGLE_VIEW).</li> <li>All objects in all views (type=DOCUMENT).</li></ul> - + <p>Note that the iterator does not change pages or views. It is the task of the user of the iterator to take the information provided by the <type>IteratorPosition</type> as returned by the <member>operator*()</member> method and set view, visible page, and selection/edit mode markers to reflect this position.</p> - + <p>A simple forward iteration from the first to the last object would instantiate the iterator with <code>Iterator(pDocument,pViewShell,true,BEGIN)</code> for some document @@ -110,7 +110,7 @@ public: explicit Iterator (IteratorImplBase* pObject); ~Iterator (void); - + /** Assign the iterator from the given one. The implementation object of this iterator will be a copy of the given iterator. @param rIterator @@ -256,9 +256,9 @@ private: */ Iterator CreateSelectionIterator ( const ::std::vector<SdrObjectWeakRef>& rObjectList, - SdDrawDocument* pDocument, + SdDrawDocument* pDocument, const ::boost::shared_ptr<ViewShell>& rpViewShell, - bool bDirectionIsForward=true, + bool bDirectionIsForward=true, IteratorLocation aLocation=BEGIN); /** Create an iterator that iterates over all <type>SdrObjects</type> @@ -273,9 +273,9 @@ private: This specifies at which object the iterator points initially. */ Iterator CreateDocumentIterator ( - SdDrawDocument* pDocument, + SdDrawDocument* pDocument, const ::boost::shared_ptr<ViewShell>& rpViewShell, - bool bDirectionIsForward=true, + bool bDirectionIsForward=true, IteratorLocation aLocation=BEGIN); /** Return the index of a page that contains an object that a new @@ -296,10 +296,10 @@ private: This specifies at which object the iterator points initially. */ sal_Int32 GetPageIndex ( - SdDrawDocument* pDocument, + SdDrawDocument* pDocument, const ::boost::shared_ptr<ViewShell>& rpViewShell, - PageKind ePageKind, - EditMode eEditMode, + PageKind ePageKind, + EditMode eEditMode, bool bDirectionIsForward, IteratorLocation aLocation); @@ -347,7 +347,7 @@ public: values in both position objects. */ bool operator== (const IteratorPosition& aPosition) const; - + /// Pointer to the actual <type>SdrObject</type> object. SdrObjectWeakRef mxObject; diff --git a/sd/inc/SdShapeTypes.hxx b/sd/inc/SdShapeTypes.hxx index c582be79abfe..652fe2f453e3 100644 --- a/sd/inc/SdShapeTypes.hxx +++ b/sd/inc/SdShapeTypes.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,9 +65,9 @@ enum SdShapeTypes type of the given shape. */ AccessibleShape* - CreateSdAccessibleShape (const ::com::sun::star::uno::Reference< + CreateSdAccessibleShape (const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& rxShape ); diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx index 7cee414710b6..4895ec71bc47 100644 --- a/sd/inc/TransitionPreset.hxx +++ b/sd/inc/TransitionPreset.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ #include <list> #include <hash_map> -namespace com { namespace sun { namespace star { +namespace com { namespace sun { namespace star { namespace animations { class XAnimationNode; } namespace uno { template<class X> class Reference; } } } } diff --git a/sd/inc/anmdef.hxx b/sd/inc/anmdef.hxx index 530fd4c4c146..9a2e231b6099 100644 --- a/sd/inc/anmdef.hxx +++ b/sd/inc/anmdef.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,5 +37,5 @@ // muss angepasst werden! #define CLICK_ACTION_COUNT 14 -#endif // _SD_ANIMATIONDEF_HXX +#endif // _SD_ANIMATIONDEF_HXX diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx index 5788e0f32ce5..81875393d83f 100644 --- a/sd/inc/anminfo.hxx +++ b/sd/inc/anminfo.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,31 +48,31 @@ class SdDrawDocument; class SdAnimationInfo : public SdrObjUserData { public: - PresObjKind mePresObjKind; + PresObjKind mePresObjKind; /* deprecated animation infos */ - ::com::sun::star::presentation::AnimationEffect meEffect; // Animationseffekt - ::com::sun::star::presentation::AnimationEffect meTextEffect; // Animationseffekt fuer Textinhalt - ::com::sun::star::presentation::AnimationSpeed meSpeed; // Geschwindigkeit der Animation - BOOL mbActive; // eingeschaltet ? - BOOL mbDimPrevious; // Objekt abblenden - BOOL mbIsMovie; // wenn Gruppenobjekt, dann Sequenz aus den - BOOL mbDimHide; // verstecken statt abblenden - Color maBlueScreen; // identifiziert "Hintergrundpixel" - Color maDimColor; // zum Abblenden des Objekts - String maSoundFile; // Pfad zum Soundfile in MSDOS-Notation - BOOL mbSoundOn; // Sound ein/aus - BOOL mbPlayFull; // Sound ganz abspielen - SdrPathObj* mpPathObj; // das Pfadobjekt - ::com::sun::star::presentation::ClickAction meClickAction; // Aktion bei Mausklick - ::com::sun::star::presentation::AnimationEffect meSecondEffect; // fuer Objekt ausblenden - ::com::sun::star::presentation::AnimationSpeed meSecondSpeed; // fuer Objekt ausblenden - String maSecondSoundFile; // fuer Objekt ausblenden - BOOL mbSecondSoundOn; // fuer Objekt ausblenden - BOOL mbSecondPlayFull;// fuer Objekt ausblenden -// String maBookmark; // Sprung zu Objekt/Seite - USHORT mnVerb; // fuer OLE-Objekt - ULONG mnPresOrder; + ::com::sun::star::presentation::AnimationEffect meEffect; // Animationseffekt + ::com::sun::star::presentation::AnimationEffect meTextEffect; // Animationseffekt fuer Textinhalt + ::com::sun::star::presentation::AnimationSpeed meSpeed; // Geschwindigkeit der Animation + BOOL mbActive; // eingeschaltet ? + BOOL mbDimPrevious; // Objekt abblenden + BOOL mbIsMovie; // wenn Gruppenobjekt, dann Sequenz aus den + BOOL mbDimHide; // verstecken statt abblenden + Color maBlueScreen; // identifiziert "Hintergrundpixel" + Color maDimColor; // zum Abblenden des Objekts + String maSoundFile; // Pfad zum Soundfile in MSDOS-Notation + BOOL mbSoundOn; // Sound ein/aus + BOOL mbPlayFull; // Sound ganz abspielen + SdrPathObj* mpPathObj; // das Pfadobjekt + ::com::sun::star::presentation::ClickAction meClickAction; // Aktion bei Mausklick + ::com::sun::star::presentation::AnimationEffect meSecondEffect; // fuer Objekt ausblenden + ::com::sun::star::presentation::AnimationSpeed meSecondSpeed; // fuer Objekt ausblenden + String maSecondSoundFile; // fuer Objekt ausblenden + BOOL mbSecondSoundOn; // fuer Objekt ausblenden + BOOL mbSecondPlayFull;// fuer Objekt ausblenden +// String maBookmark; // Sprung zu Objekt/Seite + USHORT mnVerb; // fuer OLE-Objekt + ULONG mnPresOrder; SdrObject& mrObject; SD_DLLPUBLIC void SetBookmark( const String& rBookmark ); @@ -80,9 +80,9 @@ public: public: SdAnimationInfo(SdrObject& rObject); SdAnimationInfo(const SdAnimationInfo& rAnmInfo, SdrObject& rObject); - virtual ~SdAnimationInfo(); + virtual ~SdAnimationInfo(); - virtual SdrObjUserData* Clone(SdrObject* pObject) const; + virtual SdrObjUserData* Clone(SdrObject* pObject) const; }; #endif // _SD_ANMINFO_HXX diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 65aec562f084..57c7d28e6907 100755 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ #define SID_MOREBACK (SID_SD_START+32) // #i68101# -#define SID_OBJECT_TITLE_DESCRIPTION (SID_SD_START+33) +#define SID_OBJECT_TITLE_DESCRIPTION (SID_SD_START+33) #define SID_VERTICAL (SID_SD_START+34) #define SID_HORIZONTAL (SID_SD_START+35) @@ -118,8 +118,8 @@ #define SID_CONNECT (SID_SD_START+93) #define SID_BREAK (SID_SD_START+94) #define SID_OBJECT_CHOOSE_MODE (SID_SD_START+95) -#define SID_ENTER_GROUP (SID_SD_START+96) -#define SID_LEAVE_GROUP (SID_SD_START+97) +#define SID_ENTER_GROUP (SID_SD_START+96) +#define SID_LEAVE_GROUP (SID_SD_START+97) #define SID_SIZE_PAGE_WIDTH (SID_SD_START+98) #define SID_SIZE_OPTIMAL (SID_SD_START+99) #define SID_OBJECT_TRANSPARENCE (SID_SD_START+100) @@ -137,7 +137,7 @@ #define SID_ANIMATOR_STATE (SID_SD_START+112) #define SID_PRESENTATIONOBJECT (SID_SD_START+113) #define SID_SIZE_VISAREA (SID_SD_START+114) -#define SID_CLEAR_UNDO_STACK (SID_SD_START+115) +#define SID_CLEAR_UNDO_STACK (SID_SD_START+115) #define SID_BEHIND_OBJ (SID_SD_START+116) #define SID_REVERSE_ORDER (SID_SD_START+117) #define SID_SDOPTIONS (SID_SD_START+118) @@ -171,20 +171,20 @@ #define SID_CONNECTOR_LINES_CIRCLES (SID_SD_START+145) // Options-Leisten Slot-IDs -//#i80528##define SID_GRAPHIC_DRAFT (SID_SD_START+146) -//#i80528##define SID_FILL_DRAFT (SID_SD_START+147) -//#i80528##define SID_TEXT_DRAFT (SID_SD_START+148) -//#i80528##define SID_LINE_DRAFT (SID_SD_START+149) -#define SID_HANDLES_DRAFT (SID_SD_START+150) -#define SID_SOLID_CREATE (SID_SD_START+151) -#define SID_HELPLINES_USE (SID_SD_START+152) -#define SID_HELPLINES_MOVE (SID_SD_START+153) -#define SID_GRID_USE (SID_SD_START+154) -#define SID_SNAP_BORDER (SID_SD_START+155) -#define SID_SNAP_FRAME (SID_SD_START+156) -#define SID_SNAP_POINTS (SID_SD_START+157) -#define SID_QUICKEDIT (SID_SD_START+158) -#define SID_PICK_THROUGH (SID_SD_START+159) +//#i80528##define SID_GRAPHIC_DRAFT (SID_SD_START+146) +//#i80528##define SID_FILL_DRAFT (SID_SD_START+147) +//#i80528##define SID_TEXT_DRAFT (SID_SD_START+148) +//#i80528##define SID_LINE_DRAFT (SID_SD_START+149) +#define SID_HANDLES_DRAFT (SID_SD_START+150) +#define SID_SOLID_CREATE (SID_SD_START+151) +#define SID_HELPLINES_USE (SID_SD_START+152) +#define SID_HELPLINES_MOVE (SID_SD_START+153) +#define SID_GRID_USE (SID_SD_START+154) +#define SID_SNAP_BORDER (SID_SD_START+155) +#define SID_SNAP_FRAME (SID_SD_START+156) +#define SID_SNAP_POINTS (SID_SD_START+157) +#define SID_QUICKEDIT (SID_SD_START+158) +#define SID_PICK_THROUGH (SID_SD_START+159) #define SID_COLORRESOLUTION (SID_SD_START+160) #define SID_CONVERT_TO_1BIT_THRESHOLD (SID_SD_START+161) #define SID_CONVERT_TO_1BIT_MATRIX (SID_SD_START+162) @@ -193,171 +193,171 @@ #define SID_CONVERT_TO_8BIT_GRAYS (SID_SD_START+165) #define SID_CONVERT_TO_8BIT_COLORS (SID_SD_START+166) #define SID_CONVERT_TO_24BIT (SID_SD_START+167) -#define SID_BIG_HANDLES (SID_SD_START+168) +#define SID_BIG_HANDLES (SID_SD_START+168) #define SID_DOUBLECLICK_TEXTEDIT (SID_SD_START+169) #define SID_CLICK_CHANGE_ROTATION (SID_SD_START+170) -#define SID_DRAWTBX_ARROWS (SID_SD_START+171) -#define SID_LINE_ARROW_START (SID_SD_START+172) -#define SID_LINE_ARROW_END (SID_SD_START+173) -#define SID_LINE_ARROWS (SID_SD_START+174) -#define SID_LINE_ARROW_CIRCLE (SID_SD_START+175) -#define SID_LINE_CIRCLE_ARROW (SID_SD_START+176) -#define SID_LINE_ARROW_SQUARE (SID_SD_START+177) -#define SID_LINE_SQUARE_ARROW (SID_SD_START+178) +#define SID_DRAWTBX_ARROWS (SID_SD_START+171) +#define SID_LINE_ARROW_START (SID_SD_START+172) +#define SID_LINE_ARROW_END (SID_SD_START+173) +#define SID_LINE_ARROWS (SID_SD_START+174) +#define SID_LINE_ARROW_CIRCLE (SID_SD_START+175) +#define SID_LINE_CIRCLE_ARROW (SID_SD_START+176) +#define SID_LINE_ARROW_SQUARE (SID_SD_START+177) +#define SID_LINE_SQUARE_ARROW (SID_SD_START+178) // und noch weitere... -#define ID_VAL_ENDINTENS (SID_SD_START+197) -#define ID_VAL_STARTINTENS (SID_SD_START+198) -#define ID_VAL_BORDER (SID_SD_START+199) -#define ID_VAL_MOUSESTART_X (SID_SD_START+200) -#define ID_VAL_MOUSESTART_Y (SID_SD_START+201) -#define ID_VAL_LENGTH_X (SID_SD_START+202) -#define ID_VAL_LENGTH_Y (SID_SD_START+203) -#define ID_VAL_MOUSEEND_X (SID_SD_START+204) -#define ID_VAL_MOUSEEND_Y (SID_SD_START+205) -#define ID_VAL_AXIS_X (SID_SD_START+206) -#define ID_VAL_AXIS_Y (SID_SD_START+207) -#define ID_VAL_ANGLESTART (SID_SD_START+208) -#define ID_VAL_ANGLEEND (SID_SD_START+209) -#define ID_VAL_CENTER_X (SID_SD_START+210) -#define ID_VAL_CENTER_Y (SID_SD_START+211) -#define ID_VAL_WHATPAGE (SID_SD_START+212) -#define ID_VAL_WHATLAYER (SID_SD_START+213) -#define ID_VAL_ANGLE (SID_SD_START+214) -#define ID_VAL_MIRRORVERT (SID_SD_START+215) -#define ID_VAL_ISACTIVE (SID_SD_START+216) -#define ID_VAL_WHATKIND (SID_SD_START+217) -#define ID_VAL_PAGEWIDTH (SID_SD_START+218) -#define ID_VAL_PAGEMARGIN (SID_SD_START+219) -#define ID_VAL_PAGETOP (SID_SD_START+220) -#define ID_VAL_PAGEBOTTOM (SID_SD_START+221) -#define ID_VAL_PAGELEFT (SID_SD_START+222) -#define ID_VAL_PAGERIGHT (SID_SD_START+223) -#define ID_VAL_SCALEOBJECTS (SID_SD_START+224) -#define ID_VAL_PAGENAME (SID_SD_START+225) -#define ID_VAL_WHATLAYOUT (SID_SD_START+226) -#define ID_VAL_ISPAGEBACK (SID_SD_START+227) -#define ID_VAL_ISPAGEOBJ (SID_SD_START+228) -#define ID_VAL_LAYERNAME (SID_SD_START+229) -#define ID_VAL_ISVISIBLE (SID_SD_START+230) -#define ID_VAL_ISLOCKED (SID_SD_START+231) -#define ID_VAL_ISPRINTABLE (SID_SD_START+232) -#define ID_VAL_PAGEHEIGHT (SID_SD_START+233) -#define ID_VAL_ZOOM (SID_SD_START+234) -#define ID_VAL_ANCHOR_X (SID_SD_START+235) -#define ID_VAL_ANCHOR_Y (SID_SD_START+236) -#define ID_VAL_RED (SID_SD_START+237) -#define ID_VAL_GREEN (SID_SD_START+238) -#define ID_VAL_BLUE (SID_SD_START+239) -#define ID_VAL_STYLE (SID_SD_START+240) -#define ID_VAL_DOTS (SID_SD_START+241) -#define ID_VAL_DOTLEN (SID_SD_START+242) -#define ID_VAL_DASHES (SID_SD_START+243) -#define ID_VAL_DASHLEN (SID_SD_START+244) -#define ID_VAL_DISTANCE (SID_SD_START+245) -#define ID_VAL_INDEX (SID_SD_START+246) -#define ID_VAL_WIDTH (SID_SD_START+247) -#define ID_VAL_HEIGHT (SID_SD_START+248) -#define ID_VAL_PANEL_INDEX (SID_SD_START+249) +#define ID_VAL_ENDINTENS (SID_SD_START+197) +#define ID_VAL_STARTINTENS (SID_SD_START+198) +#define ID_VAL_BORDER (SID_SD_START+199) +#define ID_VAL_MOUSESTART_X (SID_SD_START+200) +#define ID_VAL_MOUSESTART_Y (SID_SD_START+201) +#define ID_VAL_LENGTH_X (SID_SD_START+202) +#define ID_VAL_LENGTH_Y (SID_SD_START+203) +#define ID_VAL_MOUSEEND_X (SID_SD_START+204) +#define ID_VAL_MOUSEEND_Y (SID_SD_START+205) +#define ID_VAL_AXIS_X (SID_SD_START+206) +#define ID_VAL_AXIS_Y (SID_SD_START+207) +#define ID_VAL_ANGLESTART (SID_SD_START+208) +#define ID_VAL_ANGLEEND (SID_SD_START+209) +#define ID_VAL_CENTER_X (SID_SD_START+210) +#define ID_VAL_CENTER_Y (SID_SD_START+211) +#define ID_VAL_WHATPAGE (SID_SD_START+212) +#define ID_VAL_WHATLAYER (SID_SD_START+213) +#define ID_VAL_ANGLE (SID_SD_START+214) +#define ID_VAL_MIRRORVERT (SID_SD_START+215) +#define ID_VAL_ISACTIVE (SID_SD_START+216) +#define ID_VAL_WHATKIND (SID_SD_START+217) +#define ID_VAL_PAGEWIDTH (SID_SD_START+218) +#define ID_VAL_PAGEMARGIN (SID_SD_START+219) +#define ID_VAL_PAGETOP (SID_SD_START+220) +#define ID_VAL_PAGEBOTTOM (SID_SD_START+221) +#define ID_VAL_PAGELEFT (SID_SD_START+222) +#define ID_VAL_PAGERIGHT (SID_SD_START+223) +#define ID_VAL_SCALEOBJECTS (SID_SD_START+224) +#define ID_VAL_PAGENAME (SID_SD_START+225) +#define ID_VAL_WHATLAYOUT (SID_SD_START+226) +#define ID_VAL_ISPAGEBACK (SID_SD_START+227) +#define ID_VAL_ISPAGEOBJ (SID_SD_START+228) +#define ID_VAL_LAYERNAME (SID_SD_START+229) +#define ID_VAL_ISVISIBLE (SID_SD_START+230) +#define ID_VAL_ISLOCKED (SID_SD_START+231) +#define ID_VAL_ISPRINTABLE (SID_SD_START+232) +#define ID_VAL_PAGEHEIGHT (SID_SD_START+233) +#define ID_VAL_ZOOM (SID_SD_START+234) +#define ID_VAL_ANCHOR_X (SID_SD_START+235) +#define ID_VAL_ANCHOR_Y (SID_SD_START+236) +#define ID_VAL_RED (SID_SD_START+237) +#define ID_VAL_GREEN (SID_SD_START+238) +#define ID_VAL_BLUE (SID_SD_START+239) +#define ID_VAL_STYLE (SID_SD_START+240) +#define ID_VAL_DOTS (SID_SD_START+241) +#define ID_VAL_DOTLEN (SID_SD_START+242) +#define ID_VAL_DASHES (SID_SD_START+243) +#define ID_VAL_DASHLEN (SID_SD_START+244) +#define ID_VAL_DISTANCE (SID_SD_START+245) +#define ID_VAL_INDEX (SID_SD_START+246) +#define ID_VAL_WIDTH (SID_SD_START+247) +#define ID_VAL_HEIGHT (SID_SD_START+248) +#define ID_VAL_PANEL_INDEX (SID_SD_START+249) // nur zum austesten, um nicht jedesmal APP:HRC ff. durchbuilden zu muessen -#define ID_VAL_DUMMY0 (SID_SD_START+230) -#define ID_VAL_DUMMY1 (SID_SD_START+231) -#define ID_VAL_DUMMY2 (SID_SD_START+232) -#define ID_VAL_DUMMY3 (SID_SD_START+233) -#define ID_VAL_DUMMY4 (SID_SD_START+234) -#define ID_VAL_DUMMY5 (SID_SD_START+235) -#define ID_VAL_DUMMY6 (SID_SD_START+236) -#define ID_VAL_DUMMY7 (SID_SD_START+237) -#define ID_VAL_DUMMY8 (SID_SD_START+238) -#define ID_VAL_DUMMY9 (SID_SD_START+239) +#define ID_VAL_DUMMY0 (SID_SD_START+230) +#define ID_VAL_DUMMY1 (SID_SD_START+231) +#define ID_VAL_DUMMY2 (SID_SD_START+232) +#define ID_VAL_DUMMY3 (SID_SD_START+233) +#define ID_VAL_DUMMY4 (SID_SD_START+234) +#define ID_VAL_DUMMY5 (SID_SD_START+235) +#define ID_VAL_DUMMY6 (SID_SD_START+236) +#define ID_VAL_DUMMY7 (SID_SD_START+237) +#define ID_VAL_DUMMY8 (SID_SD_START+238) +#define ID_VAL_DUMMY9 (SID_SD_START+239) -#define SID_MOVETO (SID_SD_START+250) -#define SID_LINETO (SID_SD_START+251) -#define SID_BEZIERTO (SID_SD_START+252) -#define SID_PAGESIZE (SID_SD_START+253) -#define SID_PAGEMARGIN (SID_SD_START+254) -#define SID_ZOOMING (SID_SD_START+255) -#define SID_SELECTAT (SID_SD_START+256) -#define SID_COLORVIEW (SID_SD_START+257) +#define SID_MOVETO (SID_SD_START+250) +#define SID_LINETO (SID_SD_START+251) +#define SID_BEZIERTO (SID_SD_START+252) +#define SID_PAGESIZE (SID_SD_START+253) +#define SID_PAGEMARGIN (SID_SD_START+254) +#define SID_ZOOMING (SID_SD_START+255) +#define SID_SELECTAT (SID_SD_START+256) +#define SID_COLORVIEW (SID_SD_START+257) -#define SID_GETRED (SID_SD_START+259) -#define SID_GETBLUE (SID_SD_START+260) -#define SID_GETGREEN (SID_SD_START+261) -#define SID_SETFILLSTYLE (SID_SD_START+262) -#define SID_SETFILLCOLOR (SID_SD_START+263) -#define SID_GRADIENT (SID_SD_START+264) -#define SID_SETLINESTYLE (SID_SD_START+265) -#define SID_SETLINEWIDTH (SID_SD_START+266) -#define SID_DASH (SID_SD_START+267) -#define SID_RENAMEPAGE (SID_SD_START+268) -#define SID_RENAMELAYER (SID_SD_START+269) -#define SID_HATCH (SID_SD_START+270) -#define SID_GETFILLSTYLE (SID_SD_START+271) -#define SID_GETLINESTYLE (SID_SD_START+272) -#define SID_GETLINEWIDTH (SID_SD_START+273) -#define SID_SETLINECOLOR (SID_SD_START+274) -#define SID_SETHATCHCOLOR (SID_SD_START+275) -#define SID_SETGRADSTARTCOLOR (SID_SD_START+276) -#define SID_SETGRADENDCOLOR (SID_SD_START+277) -#define SID_SELECTGRADIENT (SID_SD_START+278) -#define SID_SELECTHATCH (SID_SD_START+279) -#define SID_UNSELECT (SID_SD_START+280) -#define SID_TEXTATTR_DLG (SID_SD_START+281) -#define SID_ORIGINAL_SIZE (SID_SD_START+282) -#define SID_PAGES_PER_ROW (SID_SD_START+284) -#define SID_TEXT_FITTOSIZE (SID_SD_START+285) -#define SID_TEXT_FITTOSIZE_VERTICAL (SID_SD_START+286) -#define SID_NAVIGATOR_PAGENAME (SID_SD_START+287) -#define SID_NAVIGATOR_STATE (SID_SD_START+288) -#define SID_NAVIGATOR_INIT (SID_SD_START+289) -#define SID_NAVIGATOR_PEN (SID_SD_START+291) -#define SID_NAVIGATOR_PAGE (SID_SD_START+292) -#define SID_NAVIGATOR_OBJECT (SID_SD_START+293) -#define SID_ANIMATOR_INIT (SID_SD_START+294) -#define SID_DRAWTBX_3D_OBJECTS (SID_SD_START+295) -#define SID_3D_CUBE (SID_SD_START+296) -#define SID_3D_SPHERE (SID_SD_START+297) -#define SID_3D_CYLINDER (SID_SD_START+298) -#define SID_3D_CONE (SID_SD_START+299) -#define SID_3D_PYRAMID (SID_SD_START+300) -#define SID_GLUE_EDITMODE (SID_SD_START+301) -#define SID_GLUE_INSERT_POINT (SID_SD_START+302) -#define SID_GLUE_PERCENT (SID_SD_START+303) -#define SID_GLUE_ESCDIR (SID_SD_START+304) -#define SID_GLUE_HORZALIGN_CENTER (SID_SD_START+305) -#define SID_GLUE_HORZALIGN_LEFT (SID_SD_START+306) -#define SID_GLUE_HORZALIGN_RIGHT (SID_SD_START+307) -#define SID_GLUE_VERTALIGN_CENTER (SID_SD_START+308) -#define SID_GLUE_VERTALIGN_TOP (SID_SD_START+309) -#define SID_GLUE_VERTALIGN_BOTTOM (SID_SD_START+310) -#define SID_3D_SHELL (SID_SD_START+311) -#define SID_3D_TORUS (SID_SD_START+312) -#define SID_3D_HALF_SPHERE (SID_SD_START+313) -#define SID_GLUE_ESCDIR_LEFT (SID_SD_START+314) -#define SID_GLUE_ESCDIR_RIGHT (SID_SD_START+315) -#define SID_GLUE_ESCDIR_TOP (SID_SD_START+316) -#define SID_GLUE_ESCDIR_BOTTOM (SID_SD_START+317) -#define SID_DRAWTBX_INSERT (SID_SD_START+318) -#define SID_POLYGON_MORPHING (SID_SD_START+319) -#define SID_MEASURE_DLG (SID_SD_START+320) -#define SID_EXPORT (SID_SD_START+321) -#define SID_GRID_VISIBLE (SID_SD_START+322) -#define SID_GRID_FRONT (SID_SD_START+323) -#define SID_HELPLINES_VISIBLE (SID_SD_START+324) -#define SID_HELPLINES_FRONT (SID_SD_START+325) -#define SID_BEFORE_OBJ (SID_SD_START+326) -#define SID_PREVIEW_WIN (SID_SD_START+327) -#define SID_CUSTOM_ANIMATION_PANEL (SID_SD_START+328) -#define SID_PREVIEW_STATE (SID_SD_START+329) +#define SID_GETRED (SID_SD_START+259) +#define SID_GETBLUE (SID_SD_START+260) +#define SID_GETGREEN (SID_SD_START+261) +#define SID_SETFILLSTYLE (SID_SD_START+262) +#define SID_SETFILLCOLOR (SID_SD_START+263) +#define SID_GRADIENT (SID_SD_START+264) +#define SID_SETLINESTYLE (SID_SD_START+265) +#define SID_SETLINEWIDTH (SID_SD_START+266) +#define SID_DASH (SID_SD_START+267) +#define SID_RENAMEPAGE (SID_SD_START+268) +#define SID_RENAMELAYER (SID_SD_START+269) +#define SID_HATCH (SID_SD_START+270) +#define SID_GETFILLSTYLE (SID_SD_START+271) +#define SID_GETLINESTYLE (SID_SD_START+272) +#define SID_GETLINEWIDTH (SID_SD_START+273) +#define SID_SETLINECOLOR (SID_SD_START+274) +#define SID_SETHATCHCOLOR (SID_SD_START+275) +#define SID_SETGRADSTARTCOLOR (SID_SD_START+276) +#define SID_SETGRADENDCOLOR (SID_SD_START+277) +#define SID_SELECTGRADIENT (SID_SD_START+278) +#define SID_SELECTHATCH (SID_SD_START+279) +#define SID_UNSELECT (SID_SD_START+280) +#define SID_TEXTATTR_DLG (SID_SD_START+281) +#define SID_ORIGINAL_SIZE (SID_SD_START+282) +#define SID_PAGES_PER_ROW (SID_SD_START+284) +#define SID_TEXT_FITTOSIZE (SID_SD_START+285) +#define SID_TEXT_FITTOSIZE_VERTICAL (SID_SD_START+286) +#define SID_NAVIGATOR_PAGENAME (SID_SD_START+287) +#define SID_NAVIGATOR_STATE (SID_SD_START+288) +#define SID_NAVIGATOR_INIT (SID_SD_START+289) +#define SID_NAVIGATOR_PEN (SID_SD_START+291) +#define SID_NAVIGATOR_PAGE (SID_SD_START+292) +#define SID_NAVIGATOR_OBJECT (SID_SD_START+293) +#define SID_ANIMATOR_INIT (SID_SD_START+294) +#define SID_DRAWTBX_3D_OBJECTS (SID_SD_START+295) +#define SID_3D_CUBE (SID_SD_START+296) +#define SID_3D_SPHERE (SID_SD_START+297) +#define SID_3D_CYLINDER (SID_SD_START+298) +#define SID_3D_CONE (SID_SD_START+299) +#define SID_3D_PYRAMID (SID_SD_START+300) +#define SID_GLUE_EDITMODE (SID_SD_START+301) +#define SID_GLUE_INSERT_POINT (SID_SD_START+302) +#define SID_GLUE_PERCENT (SID_SD_START+303) +#define SID_GLUE_ESCDIR (SID_SD_START+304) +#define SID_GLUE_HORZALIGN_CENTER (SID_SD_START+305) +#define SID_GLUE_HORZALIGN_LEFT (SID_SD_START+306) +#define SID_GLUE_HORZALIGN_RIGHT (SID_SD_START+307) +#define SID_GLUE_VERTALIGN_CENTER (SID_SD_START+308) +#define SID_GLUE_VERTALIGN_TOP (SID_SD_START+309) +#define SID_GLUE_VERTALIGN_BOTTOM (SID_SD_START+310) +#define SID_3D_SHELL (SID_SD_START+311) +#define SID_3D_TORUS (SID_SD_START+312) +#define SID_3D_HALF_SPHERE (SID_SD_START+313) +#define SID_GLUE_ESCDIR_LEFT (SID_SD_START+314) +#define SID_GLUE_ESCDIR_RIGHT (SID_SD_START+315) +#define SID_GLUE_ESCDIR_TOP (SID_SD_START+316) +#define SID_GLUE_ESCDIR_BOTTOM (SID_SD_START+317) +#define SID_DRAWTBX_INSERT (SID_SD_START+318) +#define SID_POLYGON_MORPHING (SID_SD_START+319) +#define SID_MEASURE_DLG (SID_SD_START+320) +#define SID_EXPORT (SID_SD_START+321) +#define SID_GRID_VISIBLE (SID_SD_START+322) +#define SID_GRID_FRONT (SID_SD_START+323) +#define SID_HELPLINES_VISIBLE (SID_SD_START+324) +#define SID_HELPLINES_FRONT (SID_SD_START+325) +#define SID_BEFORE_OBJ (SID_SD_START+326) +#define SID_PREVIEW_WIN (SID_SD_START+327) +#define SID_CUSTOM_ANIMATION_PANEL (SID_SD_START+328) +#define SID_PREVIEW_STATE (SID_SD_START+329) #define SID_CUSTOM_ANIMATION_SCHEMES_PANEL (SID_SD_START+333) -#define SID_SLIDE_TRANSITIONS_PANEL (SID_SD_START+334) +#define SID_SLIDE_TRANSITIONS_PANEL (SID_SD_START+334) // free -#define SID_CONNECTION_DLG (SID_SD_START+338) -#define SID_PRESENTATION_DLG (SID_SD_START+339) -#define SID_HYPHENATION (SID_SD_START+340) -#define SID_CONNECTION_NEW_ROUTING (SID_SD_START+341) +#define SID_CONNECTION_DLG (SID_SD_START+338) +#define SID_PRESENTATION_DLG (SID_SD_START+339) +#define SID_HYPHENATION (SID_SD_START+340) +#define SID_CONNECTION_NEW_ROUTING (SID_SD_START+341) #define SID_DUPLICATE_PAGE (SID_SD_START+342) #define SID_EXPAND_PAGE (SID_SD_START+343) #define SID_SUMMARY_PAGE (SID_SD_START+344) @@ -369,76 +369,76 @@ #define SID_NOTES_MASTERPAGE (SID_SD_START+350) #define SID_TITLE_MASTERPAGE (SID_SD_START+351) #define SID_INSERTPAGE_QUICK (SID_SD_START+352) -#define SID_SAVEGRAPHIC (SID_SD_START+353) +#define SID_SAVEGRAPHIC (SID_SD_START+353) // free -#define SID_INSERT_FLD_DATE_VAR (SID_SD_START+357) -#define SID_INSERT_FLD_DATE_FIX (SID_SD_START+358) -#define SID_INSERT_FLD_TIME_VAR (SID_SD_START+359) -#define SID_INSERT_FLD_TIME_FIX (SID_SD_START+360) -#define SID_INSERT_FLD_PAGE (SID_SD_START+361) -#define SID_MODIFY_FIELD (SID_SD_START+362) -#define SID_INSERT_FLD_FILE (SID_SD_START+363) -#define SID_INSERT_FLD_AUTHOR (SID_SD_START+364) -#define SID_CUSTOMSHOW_DLG (SID_SD_START+365) +#define SID_INSERT_FLD_DATE_VAR (SID_SD_START+357) +#define SID_INSERT_FLD_DATE_FIX (SID_SD_START+358) +#define SID_INSERT_FLD_TIME_VAR (SID_SD_START+359) +#define SID_INSERT_FLD_TIME_FIX (SID_SD_START+360) +#define SID_INSERT_FLD_PAGE (SID_SD_START+361) +#define SID_MODIFY_FIELD (SID_SD_START+362) +#define SID_INSERT_FLD_FILE (SID_SD_START+363) +#define SID_INSERT_FLD_AUTHOR (SID_SD_START+364) +#define SID_CUSTOMSHOW_DLG (SID_SD_START+365) -#define SID_OUTPUT_QUALITY_COLOR (SID_SD_START+366) -#define SID_OUTPUT_QUALITY_GRAYSCALE (SID_SD_START+367) -#define SID_OUTPUT_QUALITY_BLACKWHITE (SID_SD_START+368) -#define SID_PREVIEW_QUALITY_COLOR (SID_SD_START+369) -#define SID_PREVIEW_QUALITY_GRAYSCALE (SID_SD_START+370) -#define SID_PREVIEW_QUALITY_BLACKWHITE (SID_SD_START+371) -#define SID_VECTORIZE (SID_SD_START+372) +#define SID_OUTPUT_QUALITY_COLOR (SID_SD_START+366) +#define SID_OUTPUT_QUALITY_GRAYSCALE (SID_SD_START+367) +#define SID_OUTPUT_QUALITY_BLACKWHITE (SID_SD_START+368) +#define SID_PREVIEW_QUALITY_COLOR (SID_SD_START+369) +#define SID_PREVIEW_QUALITY_GRAYSCALE (SID_SD_START+370) +#define SID_PREVIEW_QUALITY_BLACKWHITE (SID_SD_START+371) +#define SID_VECTORIZE (SID_SD_START+372) -#define SID_INSERT_FLD_PAGES (SID_SD_START+373) +#define SID_INSERT_FLD_PAGES (SID_SD_START+373) -#define SID_CONVERT_TO_BITMAP (SID_SD_START+378) -#define SID_CONVERT_TO_METAFILE (SID_SD_START+379) +#define SID_CONVERT_TO_BITMAP (SID_SD_START+378) +#define SID_CONVERT_TO_METAFILE (SID_SD_START+379) -#define SID_PACKNGO (SID_SD_START+380) +#define SID_PACKNGO (SID_SD_START+380) -#define SID_CONVERT_TO_CONTOUR (SID_SD_START+381) +#define SID_CONVERT_TO_CONTOUR (SID_SD_START+381) -#define SID_EDIT_HYPERLINK (SID_SD_START+382) +#define SID_EDIT_HYPERLINK (SID_SD_START+382) -#define SID_GRAFFILTER_SOBEL (SID_SD_START+390) -#define SID_GRAFFILTER_MOSAIC (SID_SD_START+391) -#define SID_GRAFFILTER_EMBOSS (SID_SD_START+392) -#define SID_GRAFFILTER_POSTER (SID_SD_START+393) -#define SID_GRAFFILTER_POPART (SID_SD_START+394) -#define SID_GRAFFILTER_SEPIA (SID_SD_START+395) -#define SID_GRAFFILTER_SOLARIZE (SID_SD_START+396) +#define SID_GRAFFILTER_SOBEL (SID_SD_START+390) +#define SID_GRAFFILTER_MOSAIC (SID_SD_START+391) +#define SID_GRAFFILTER_EMBOSS (SID_SD_START+392) +#define SID_GRAFFILTER_POSTER (SID_SD_START+393) +#define SID_GRAFFILTER_POPART (SID_SD_START+394) +#define SID_GRAFFILTER_SEPIA (SID_SD_START+395) +#define SID_GRAFFILTER_SOLARIZE (SID_SD_START+396) -#define SID_OUTPUT_QUALITY_CONTRAST (SID_SD_START+400) -#define SID_PREVIEW_QUALITY_CONTRAST (SID_SD_START+401) +#define SID_OUTPUT_QUALITY_CONTRAST (SID_SD_START+400) +#define SID_PREVIEW_QUALITY_CONTRAST (SID_SD_START+401) #define SID_RENAMEPAGE_QUICK (SID_SD_START+405) #define SID_SWITCH_SHELL (SID_SD_START+406) -#define SID_HEADER_AND_FOOTER (SID_SD_START+407) -#define SID_MASTER_LAYOUTS (SID_SD_START+408) +#define SID_HEADER_AND_FOOTER (SID_SD_START+407) +#define SID_MASTER_LAYOUTS (SID_SD_START+408) /* -#define SID_MASTER_LAYOUTS_NOTES (SID_SD_START+409) -#define SID_MASTER_LAYOUTS_HANDOUTS (SID_SD_START+410) +#define SID_MASTER_LAYOUTS_NOTES (SID_SD_START+409) +#define SID_MASTER_LAYOUTS_HANDOUTS (SID_SD_START+410) */ -#define SID_INSERT_PAGE_NUMBER (SID_SD_START+411) -#define SID_INSERT_DATE_TIME (SID_SD_START+412) +#define SID_INSERT_PAGE_NUMBER (SID_SD_START+411) +#define SID_INSERT_DATE_TIME (SID_SD_START+412) -#define SID_SDMODE_FLAG (SID_SD_START+413) -#define SD_DRAW_MODE 1 -#define SD_IMPRESS_MODE 2 +#define SID_SDMODE_FLAG (SID_SD_START+413) +#define SD_DRAW_MODE 1 +#define SD_IMPRESS_MODE 2 #define SID_LEFT_PANE_IMPRESS (SID_SD_START+414) #define SID_LEFT_PANE_DRAW (SID_SD_START+415) // FREE #define SID_NOTES_WINDOW (SID_SD_START+417) #define SID_SWITCH_SHELL_PANE (SID_SD_START+418) -#define SID_LAYER_DIALOG_WIN (SID_SD_START+419) -#define SID_NORMAL_MULTI_PANE_GUI (SID_SD_START+420) -#define SID_SLIDE_SORTER_MULTI_PANE_GUI (SID_SD_START+421) +#define SID_LAYER_DIALOG_WIN (SID_SD_START+419) +#define SID_NORMAL_MULTI_PANE_GUI (SID_SD_START+420) +#define SID_SLIDE_SORTER_MULTI_PANE_GUI (SID_SD_START+421) -#define SID_SELECT_BACKGROUND (SID_SD_START+422) -#define SID_OBJECT_CROP (SID_SD_START+423) +#define SID_SELECT_BACKGROUND (SID_SD_START+422) +#define SID_OBJECT_CROP (SID_SD_START+423) // Slots for the tool pane popup #define SID_TP_APPLY_TO_ALL_SLIDES (SID_SD_START+425) @@ -455,12 +455,12 @@ #define SID_DISPLAY_MASTER_BACKGROUND (SID_SD_START+436) #define SID_DISPLAY_MASTER_OBJECTS (SID_SD_START+437) #define SID_INSERTPAGE_LAYOUT_MENU (SID_SD_START+438) -#define SID_TP_EDIT_MASTER (SID_SD_START+439) +#define SID_TP_EDIT_MASTER (SID_SD_START+439) // Add companion for the SID_HIDE_SLIDE (that is defined in svx) #define SID_SHOW_SLIDE (SID_SD_START+440) -#define SID_ADD_MOTION_PATH (SID_SD_START+441) -#define SID_TABLE_TOOLBOX (SID_SD_START+442) +#define SID_ADD_MOTION_PATH (SID_SD_START+441) +#define SID_TABLE_TOOLBOX (SID_SD_START+442) #endif diff --git a/sd/inc/app.hxx b/sd/inc/app.hxx index d3bb871f7a29..1fa4af2e730c 100644 --- a/sd/inc/app.hxx +++ b/sd/inc/app.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx index e2aae99cf673..d724a34cdff9 100755 --- a/sd/inc/cusshow.hxx +++ b/sd/inc/cusshow.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/inc/diadef.h b/sd/inc/diadef.h index 9c128e48f3cf..c8fa5339e10b 100644 --- a/sd/inc/diadef.h +++ b/sd/inc/diadef.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 6811da762934..be38885414ba 100755 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -161,11 +161,11 @@ namespace sd class SdDrawDocument : public FmFormModel { private: - ::sd::Outliner* mpOutliner; // local outliner for outline mode - ::sd::Outliner* mpInternalOutliner; // internal outliner for creation of text objects - Timer* mpWorkStartupTimer; + ::sd::Outliner* mpOutliner; // local outliner for outline mode + ::sd::Outliner* mpInternalOutliner; // internal outliner for creation of text objects + Timer* mpWorkStartupTimer; Timer* mpOnlineSpellingTimer; - sd::ShapeList* mpOnlineSpellingList; + sd::ShapeList* mpOnlineSpellingList; SvxSearchItem* mpOnlineSearchItem; List* mpFrameViewList; List* mpCustomShowList; @@ -173,26 +173,26 @@ private: SdTransferable * mpCreatingTransferable; BOOL mbHasOnlineSpellErrors; BOOL mbInitialOnlineSpellingEnabled; - String maBookmarkFile; - ::sd::DrawDocShellRef mxBookmarkDocShRef; + String maBookmarkFile; + ::sd::DrawDocShellRef mxBookmarkDocShRef; sd::PresentationSettings maPresentationSettings; ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation2 > mxPresentation; - BOOL mbNewOrLoadCompleted; + BOOL mbNewOrLoadCompleted; - BOOL mbOnlineSpell; + BOOL mbOnlineSpell; BOOL mbSummationOfParagraphs; - bool mbStartWithPresentation; // is set to true when starting with command line parameter -start - LanguageType meLanguage; - LanguageType meLanguageCJK; - LanguageType meLanguageCTL; - SvxNumType mePageNumType; + bool mbStartWithPresentation; // is set to true when starting with command line parameter -start + LanguageType meLanguage; + LanguageType meLanguageCJK; + LanguageType meLanguageCTL; + SvxNumType mePageNumType; ::sd::DrawDocShellRef mxAllocedDocShRef; // => AllocModel() - BOOL mbAllocDocSh; // => AllocModel() + BOOL mbAllocDocSh; // => AllocModel() DocumentType meDocType; - CharClass* mpCharClass; + CharClass* mpCharClass; ::com::sun::star::lang::Locale* mpLocale; // #109538# @@ -209,7 +209,7 @@ private: DECL_LINK(OnlineSpellEventHdl, EditStatus*); std::vector< rtl::OUString > maAnnotationAuthors; - + protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel(); @@ -231,46 +231,46 @@ public: virtual void SetChanged(sal_Bool bFlag = sal_True); virtual SvStream* GetDocumentStream(SdrDocumentStreamInfo& rStreamInfo) const; - SfxItemPool& GetPool() { return( *pItemPool ); } + SfxItemPool& GetPool() { return( *pItemPool ); } ::sd::Outliner* GetOutliner(BOOL bCreateOutliner=TRUE); SD_DLLPUBLIC ::sd::Outliner* GetInternalOutliner(BOOL bCreateOutliner=TRUE); - + ::sd::DrawDocShell* GetDocSh() const { return mpDocSh; } - LanguageType GetLanguage( const USHORT nId ) const; - void SetLanguage( const LanguageType eLang, const USHORT nId ); + LanguageType GetLanguage( const USHORT nId ) const; + void SetLanguage( const LanguageType eLang, const USHORT nId ); SvxNumType GetPageNumType() const; - void SetPageNumType(SvxNumType eType) { mePageNumType = eType; } + void SetPageNumType(SvxNumType eType) { mePageNumType = eType; } SD_DLLPUBLIC String CreatePageNumValue(USHORT nNum) const; DocumentType GetDocumentType() const { return meDocType; } - void SetAllocDocSh(BOOL bAlloc); - - void CreatingDataObj( SdTransferable* pTransferable ) { mpCreatingTransferable = pTransferable; } + void SetAllocDocSh(BOOL bAlloc); + void CreatingDataObj( SdTransferable* pTransferable ) { mpCreatingTransferable = pTransferable; } + /** if the document does not contain at least one handout, one slide and one notes page with at least one master each this methods creates them. If a reference document is given, the sizes and border settings of that document are used for newly created slides. */ - SD_DLLPUBLIC void CreateFirstPages( SdDrawDocument* pRefDocument = 0 ); + SD_DLLPUBLIC void CreateFirstPages( SdDrawDocument* pRefDocument = 0 ); SD_DLLPUBLIC BOOL CreateMissingNotesAndHandoutPages(); - void MovePage(USHORT nPgNum, USHORT nNewPos); - void InsertPage(SdrPage* pPage, USHORT nPos=0xFFFF); - void DeletePage(USHORT nPgNum); + void MovePage(USHORT nPgNum, USHORT nNewPos); + void InsertPage(SdrPage* pPage, USHORT nPos=0xFFFF); + void DeletePage(USHORT nPgNum); SdrPage* RemovePage(USHORT nPgNum); virtual void InsertMasterPage(SdrPage* pPage, USHORT nPos=0xFFFF); virtual SdrPage* RemoveMasterPage(USHORT nPgNum); - void RemoveUnnecessaryMasterPages( SdPage* pMaster=NULL, BOOL bOnlyDuplicatePages=FALSE, BOOL bUndo=TRUE ); - SD_DLLPUBLIC void SetMasterPage(USHORT nSdPageNum, const String& rLayoutName, + void RemoveUnnecessaryMasterPages( SdPage* pMaster=NULL, BOOL bOnlyDuplicatePages=FALSE, BOOL bUndo=TRUE ); + SD_DLLPUBLIC void SetMasterPage(USHORT nSdPageNum, const String& rLayoutName, SdDrawDocument* pSourceDoc, BOOL bMaster, BOOL bCheckMasters); - + SD_DLLPUBLIC SdDrawDocument* OpenBookmarkDoc(const String& rBookmarkFile); SdDrawDocument* OpenBookmarkDoc(SfxMedium& rMedium); BOOL InsertBookmark(List* pBookmarkList, List* pExchangeList, BOOL bLink, @@ -334,11 +334,11 @@ public: BOOL InsertBookmarkAsObject(List* pBookmarkList, List* pExchangeListL, BOOL bLink, ::sd::DrawDocShell* pBookmarkDocSh, Point* pObjPos); - void IterateBookmarkPages( SdDrawDocument* pBookmarkDoc, List* pBookmarkList, + void IterateBookmarkPages( SdDrawDocument* pBookmarkDoc, List* pBookmarkList, USHORT nBMSdPageCount, InsertBookmarkAsPage_PageFunctorBase& rPageIterator ); - SD_DLLPUBLIC void CloseBookmarkDoc(); - + SD_DLLPUBLIC void CloseBookmarkDoc(); + SdrObject* GetObj(const String& rObjName) const; /** Return the first page that has the given name. Regular pages and @@ -356,23 +356,23 @@ public: */ USHORT GetPageByName(const String& rPgName, BOOL& rbIsMasterPage ) const; SD_DLLPUBLIC SdPage*GetSdPage(USHORT nPgNum, PageKind ePgKind) const; - SD_DLLPUBLIC USHORT GetSdPageCount(PageKind ePgKind) const; - - void SetSelected(SdPage* pPage, BOOL bSelect); - BOOL MovePages(USHORT nTargetPage); + SD_DLLPUBLIC USHORT GetSdPageCount(PageKind ePgKind) const; + void SetSelected(SdPage* pPage, BOOL bSelect); + BOOL MovePages(USHORT nTargetPage); + SD_DLLPUBLIC SdPage*GetMasterSdPage(USHORT nPgNum, PageKind ePgKind); - SD_DLLPUBLIC USHORT GetMasterSdPageCount(PageKind ePgKind) const; - - USHORT GetMasterPageUserCount(SdrPage* pMaster) const; - + SD_DLLPUBLIC USHORT GetMasterSdPageCount(PageKind ePgKind) const; + + USHORT GetMasterPageUserCount(SdrPage* pMaster) const; + const sd::PresentationSettings& getPresentationSettings() const { return maPresentationSettings; } sd::PresentationSettings& getPresentationSettings() { return maPresentationSettings; } - + const ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation2 >& getPresentation() const; void SetSummationOfParagraphs( BOOL bOn = TRUE ) { mbSummationOfParagraphs = bOn; } - BOOL IsSummationOfParagraphs() const { return mbSummationOfParagraphs; } + BOOL IsSummationOfParagraphs() const { return mbSummationOfParagraphs; } /** Set the mode that controls whether (and later how) the formatting of the document depends on the current printer metrics. @@ -410,20 +410,20 @@ public: List* GetFrameViewList() const { return mpFrameViewList; } SD_DLLPUBLIC List* GetCustomShowList(BOOL bCreate = FALSE); - + void NbcSetChanged(sal_Bool bFlag = sal_True); void SetTextDefaults() const; void CreateLayoutTemplates(); void RenameLayoutTemplate(const String& rOldLayoutName, const String& rNewName); - - void CreateDefaultCellStyles(); + + void CreateDefaultCellStyles(); SD_DLLPUBLIC void StopWorkStartupDelay(); - + void NewOrLoadCompleted(DocCreationMode eMode); - void NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool ); + void NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool ); BOOL IsNewOrLoadCompleted() const {return mbNewOrLoadCompleted; } ::sd::FrameView* GetFrameView(ULONG nPos) { @@ -433,16 +433,16 @@ public: /** deprecated*/ SdAnimationInfo* GetAnimationInfo(SdrObject* pObject) const; - SD_DLLPUBLIC static SdAnimationInfo* GetShapeUserData(SdrObject& rObject, bool bCreate = false ); + SD_DLLPUBLIC static SdAnimationInfo* GetShapeUserData(SdrObject& rObject, bool bCreate = false ); SdIMapInfo* GetIMapInfo( SdrObject* pObject ) const; IMapObject* GetHitIMapObject( SdrObject* pObject, const Point& rWinPoint, const ::Window& rCmpWnd ); - CharClass* GetCharClass() const { return mpCharClass; } + CharClass* GetCharClass() const { return mpCharClass; } void RestoreLayerNames(); - void UpdateAllLinks(); + void UpdateAllLinks(); void CheckMasterPages(); @@ -451,7 +451,7 @@ public: USHORT nDestPos=0xFFFF, FASTBOOL bMergeMasterPages=FALSE, FASTBOOL bAllMasterPages=FALSE, FASTBOOL bUndo=TRUE, FASTBOOL bTreadSourceAsConst=FALSE); - + SD_DLLPUBLIC ::com::sun::star::text::WritingMode GetDefaultWritingMode() const; void SetDefaultWritingMode( ::com::sun::star::text::WritingMode eMode ); diff --git a/sd/inc/eetext.hxx b/sd/inc/eetext.hxx index 1bae1de6c1e9..7edbb120b61e 100644 --- a/sd/inc/eetext.hxx +++ b/sd/inc/eetext.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,6 +29,6 @@ #include <editeng/outliner.hxx> -#endif // EETEXT_HXX +#endif // EETEXT_HXX diff --git a/sd/inc/fadedef.h b/sd/inc/fadedef.h index 9a9fdf709344..0b46e061b952 100644 --- a/sd/inc/fadedef.h +++ b/sd/inc/fadedef.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,5 +40,5 @@ enum FadeSpeed // muss angepasst werden! #define FADE_SPEED_COUNT 3 -#endif // _SD_FADEDEF_H +#endif // _SD_FADEDEF_H diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc index 73189f135e62..eebb52f02c89 100755 --- a/sd/inc/glob.hrc +++ b/sd/inc/glob.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -98,13 +98,13 @@ #define STR_POOLSHEET_HEADLINE1 RID_GLOB_START+66 #define STR_POOLSHEET_HEADLINE2 RID_GLOB_START+67 #define STR_POOLSHEET_MEASURE RID_GLOB_START+68 -#define STR_POOLSHEET_ARROW RID_GLOB_START+69 +#define STR_POOLSHEET_ARROW RID_GLOB_START+69 // -#define STR_POOLSHEET_BANDED_CELL RID_GLOB_START+70 -#define STR_POOLSHEET_HEADER RID_GLOB_START+71 -#define STR_POOLSHEET_TOTAL RID_GLOB_START+72 -#define STR_POOLSHEET_FIRST_COLUMN RID_GLOB_START+73 -#define STR_POOLSHEET_LAST_COLUMN RID_GLOB_START+74 +#define STR_POOLSHEET_BANDED_CELL RID_GLOB_START+70 +#define STR_POOLSHEET_HEADER RID_GLOB_START+71 +#define STR_POOLSHEET_TOTAL RID_GLOB_START+72 +#define STR_POOLSHEET_FIRST_COLUMN RID_GLOB_START+73 +#define STR_POOLSHEET_LAST_COLUMN RID_GLOB_START+74 // #define STR_PSEUDOSHEET_TITLE RID_GLOB_START+80 #define STR_PSEUDOSHEET_OUTLINE RID_GLOB_START+81 @@ -116,23 +116,23 @@ #define STR_EMPTY_STYLESHEET_NAME RID_GLOB_START+91 #define STR_LAYER_MEASURELINES RID_GLOB_START+92 #define STR_LAYOUT_DEFAULT_TITLE_NAME RID_GLOB_START+93 -#define STR_GRAFOBJECTBARSHELL RID_GLOB_START+94 -#define STR_POWERPOINT_IMPORT RID_GLOB_START+95 -#define STR_STAROFFICE_XML_DRAW RID_GLOB_START+96 -#define STR_STAROFFICE_XML_IMPRESS RID_GLOB_START+97 -#define STR_PRESVIEWSHELL RID_GLOB_START+98 -#define STR_LOAD_DOC RID_GLOB_START+99 -#define STR_SAVE_DOC RID_GLOB_START+100 -#define STR_PREVIEWVIEWSHELL RID_GLOB_START+101 -#define RID_SD_ERRHDL RID_GLOB_START+102 +#define STR_GRAFOBJECTBARSHELL RID_GLOB_START+94 +#define STR_POWERPOINT_IMPORT RID_GLOB_START+95 +#define STR_STAROFFICE_XML_DRAW RID_GLOB_START+96 +#define STR_STAROFFICE_XML_IMPRESS RID_GLOB_START+97 +#define STR_PRESVIEWSHELL RID_GLOB_START+98 +#define STR_LOAD_DOC RID_GLOB_START+99 +#define STR_SAVE_DOC RID_GLOB_START+100 +#define STR_PREVIEWVIEWSHELL RID_GLOB_START+101 +#define RID_SD_ERRHDL RID_GLOB_START+102 #define STR_VIEWSHELLBASE RID_GLOB_START+103 -#define STR_3DOBJECTBARSHELL RID_GLOB_START+104 -#define STR_FONTWORKOBJECTBARSHELL RID_GLOB_START+105 +#define STR_3DOBJECTBARSHELL RID_GLOB_START+104 +#define STR_FONTWORKOBJECTBARSHELL RID_GLOB_START+105 #define STR_SLIDESORTERVIEWSHELL RID_GLOB_START+106 #define STR_TASKPANEVIEWSHELL RID_GLOB_START+107 #define STR_MASTERPAGESSELECTOR RID_GLOB_START+108 #define STR_TASKPANELAYOUTMENU RID_GLOB_START+109 -#define STR_MEDIAOBJECTBARSHELL RID_GLOB_START+110 +#define STR_MEDIAOBJECTBARSHELL RID_GLOB_START+110 #define STR_PAGE_NAME RID_GLOB_START+111 #define STR_SLIDE_NAME RID_GLOB_START+112 #define STR_LEFT_IMPRESS_PANE_SHELL RID_GLOB_START+113 @@ -140,17 +140,17 @@ #define STR_RIGHT_PANE_SHELL RID_GLOB_START+115 #define STR_TOOL_PANEL_SHELL RID_GLOB_START+116 -#define RID_CUSTOMANIMATION_START RID_GLOB_START+120 -#define RID_CUSTOMANIMATION_END RID_GLOB_START+199 -#define RID_ANNOTATIONS_START RID_GLOB_START+200 -#define RID_ANNOTATIONS_END RID_GLOB_START+220 -#define STR_UNDO_ANIMATION RID_GLOB_START+221 -#define STR_UNDO_SLIDE_PARAMS RID_GLOB_START+222 -#define RID_SLIDESHOW_CONTEXTMENU RID_GLOB_START+223 +#define RID_CUSTOMANIMATION_START RID_GLOB_START+120 +#define RID_CUSTOMANIMATION_END RID_GLOB_START+199 +#define RID_ANNOTATIONS_START RID_GLOB_START+200 +#define RID_ANNOTATIONS_END RID_GLOB_START+220 +#define STR_UNDO_ANIMATION RID_GLOB_START+221 +#define STR_UNDO_SLIDE_PARAMS RID_GLOB_START+222 +#define RID_SLIDESHOW_CONTEXTMENU RID_GLOB_START+223 -#define DLG_TABLEDESIGNPANE RID_GLOB_START+224 -#define STR_TABLEOBJECTBARSHELL RID_GLOB_START+225 -#define RID_TABPAGE_PARA_NUMBERING RID_GLOB_START+226 +#define DLG_TABLEDESIGNPANE RID_GLOB_START+224 +#define STR_TABLEOBJECTBARSHELL RID_GLOB_START+225 +#define RID_TABPAGE_PARA_NUMBERING RID_GLOB_START+226 #define STR_CUSTOMANIMATIONPANE RID_GLOB_START+227 #define STR_SLIDE_TRANSITION_PANE RID_GLOB_START+228 diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx index 278aef490fdb..c2e0bf732d6d 100755 --- a/sd/inc/glob.hxx +++ b/sd/inc/glob.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,9 +34,9 @@ //------------------------------------------------------------------ -#define DIA_SLOW 0 -#define DIA_MEDIUM 1 -#define DIA_FAST 2 +#define DIA_SLOW 0 +#define DIA_MEDIUM 1 +#define DIA_FAST 2 #define SD_IF_SDAPP SFX_INTERFACE_SD_START + 0 #define SD_IF_SDDRAWDOCSHELL SFX_INTERFACE_SD_START + 1 @@ -50,21 +50,21 @@ #define SD_IF_SDGRAPHICDOCSHELL SFX_INTERFACE_SD_START + 10 #define SD_IF_SDGRAPHICVIEWSHELL SFX_INTERFACE_SD_START + 11 #define SD_IF_SDGRAPHICSTDOBJECTBAR SFX_INTERFACE_SD_START + 12 -#define SD_IF_SDDRAWGRAFOBJECTBAR SFX_INTERFACE_SD_START + 13 +#define SD_IF_SDDRAWGRAFOBJECTBAR SFX_INTERFACE_SD_START + 13 #define SD_IF_SDPRESVIEWSHELL SFX_INTERFACE_SD_START + 14 #define SD_IF_SDPREVIEWVIEWSHELL SFX_INTERFACE_SD_START + 15 #define SD_IF_SDVIEWSHELLBASE SFX_INTERFACE_SD_START + 16 -#define SD_IF_SD3DOBJECTBAR SFX_INTERFACE_SD_START + 17 -#define SD_IF_SDFONTWORKOBJECTBAR SFX_INTERFACE_SD_START + 18 +#define SD_IF_SD3DOBJECTBAR SFX_INTERFACE_SD_START + 17 +#define SD_IF_SDFONTWORKOBJECTBAR SFX_INTERFACE_SD_START + 18 #define SD_IF_SDSLIDESORTERVIEWSHELL SFX_INTERFACE_SD_START + 19 #define SD_IF_SDTASKPANEVIEWSHELL SFX_INTERFACE_SD_START + 20 #define SD_IF_SDMASTERPAGESSELECTOR SFX_INTERFACE_SD_START + 21 #define SD_IF_SDLAYOUTMENU SFX_INTERFACE_SD_START + 22 -#define SD_IF_SDDRAWMEDIAOBJECTBAR SFX_INTERFACE_SD_START + 23 +#define SD_IF_SDDRAWMEDIAOBJECTBAR SFX_INTERFACE_SD_START + 23 #define SD_IF_SDLEFTIMPRESSPANESHELL SFX_INTERFACE_SD_START + 24 #define SD_IF_SDLEFTDRAWPANESHELL SFX_INTERFACE_SD_START + 25 #define SD_IF_SDRIGHTPANESHELL SFX_INTERFACE_SD_START + 26 -#define SD_IF_SDDRAWTABLEOBJECTBAR SFX_INTERFACE_SD_START + 27 +#define SD_IF_SDDRAWTABLEOBJECTBAR SFX_INTERFACE_SD_START + 27 #define SD_IF_SDANNOTATIONSHELL SFX_INTERFACE_SD_START + 28 #define SD_IF_SDTOOLPANELPANESHELL SFX_INTERFACE_SD_START + 29 #define SD_IF_SDTOOLPANELSHELL SFX_INTERFACE_SD_START + 30 @@ -77,19 +77,19 @@ const UINT32 SdUDInventor=UINT32('S')*0x00000001+ // Object-Ids fuer StarDraw UserData #define SD_ANIMATIONINFO_ID 1 -#define SD_IMAPINFO_ID 2 +#define SD_IMAPINFO_ID 2 // FamilyId der Praesentationsvorlagen -#define SD_STYLE_FAMILY_GRAPHICS SFX_STYLE_FAMILY_PARA -#define SD_STYLE_FAMILY_PSEUDO SFX_STYLE_FAMILY_PSEUDO -#define SD_STYLE_FAMILY_CELL SFX_STYLE_FAMILY_FRAME -#define SD_STYLE_FAMILY_MASTERPAGE SFX_STYLE_FAMILY_PAGE // ex LT_FAMILY +#define SD_STYLE_FAMILY_GRAPHICS SFX_STYLE_FAMILY_PARA +#define SD_STYLE_FAMILY_PSEUDO SFX_STYLE_FAMILY_PSEUDO +#define SD_STYLE_FAMILY_CELL SFX_STYLE_FAMILY_FRAME +#define SD_STYLE_FAMILY_MASTERPAGE SFX_STYLE_FAMILY_PAGE // ex LT_FAMILY // Trennzeichen zwischen Layoutname und Vorlagenname der Praesentationsvorlagen #define SD_LT_SEPARATOR "~LT~" // Optionsstream-Identifier -#define SD_OPTION_MORPHING "Morph" +#define SD_OPTION_MORPHING "Morph" #define SD_OPTION_VECTORIZE "Vectorize" //------------------------------------------------------------------ diff --git a/sd/inc/helper/simplereferencecomponent.hxx b/sd/inc/helper/simplereferencecomponent.hxx index 115457286663..c8c6d834b32d 100644 --- a/sd/inc/helper/simplereferencecomponent.hxx +++ b/sd/inc/helper/simplereferencecomponent.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h index b693ebe6fd2c..b97faaa84fb2 100644 --- a/sd/inc/helpids.h +++ b/sd/inc/helpids.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,65 +58,65 @@ #define HID_SD_OPTIONS_CONTENTS (HID_SD_START + 21) #define HID_SD_OPTIONS_MISC (HID_SD_START + 22) -#define HID_SD_EFFECT_PREVIEW (HID_SD_START + 23) -#define HID_SD_CTL_NEWFOIL (HID_SD_START + 24) -#define HID_SD_NAVIGATOR_TLB (HID_SD_START + 25) -#define HID_SD_NAVIGATOR (HID_SD_START + 26) +#define HID_SD_EFFECT_PREVIEW (HID_SD_START + 23) +#define HID_SD_CTL_NEWFOIL (HID_SD_START + 24) +#define HID_SD_NAVIGATOR_TLB (HID_SD_START + 25) +#define HID_SD_NAVIGATOR (HID_SD_START + 26) -#define HID_SD_CTL_EFFECTS (HID_SD_START + 27) -#define HID_SD_CTL_TEXT_EFFECTS (HID_SD_START + 28) +#define HID_SD_CTL_EFFECTS (HID_SD_START + 27) +#define HID_SD_CTL_TEXT_EFFECTS (HID_SD_START + 28) -#define HID_SD_CTL_SLIDE_CHANGE (HID_SD_START + 29) +#define HID_SD_CTL_SLIDE_CHANGE (HID_SD_START + 29) -#define HID_SD_NAVIGATOR_TBX (HID_SD_START + 30) -#define HID_SD_NAVIGATOR_LB (HID_SD_START + 31) +#define HID_SD_NAVIGATOR_TBX (HID_SD_START + 30) +#define HID_SD_NAVIGATOR_LB (HID_SD_START + 31) -#define HID_SD_NAVIGATOR_TBI_PEN (HID_SD_START + 33) +#define HID_SD_NAVIGATOR_TBI_PEN (HID_SD_START + 33) #define HID_SD_NAVIGATOR_TBI_FIRST (HID_SD_START + 34) #define HID_SD_NAVIGATOR_TBI_PREV (HID_SD_START + 35) #define HID_SD_NAVIGATOR_TBI_NEXT (HID_SD_START + 36) #define HID_SD_NAVIGATOR_TBI_LAST (HID_SD_START + 37) -#define HID_SD_NAVIGATOR_TBI_DRAGTYPE (HID_SD_START + 38) +#define HID_SD_NAVIGATOR_TBI_DRAGTYPE (HID_SD_START + 38) #define HID_SD_NAVIGATOR_TBI_SHAPE_FILTER (HID_SD_START + 39) // Toolboxen -#define HID_SD_DRAW_DEFAULTTOOLBOX (HID_SD_START + 40) -#define HID_SD_PLUGINTOOLBOX (HID_SD_START + 41) -#define HID_SD_DRAW_TOOLBOX (HID_SD_START + 42) -#define HID_SD_SLIDE_TOOLBOX (HID_SD_START + 43) -#define HID_SD_OUTLINE_TOOLBOX (HID_SD_START + 44) -#define HID_SD_DRAW_OBJ_TOOLBOX (HID_SD_START + 45) -#define HID_SD_DRAW_OPTIONS_TOOLBOX (HID_SD_START + 46) -#define HID_SD_DRAW_COMMONTASK_TOOLBOX (HID_SD_START + 47) -#define HID_SD_BEZIER_TOOLBOX (HID_SD_START + 48) -#define HID_SD_TEXT_TOOLBOX (HID_SD_START + 49) -#define HID_SD_GLUEPOINTS_TOOLBOX (HID_SD_START + 50) -#define HID_SD_SLIDE_OBJ_TOOLBOX (HID_SD_START + 51) +#define HID_SD_DRAW_DEFAULTTOOLBOX (HID_SD_START + 40) +#define HID_SD_PLUGINTOOLBOX (HID_SD_START + 41) +#define HID_SD_DRAW_TOOLBOX (HID_SD_START + 42) +#define HID_SD_SLIDE_TOOLBOX (HID_SD_START + 43) +#define HID_SD_OUTLINE_TOOLBOX (HID_SD_START + 44) +#define HID_SD_DRAW_OBJ_TOOLBOX (HID_SD_START + 45) +#define HID_SD_DRAW_OPTIONS_TOOLBOX (HID_SD_START + 46) +#define HID_SD_DRAW_COMMONTASK_TOOLBOX (HID_SD_START + 47) +#define HID_SD_BEZIER_TOOLBOX (HID_SD_START + 48) +#define HID_SD_TEXT_TOOLBOX (HID_SD_START + 49) +#define HID_SD_GLUEPOINTS_TOOLBOX (HID_SD_START + 50) +#define HID_SD_SLIDE_OBJ_TOOLBOX (HID_SD_START + 51) // FloatingWindows -#define HID_SD_FW_ALIGNMENT (HID_SD_START + 52) -#define HID_SD_FW_ZOOM (HID_SD_START + 53) -#define HID_SD_FW_CHOOSE_MODE (HID_SD_START + 54) -#define HID_SD_FW_TEXT (HID_SD_START + 55) -#define HID_SD_FW_RECTANGLES (HID_SD_START + 56) -#define HID_SD_FW_ELLIPSES (HID_SD_START + 57) -#define HID_SD_FW_LINES (HID_SD_START + 58) -#define HID_SD_FW_ARROWS (HID_SD_START + 59) -#define HID_SD_FW_3D_OBJECTS (HID_SD_START + 60) -#define HID_SD_FW_CONNECTORS (HID_SD_START + 61) -#define HID_SD_FW_INSERT (HID_SD_START + 62) -#define HID_SD_FW_POSITION (HID_SD_START + 63) - -#define HID_SD_BTN_PREVIEW (HID_SD_START + 64) - -#define HID_SD_NAVIGATOR_MENU1 (HID_SD_START + 65) -#define HID_SD_NAVIGATOR_MENU2 (HID_SD_START + 66) -#define HID_SD_NAVIGATOR_MENU3 (HID_SD_START + 67) - -#define HID_SD_WIN_PRESENTATION (HID_SD_START + 68) +#define HID_SD_FW_ALIGNMENT (HID_SD_START + 52) +#define HID_SD_FW_ZOOM (HID_SD_START + 53) +#define HID_SD_FW_CHOOSE_MODE (HID_SD_START + 54) +#define HID_SD_FW_TEXT (HID_SD_START + 55) +#define HID_SD_FW_RECTANGLES (HID_SD_START + 56) +#define HID_SD_FW_ELLIPSES (HID_SD_START + 57) +#define HID_SD_FW_LINES (HID_SD_START + 58) +#define HID_SD_FW_ARROWS (HID_SD_START + 59) +#define HID_SD_FW_3D_OBJECTS (HID_SD_START + 60) +#define HID_SD_FW_CONNECTORS (HID_SD_START + 61) +#define HID_SD_FW_INSERT (HID_SD_START + 62) +#define HID_SD_FW_POSITION (HID_SD_START + 63) + +#define HID_SD_BTN_PREVIEW (HID_SD_START + 64) + +#define HID_SD_NAVIGATOR_MENU1 (HID_SD_START + 65) +#define HID_SD_NAVIGATOR_MENU2 (HID_SD_START + 66) +#define HID_SD_NAVIGATOR_MENU3 (HID_SD_START + 67) + +#define HID_SD_WIN_PRESENTATION (HID_SD_START + 68) // HelpIDs fuer Vorlagen -#define HID_STANDARD_STYLESHEET_NAME (HID_SD_START + 70) +#define HID_STANDARD_STYLESHEET_NAME (HID_SD_START + 70) #define HID_POOLSHEET_OBJWITHARROW (HID_SD_START + 71) #define HID_POOLSHEET_OBJWITHSHADOW (HID_SD_START + 72) #define HID_POOLSHEET_OBJWITHOUTFILL (HID_SD_START + 73) @@ -147,8 +147,8 @@ #define HID_PSEUDOSHEET_BACKGROUND (HID_SD_START + 97) #define HID_PSEUDOSHEET_NOTES (HID_SD_START + 98) -#define HID_DLG_DEFINE_CUSTOMSHOW (HID_SD_START + 99) -#define HID_DLG_DEFINE_CUSTOMSHOW_CTL (HID_SD_START + 100) +#define HID_DLG_DEFINE_CUSTOMSHOW (HID_SD_START + 99) +#define HID_DLG_DEFINE_CUSTOMSHOW_CTL (HID_SD_START + 100) #define HID_PSEUDOSHEET_SUBTITLE (HID_SD_START + 101) @@ -164,23 +164,23 @@ #define HID_SD_HTMLEXPORT_PAGE5 (HID_SD_START + 109) #define HID_SD_HTMLEXPORT_PAGE6 (HID_SD_START + 110) -#define HID_SD_CHGFOIL_LAYOUT (HID_SD_START + 111) -#define HID_SD_CHGFOIL_BACKGROUND (HID_SD_START + 112) -#define HID_SD_CHGFOIL_OBJECTS (HID_SD_START + 113) -#define HID_SD_CHGFOIL_NAME (HID_SD_START + 114) +#define HID_SD_CHGFOIL_LAYOUT (HID_SD_START + 111) +#define HID_SD_CHGFOIL_BACKGROUND (HID_SD_START + 112) +#define HID_SD_CHGFOIL_OBJECTS (HID_SD_START + 113) +#define HID_SD_CHGFOIL_NAME (HID_SD_START + 114) -#define HID_SD_HTMLEXPORT_DLG_DNAME (HID_SD_START + 115) +#define HID_SD_HTMLEXPORT_DLG_DNAME (HID_SD_START + 115) -#define HID_FM_CTL_SELECTION (HID_SD_START + 116) +#define HID_FM_CTL_SELECTION (HID_SD_START + 116) -#define HID_SD_AUTOPILOT_REGION (HID_SD_START + 117) -#define HID_SD_AUTOPILOT_TEMPLATES (HID_SD_START + 118) -#define HID_SD_AUTOPILOT_OPEN (HID_SD_START + 119) -#define HID_SD_AUTOPILOT_PAGETEMPLATES (HID_SD_START + 120) +#define HID_SD_AUTOPILOT_REGION (HID_SD_START + 117) +#define HID_SD_AUTOPILOT_TEMPLATES (HID_SD_START + 118) +#define HID_SD_AUTOPILOT_OPEN (HID_SD_START + 119) +#define HID_SD_AUTOPILOT_PAGETEMPLATES (HID_SD_START + 120) -#define HID_SD_DRAW_GRAF_TOOLBOX (HID_SD_START + 121) +#define HID_SD_DRAW_GRAF_TOOLBOX (HID_SD_START + 121) -#define HID_SD_FW_GRAFFILTERS (HID_SD_START + 122) +#define HID_SD_FW_GRAFFILTERS (HID_SD_START + 122) #define HID_SD_TABBAR_PAGES (HID_SD_START + 123) #define HID_SD_TABBAR_LAYERS (HID_SD_START + 124) @@ -188,19 +188,19 @@ #define HID_SD_UNDODELETEWARNING_DLG (HID_SD_START + 125) #define HID_SD_UNDODELETEWARNING_CBX (HID_SD_START + 126) -#define HID_SD_PAGEOBJSTLB (HID_SD_START + 127) +#define HID_SD_PAGEOBJSTLB (HID_SD_START + 127) -#define HID_SD_NAMEDIALOG_OBJECT (HID_SD_START + 128) -#define HID_SD_NAMEDIALOG_PAGE (HID_SD_START + 129) -#define HID_SD_NAMEDIALOG_LINEEND (HID_SD_START + 130) +#define HID_SD_NAMEDIALOG_OBJECT (HID_SD_START + 128) +#define HID_SD_NAMEDIALOG_PAGE (HID_SD_START + 129) +#define HID_SD_NAMEDIALOG_LINEEND (HID_SD_START + 130) -#define HID_SD_DRAW_3D_TOOLBOX (HID_SD_START + 131) -#define HID_SD_DRAW_FONTWORK_TOOLBOX (HID_SD_START + 132) +#define HID_SD_DRAW_3D_TOOLBOX (HID_SD_START + 131) +#define HID_SD_DRAW_FONTWORK_TOOLBOX (HID_SD_START + 132) -#define HID_SD_TABPAGE_HEADERFOOTER_SLIDE (HID_SD_START + 133) -#define HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT (HID_SD_START + 134) +#define HID_SD_TABPAGE_HEADERFOOTER_SLIDE (HID_SD_START + 133) +#define HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT (HID_SD_START + 134) -#define HID_SD_DRAW_MEDIA_TOOLBOX (HID_SD_START + 135) +#define HID_SD_DRAW_MEDIA_TOOLBOX (HID_SD_START + 135) #define HID_SD_TASK_PANE (HID_SD_START + 136) #define HID_SD_SLIDE_DESIGNS (HID_SD_START + 137) @@ -249,33 +249,33 @@ #define HID_SD_TASK_PANE_PREVIEW_ALL (HID_SD_START + 176) #define HID_SD_TASK_PANE_PREVIEW_LAYOUTS (HID_SD_START + 177) -#define HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE (HID_SD_START + 178) -#define HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS (HID_SD_START + 179) -#define HID_SD_CUSTOMANIMATIONDIALOG_EXIT (HID_SD_START + 180) -#define HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH (HID_SD_START + 181) -#define HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS (HID_SD_START + 182) - -#define HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX (HID_SD_START + 183) -#define HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX (HID_SD_START + 184) -#define HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX (HID_SD_START + 185) -#define HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX (HID_SD_START + 186) -#define HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX (HID_SD_START + 187) -#define HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX (HID_SD_START + 188) -#define HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX (HID_SD_START + 189) -#define HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX (HID_SD_START + 190) - -#define HID_SD_SLIDESHOW_DISPLAY (HID_SD_START + 191) - -#define HID_SD_RULER_HORIZONTAL (HID_SD_START + 192) -#define HID_SD_RULER_VERTICAL (HID_SD_START + 193) - -#define HID_SD_CELL_STYLE_DEFAULT (HID_SD_START + 194) -#define HID_SD_CELL_STYLE_BANDED (HID_SD_START + 195) -#define HID_SD_CELL_STYLE_HEADER (HID_SD_START + 196) -#define HID_SD_CELL_STYLE_TOTAL (HID_SD_START + 197) -#define HID_SD_CELL_STYLE_FIRST_COLUMN (HID_SD_START + 198) -#define HID_SD_CELL_STYLE_LAST_COLUMN (HID_SD_START + 199) - -#define HID_SD_TABLE_DESIGN (HID_SD_START + 200) -#define HID_SD_ANNOTATIONS (HID_SD_START + 201) +#define HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE (HID_SD_START + 178) +#define HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS (HID_SD_START + 179) +#define HID_SD_CUSTOMANIMATIONDIALOG_EXIT (HID_SD_START + 180) +#define HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH (HID_SD_START + 181) +#define HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS (HID_SD_START + 182) + +#define HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX (HID_SD_START + 183) +#define HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX (HID_SD_START + 184) +#define HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX (HID_SD_START + 185) +#define HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX (HID_SD_START + 186) +#define HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX (HID_SD_START + 187) +#define HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX (HID_SD_START + 188) +#define HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX (HID_SD_START + 189) +#define HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX (HID_SD_START + 190) + +#define HID_SD_SLIDESHOW_DISPLAY (HID_SD_START + 191) + +#define HID_SD_RULER_HORIZONTAL (HID_SD_START + 192) +#define HID_SD_RULER_VERTICAL (HID_SD_START + 193) + +#define HID_SD_CELL_STYLE_DEFAULT (HID_SD_START + 194) +#define HID_SD_CELL_STYLE_BANDED (HID_SD_START + 195) +#define HID_SD_CELL_STYLE_HEADER (HID_SD_START + 196) +#define HID_SD_CELL_STYLE_TOTAL (HID_SD_START + 197) +#define HID_SD_CELL_STYLE_FIRST_COLUMN (HID_SD_START + 198) +#define HID_SD_CELL_STYLE_LAST_COLUMN (HID_SD_START + 199) + +#define HID_SD_TABLE_DESIGN (HID_SD_START + 200) +#define HID_SD_ANNOTATIONS (HID_SD_START + 201) diff --git a/sd/inc/imapinfo.hxx b/sd/inc/imapinfo.hxx index f5c8e916fd4d..78b5bcef2e80 100644 --- a/sd/inc/imapinfo.hxx +++ b/sd/inc/imapinfo.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ class SdIMapInfo : public SdrObjUserData, public SfxListener { - ImageMap aImageMap; + ImageMap aImageMap; public: SdIMapInfo() : @@ -58,14 +58,14 @@ public: SfxListener(), aImageMap( rIMapInfo.aImageMap ) {}; - virtual ~SdIMapInfo() {}; + virtual ~SdIMapInfo() {}; virtual SdrObjUserData* Clone( SdrObject* ) const { return new SdIMapInfo( *this ); } - void SetImageMap( const ImageMap& rIMap ) { aImageMap = rIMap; } + void SetImageMap( const ImageMap& rIMap ) { aImageMap = rIMap; } const ImageMap& GetImageMap() const { return aImageMap; } }; -#endif // _SD_IMAPINFO_HXX +#endif // _SD_IMAPINFO_HXX diff --git a/sd/inc/misc.hxx b/sd/inc/misc.hxx index ca8592723e90..a2b7e568706d 100644 --- a/sd/inc/misc.hxx +++ b/sd/inc/misc.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/inc/misc/scopelock.hxx b/sd/inc/misc/scopelock.hxx index 93773b1211fd..e2c03e0b745d 100644 --- a/sd/inc/misc/scopelock.hxx +++ b/sd/inc/misc/scopelock.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ private: void lock() { mnLock++; } void unlock() { mnLock--; } - sal_Int32 mnLock; + sal_Int32 mnLock; }; class ScopeLockGuard @@ -55,4 +55,4 @@ private: } // namespace sd -#endif // _SD_UNDOMANAGER_HXX +#endif // _SD_UNDOMANAGER_HXX diff --git a/sd/inc/movedef.hxx b/sd/inc/movedef.hxx index 895e0390d07c..ff824f72bc40 100644 --- a/sd/inc/movedef.hxx +++ b/sd/inc/movedef.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,5 +38,5 @@ enum MoveSpeed // muss angepasst werden! #define MOVE_SPEED_COUNT 3 -#endif // _SD_MOVEDEF_HXX +#endif // _SD_MOVEDEF_HXX diff --git a/sd/inc/pch/precompiled_sd.cxx b/sd/inc/pch/precompiled_sd.cxx index d90ffd20fe98..49387c566f98 100644 --- a/sd/inc/pch/precompiled_sd.cxx +++ b/sd/inc/pch/precompiled_sd.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 7e92020eb88f..d2855d92be0f 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -1,7 +1,7 @@ /************************************************************************cherex * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/inc/pglink.hxx b/sd/inc/pglink.hxx index 8f8eff565d42..2d301fa83238 100644 --- a/sd/inc/pglink.hxx +++ b/sd/inc/pglink.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ public: virtual void Closed(); virtual void DataChanged( const String& , const ::com::sun::star::uno::Any & ); - FASTBOOL Connect() { return 0 != SvBaseLink::GetRealObject(); } + FASTBOOL Connect() { return 0 != SvBaseLink::GetRealObject(); } }; #else @@ -56,7 +56,7 @@ class SdPageLink; #endif -#endif // _PGLINK_HXX +#endif // _PGLINK_HXX diff --git a/sd/inc/pres.hxx b/sd/inc/pres.hxx index a51083133185..4812505a8ae3 100755 --- a/sd/inc/pres.hxx +++ b/sd/inc/pres.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ enum PresObjKind PRESOBJ_SLIDENUMBER, PRESOBJ_CALC, PRESOBJ_MEDIA, - + PRESOBJ_MAX }; @@ -56,22 +56,22 @@ enum AutoLayout { // new layouts with enum/text/chart/org/clip merged to content AUTOLAYOUT__START = 0, - AUTOLAYOUT_TITLE = 0, // Title Slide - AUTOLAYOUT_TITLE_CONTENT = 1, // Title, Content - AUTOLAYOUT_TITLE_2CONTENT = 3, // Title and 2 Content - AUTOLAYOUT_TITLE_ONLY = 19, // Title Only - AUTOLAYOUT_NONE = 20, // Blank Slide - AUTOLAYOUT_ONLY_TEXT = 32, // Centered Text - AUTOLAYOUT_TITLE_CONTENT_2CONTENT = 12, // Title, Content and 2 Content - AUTOLAYOUT_TITLE_2CONTENT_CONTENT = 15, // Title, 2 Content and Content + AUTOLAYOUT_TITLE = 0, // Title Slide + AUTOLAYOUT_TITLE_CONTENT = 1, // Title, Content + AUTOLAYOUT_TITLE_2CONTENT = 3, // Title and 2 Content + AUTOLAYOUT_TITLE_ONLY = 19, // Title Only + AUTOLAYOUT_NONE = 20, // Blank Slide + AUTOLAYOUT_ONLY_TEXT = 32, // Centered Text + AUTOLAYOUT_TITLE_CONTENT_2CONTENT = 12, // Title, Content and 2 Content + AUTOLAYOUT_TITLE_2CONTENT_CONTENT = 15, // Title, 2 Content and Content AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT = 16,// Title, 2 Content over Content - AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT = 14, // Title, Content over Content - AUTOLAYOUT_TITLE_4CONTENT = 18, // Title, 4 Content - AUTOLAYOUT_TITLE_6CONTENT = 34, // Title, 6 Content + AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT = 14, // Title, Content over Content + AUTOLAYOUT_TITLE_4CONTENT = 18, // Title, 4 Content + AUTOLAYOUT_TITLE_6CONTENT = 34, // Title, 6 Content AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT = 27, // Vertical Title, Vertical Content over Vertical Content - AUTOLAYOUT_VTITLE_VCONTENT = 28, // Vertical Title, Vertical Content over Vertical Content - AUTOLAYOUT_TITLE_VCONTENT = 29, // Title, Vertical Content - AUTOLAYOUT_TITLE_2VTEXT = 30, // Title, 2 Vertical Content + AUTOLAYOUT_VTITLE_VCONTENT = 28, // Vertical Title, Vertical Content over Vertical Content + AUTOLAYOUT_TITLE_VCONTENT = 29, // Title, Vertical Content + AUTOLAYOUT_TITLE_2VTEXT = 30, // Title, 2 Vertical Content // deprecated AUTOLAYOUT_ENUM = 1, @@ -137,5 +137,5 @@ enum NavigatorDragType }; #define NAVIGATOR_DRAGTYPE_COUNT 4 -#endif // _PRESENTATION_HXX +#endif // _PRESENTATION_HXX diff --git a/sd/inc/prlayout.hxx b/sd/inc/prlayout.hxx index 87bce53b1c8c..341233f52a09 100644 --- a/sd/inc/prlayout.hxx +++ b/sd/inc/prlayout.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/inc/resltn.hxx b/sd/inc/resltn.hxx index bfd04a864175..5f5ae78e2eae 100644 --- a/sd/inc/resltn.hxx +++ b/sd/inc/resltn.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/inc/sd_primitivetypes2d.hxx b/sd/inc/sd_primitivetypes2d.hxx index fab81717c5c5..0f44407109d0 100644 --- a/sd/inc/sd_primitivetypes2d.hxx +++ b/sd/inc/sd_primitivetypes2d.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,10 +34,10 @@ ////////////////////////////////////////////////////////////////////////////// -#define PRIMITIVE2D_ID_SDPAGEOBJECTFOCUSPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 0) -#define PRIMITIVE2D_ID_SDPAGEOBJECTSELECTPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 1) -#define PRIMITIVE2D_ID_SDPAGEOBJECTPAGEBITMAPPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 2) -#define PRIMITIVE2D_ID_SDPAGEOBJECTBORDERPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 3) +#define PRIMITIVE2D_ID_SDPAGEOBJECTFOCUSPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 0) +#define PRIMITIVE2D_ID_SDPAGEOBJECTSELECTPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 1) +#define PRIMITIVE2D_ID_SDPAGEOBJECTPAGEBITMAPPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 2) +#define PRIMITIVE2D_ID_SDPAGEOBJECTBORDERPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 3) #define PRIMITIVE2D_ID_SDPAGEOBJECTFADENAMENUMBERPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 4) #define PRIMITIVE2D_ID_SDMOUSEOVEREFFECTPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 5) diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index f265314fa6e9..203e3b1d31d4 100755 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,14 +74,14 @@ class ViewShell; class AbstractCopyDlg : public VclAbstractDialog //add for CopyDlg { public: - virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0; + virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0; }; class AbstractSdCustomShowDlg : public VclAbstractDialog //add for SdCustomShowDlg { public: - virtual BOOL IsModified() const = 0; - virtual BOOL IsCustomShow() const = 0; + virtual BOOL IsModified() const = 0; + virtual BOOL IsCustomShow() const = 0; }; class AbstractAssistentDlg : public VclAbstractDialog //add for AssistentDlg @@ -100,8 +100,8 @@ public: class AbstractSdModifyFieldDlg : public VclAbstractDialog //add for SdModifyFieldDlg { public: - virtual SvxFieldData* GetField() = 0; - virtual SfxItemSet GetItemSet() = 0; + virtual SvxFieldData* GetField() = 0; + virtual SfxItemSet GetItemSet() = 0; }; class AbstractSdSnapLineDlg : public VclAbstractDialog //add for SdSnapLineDlg @@ -118,7 +118,7 @@ public: class AbstractSdInsertLayerDlg : public VclAbstractDialog //add for SdInsertLayerDlg { public: - virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0; + virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0; //from class ::Window virtual void SetHelpId( ULONG nHelpId ) = 0; }; @@ -126,43 +126,43 @@ public: class AbstractSdInsertPasteDlg : public VclAbstractDialog //add for SdInsertPasteDlg { public: - virtual BOOL IsInsertBefore() const = 0; + virtual BOOL IsInsertBefore() const = 0; }; class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog //add for SdInsertPagesObjsDlg { public: - virtual ::Window* GetWindow() = 0; //this method is added for return a ::Window type pointer - virtual List* GetList( USHORT nType ) = 0; - virtual BOOL IsLink() = 0; - virtual BOOL IsRemoveUnnessesaryMasterPages() const = 0; + virtual ::Window* GetWindow() = 0; //this method is added for return a ::Window type pointer + virtual List* GetList( USHORT nType ) = 0; + virtual BOOL IsLink() = 0; + virtual BOOL IsRemoveUnnessesaryMasterPages() const = 0; }; class AbstractMorphDlg : public VclAbstractDialog //add for MorphDlg { public: - virtual void SaveSettings() const = 0; - virtual USHORT GetFadeSteps() const = 0; - virtual BOOL IsAttributeFade() const = 0; - virtual BOOL IsOrientationFade() const = 0; + virtual void SaveSettings() const = 0; + virtual USHORT GetFadeSteps() const = 0; + virtual BOOL IsAttributeFade() const = 0; + virtual BOOL IsOrientationFade() const = 0; }; class AbstractSdStartPresDlg : public VclAbstractDialog //add for SdStartPresentationDlg { public: - virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0; + virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0; }; class AbstractSdPresLayoutDlg : public VclAbstractDialog //add for SdPresLayoutDlg { public: - virtual void GetAttr(SfxItemSet& rOutAttrs) = 0; + virtual void GetAttr(SfxItemSet& rOutAttrs) = 0; }; class AbstractSdVectorizeDlg : public VclAbstractDialog //add for SdVectorizeDlg { public: - virtual const GDIMetaFile& GetGDIMetaFile() const = 0; + virtual const GDIMetaFile& GetGDIMetaFile() const = 0; }; class AbstractSdPublishingDlg : public VclAbstractDialog //add for SdPublishingDlg @@ -180,46 +180,46 @@ public: }; //--------------------------------------------------------- -class SdAbstractDialogFactory +class SdAbstractDialogFactory { public: - static SdAbstractDialogFactory* Create(); - - virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, ULONG nSumActionCount, ULONG nObjCount ) = 0; - virtual AbstractCopyDlg* CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, XColorTable* pColTab, ::sd::View* pView ) = 0; - virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ) = 0; - virtual SfxAbstractTabDialog* CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) = 0; - virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, BOOL bAreaPage = TRUE ) = 0; - virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, BOOL bAutoPilot) = 0; - virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( ::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) = 0; - virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) = 0; - virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, String aStr ) = 0; - virtual AbstractSdInsertPasteDlg* CreateSdInsertPasteDlg( ::Window* pWindow ) = 0; + static SdAbstractDialogFactory* Create(); + + virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, ULONG nSumActionCount, ULONG nObjCount ) = 0; + virtual AbstractCopyDlg* CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, XColorTable* pColTab, ::sd::View* pView ) = 0; + virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ) = 0; + virtual SfxAbstractTabDialog* CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) = 0; + virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, BOOL bAreaPage = TRUE ) = 0; + virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, BOOL bAutoPilot) = 0; + virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( ::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) = 0; + virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) = 0; + virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, String aStr ) = 0; + virtual AbstractSdInsertPasteDlg* CreateSdInsertPasteDlg( ::Window* pWindow ) = 0; virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg( ::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const String& rFileName ) = 0; - virtual AbstractMorphDlg* CreateMorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) = 0; - virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ) = 0; - virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( ::Window* pParent, const SfxItemSet* pAttr ) = 0; - virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, List& rPageNames, List* pCSList ) = 0; - virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0; - virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs) = 0; - virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) = 0; - virtual SfxAbstractDialog* CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) = 0; - virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) = 0; - virtual AbstractSdPublishingDlg* CreateSdPublishingDlg( ::Window* pWindow, DocumentType eDocType) = 0; - - virtual VclAbstractDialog* CreateMasterLayoutDialog( ::Window* pParent, + virtual AbstractMorphDlg* CreateMorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) = 0; + virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ) = 0; + virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( ::Window* pParent, const SfxItemSet* pAttr ) = 0; + virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, List& rPageNames, List* pCSList ) = 0; + virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0; + virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs) = 0; + virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) = 0; + virtual SfxAbstractDialog* CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) = 0; + virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) = 0; + virtual AbstractSdPublishingDlg* CreateSdPublishingDlg( ::Window* pWindow, DocumentType eDocType) = 0; + + virtual VclAbstractDialog* CreateMasterLayoutDialog( ::Window* pParent, SdDrawDocument* pDoc, SdPage* ) = 0; // add for MasterLayoutDialog - virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( ViewShell* pViewShell, - ::Window* pParent, - SdDrawDocument* pDoc, + virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( ViewShell* pViewShell, + ::Window* pParent, + SdDrawDocument* pDoc, SdPage* pCurrentPage ) = 0; // add for HeaderFooterDialog - virtual CreateTabPage GetSdOptionsContentsTabPageCreatorFunc() = 0; - virtual CreateTabPage GetSdPrintOptionsTabPageCreatorFunc() = 0; - virtual CreateTabPage GetSdOptionsMiscTabPageCreatorFunc() = 0; - virtual CreateTabPage GetSdOptionsSnapTabPageCreatorFunc() = 0; + virtual CreateTabPage GetSdOptionsContentsTabPageCreatorFunc() = 0; + virtual CreateTabPage GetSdPrintOptionsTabPageCreatorFunc() = 0; + virtual CreateTabPage GetSdOptionsMiscTabPageCreatorFunc() = 0; + virtual CreateTabPage GetSdOptionsSnapTabPageCreatorFunc() = 0; }; #endif diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc index 29ef8f128248..e3791ab03c56 100644 --- a/sd/inc/sdattr.hrc +++ b/sd/inc/sdattr.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,33 +33,33 @@ #endif // Anfang Page-Attribute -#define ATTR_PAGE_START SID_SD_START + 1234 -#define ATTR_PAGE_NAME ATTR_PAGE_START -#define ATTR_PAGE_BACKGROUND ATTR_PAGE_START + 1 -#define ATTR_PAGE_OBJECTS ATTR_PAGE_START + 2 -#define ATTR_PAGE_LAYOUT ATTR_PAGE_START + 3 -#define ATTR_PAGE_END ATTR_PAGE_LAYOUT +#define ATTR_PAGE_START SID_SD_START + 1234 +#define ATTR_PAGE_NAME ATTR_PAGE_START +#define ATTR_PAGE_BACKGROUND ATTR_PAGE_START + 1 +#define ATTR_PAGE_OBJECTS ATTR_PAGE_START + 2 +#define ATTR_PAGE_LAYOUT ATTR_PAGE_START + 3 +#define ATTR_PAGE_END ATTR_PAGE_LAYOUT // Layer-Attribute -#define ATTR_LAYER_START ATTR_PAGE_END + 1 -#define ATTR_LAYER_NAME ATTR_LAYER_START -#define ATTR_LAYER_VISIBLE ATTR_LAYER_START + 1 -#define ATTR_LAYER_PRINTABLE ATTR_LAYER_START + 2 -#define ATTR_LAYER_LOCKED ATTR_LAYER_START + 3 -#define ATTR_LAYER_THISPAGE ATTR_LAYER_START + 4 -#define ATTR_LAYER_TITLE ATTR_LAYER_START + 5 -#define ATTR_LAYER_DESC ATTR_LAYER_START + 6 -#define ATTR_LAYER_END ATTR_LAYER_DESC +#define ATTR_LAYER_START ATTR_PAGE_END + 1 +#define ATTR_LAYER_NAME ATTR_LAYER_START +#define ATTR_LAYER_VISIBLE ATTR_LAYER_START + 1 +#define ATTR_LAYER_PRINTABLE ATTR_LAYER_START + 2 +#define ATTR_LAYER_LOCKED ATTR_LAYER_START + 3 +#define ATTR_LAYER_THISPAGE ATTR_LAYER_START + 4 +#define ATTR_LAYER_TITLE ATTR_LAYER_START + 5 +#define ATTR_LAYER_DESC ATTR_LAYER_START + 6 +#define ATTR_LAYER_END ATTR_LAYER_DESC // Anfang Dia-Attribute -#define ATTR_DIA_START ATTR_LAYER_END + 1 -#define ATTR_DIA_EFFECT ATTR_DIA_START -#define ATTR_DIA_SPEED ATTR_DIA_START + 1 -#define ATTR_DIA_AUTO ATTR_DIA_START + 2 -#define ATTR_DIA_TIME ATTR_DIA_START + 3 -#define ATTR_DIA_SOUND ATTR_DIA_START + 4 -#define ATTR_DIA_SOUNDFILE ATTR_DIA_START + 5 -#define ATTR_DIA_END ATTR_DIA_SOUNDFILE +#define ATTR_DIA_START ATTR_LAYER_END + 1 +#define ATTR_DIA_EFFECT ATTR_DIA_START +#define ATTR_DIA_SPEED ATTR_DIA_START + 1 +#define ATTR_DIA_AUTO ATTR_DIA_START + 2 +#define ATTR_DIA_TIME ATTR_DIA_START + 3 +#define ATTR_DIA_SOUND ATTR_DIA_START + 4 +#define ATTR_DIA_SOUNDFILE ATTR_DIA_START + 5 +#define ATTR_DIA_END ATTR_DIA_SOUNDFILE // Praesentations-Attribute #define ATTR_PRESENT_START ATTR_DIA_END + 1 @@ -76,170 +76,170 @@ #define ATTR_PRESENT_FULLSCREEN ATTR_PRESENT_START + 10 #define ATTR_PRESENT_START_ACTUAL_PAGE ATTR_PRESENT_START + 11 #define ATTR_PRESENT_ANIMATION_ALLOWED ATTR_PRESENT_START + 12 -#define ATTR_PRESENT_PAUSE_TIMEOUT ATTR_PRESENT_START + 13 -#define ATTR_PRESENT_SHOW_PAUSELOGO ATTR_PRESENT_START + 14 -#define ATTR_PRESENT_DISPLAY ATTR_PRESENT_START + 15 +#define ATTR_PRESENT_PAUSE_TIMEOUT ATTR_PRESENT_START + 13 +#define ATTR_PRESENT_SHOW_PAUSELOGO ATTR_PRESENT_START + 14 +#define ATTR_PRESENT_DISPLAY ATTR_PRESENT_START + 15 #define ATTR_PRESENT_END ATTR_PRESENT_DISPLAY // Transformations-Attribute -#define ATTR_TRANSF_START ATTR_PRESENT_END + 1 -#define ATTR_TRANSF_POS_X ATTR_TRANSF_START -#define ATTR_TRANSF_POS_Y ATTR_TRANSF_START + 1 -#define ATTR_TRANSF_WIDTH ATTR_TRANSF_START + 2 -#define ATTR_TRANSF_HEIGHT ATTR_TRANSF_START + 3 -#define ATTR_TRANSF_SIZE_POINT ATTR_TRANSF_START + 4 -#define ATTR_TRANSF_ROT_X ATTR_TRANSF_START + 5 -#define ATTR_TRANSF_ROT_Y ATTR_TRANSF_START + 6 -#define ATTR_TRANSF_ANGLE ATTR_TRANSF_START + 7 -#define ATTR_TRANSF_END ATTR_TRANSF_ANGLE +#define ATTR_TRANSF_START ATTR_PRESENT_END + 1 +#define ATTR_TRANSF_POS_X ATTR_TRANSF_START +#define ATTR_TRANSF_POS_Y ATTR_TRANSF_START + 1 +#define ATTR_TRANSF_WIDTH ATTR_TRANSF_START + 2 +#define ATTR_TRANSF_HEIGHT ATTR_TRANSF_START + 3 +#define ATTR_TRANSF_SIZE_POINT ATTR_TRANSF_START + 4 +#define ATTR_TRANSF_ROT_X ATTR_TRANSF_START + 5 +#define ATTR_TRANSF_ROT_Y ATTR_TRANSF_START + 6 +#define ATTR_TRANSF_ANGLE ATTR_TRANSF_START + 7 +#define ATTR_TRANSF_END ATTR_TRANSF_ANGLE // Raster-Attribute -#define ATTR_GRID_START ATTR_TRANSF_END + 1 -#define ATTR_GRID_USE ATTR_GRID_START -#define ATTR_GRID_DRAW_X ATTR_GRID_START + 1 -#define ATTR_GRID_DRAW_Y ATTR_GRID_START + 2 -#define ATTR_GRID_DIVISION_X ATTR_GRID_START + 3 -#define ATTR_GRID_DIVISION_Y ATTR_GRID_START + 4 -#define ATTR_GRID_SNAP_X ATTR_GRID_START + 5 -#define ATTR_GRID_SNAP_Y ATTR_GRID_START + 6 -#define ATTR_GRID_ORIGIN_X ATTR_GRID_START + 7 -#define ATTR_GRID_ORIGIN_Y ATTR_GRID_START + 8 -#define ATTR_GRID_END ATTR_GRID_ORIGIN_Y +#define ATTR_GRID_START ATTR_TRANSF_END + 1 +#define ATTR_GRID_USE ATTR_GRID_START +#define ATTR_GRID_DRAW_X ATTR_GRID_START + 1 +#define ATTR_GRID_DRAW_Y ATTR_GRID_START + 2 +#define ATTR_GRID_DIVISION_X ATTR_GRID_START + 3 +#define ATTR_GRID_DIVISION_Y ATTR_GRID_START + 4 +#define ATTR_GRID_SNAP_X ATTR_GRID_START + 5 +#define ATTR_GRID_SNAP_Y ATTR_GRID_START + 6 +#define ATTR_GRID_ORIGIN_X ATTR_GRID_START + 7 +#define ATTR_GRID_ORIGIN_Y ATTR_GRID_START + 8 +#define ATTR_GRID_END ATTR_GRID_ORIGIN_Y // Bildschirm-Attribute -#define ATTR_DISPLAY_START ATTR_GRID_END + 1 -#define ATTR_DISPLAY_FUNCTIONBAR ATTR_DISPLAY_START -#define ATTR_DISPLAY_OBJECTBAR ATTR_DISPLAY_START + 1 -#define ATTR_DISPLAY_STATUSBAR ATTR_DISPLAY_START + 2 -#define ATTR_DISPLAY_TOOLBAR ATTR_DISPLAY_START + 3 -#define ATTR_DISPLAY_GRID ATTR_DISPLAY_START + 4 -#define ATTR_DISPLAY_RULER ATTR_DISPLAY_START + 5 -#define ATTR_DISPLAY_HELPLINES ATTR_DISPLAY_START + 6 -#define ATTR_DISPLAY_STRANGE_GRAPHIC ATTR_DISPLAY_START + 7 -#define ATTR_DISPLAY_ADJUSTLINES ATTR_DISPLAY_START + 8 -#define ATTR_DISPLAY_END ATTR_DISPLAY_ADJUSTLINES - -#define ATTR_TBX_DUMMY ATTR_DISPLAY_END + 1 +#define ATTR_DISPLAY_START ATTR_GRID_END + 1 +#define ATTR_DISPLAY_FUNCTIONBAR ATTR_DISPLAY_START +#define ATTR_DISPLAY_OBJECTBAR ATTR_DISPLAY_START + 1 +#define ATTR_DISPLAY_STATUSBAR ATTR_DISPLAY_START + 2 +#define ATTR_DISPLAY_TOOLBAR ATTR_DISPLAY_START + 3 +#define ATTR_DISPLAY_GRID ATTR_DISPLAY_START + 4 +#define ATTR_DISPLAY_RULER ATTR_DISPLAY_START + 5 +#define ATTR_DISPLAY_HELPLINES ATTR_DISPLAY_START + 6 +#define ATTR_DISPLAY_STRANGE_GRAPHIC ATTR_DISPLAY_START + 7 +#define ATTR_DISPLAY_ADJUSTLINES ATTR_DISPLAY_START + 8 +#define ATTR_DISPLAY_END ATTR_DISPLAY_ADJUSTLINES + +#define ATTR_TBX_DUMMY ATTR_DISPLAY_END + 1 // Animations-Attribute -#define ATTR_ANIMATION_START ATTR_TBX_DUMMY + 1 -#define ATTR_ANIMATION_ACTIVE ATTR_ANIMATION_START -#define ATTR_ANIMATION_EFFECT ATTR_ANIMATION_START + 1 -#define ATTR_ANIMATION_SPEED ATTR_ANIMATION_START + 2 -#define ATTR_ANIMATION_INVISIBLE ATTR_ANIMATION_START + 3 -#define ATTR_ANIMATION_FADEOUT ATTR_ANIMATION_START + 4 -#define ATTR_ANIMATION_COLOR ATTR_ANIMATION_START + 5 -#define ATTR_ANIMATION_SOUNDON ATTR_ANIMATION_START + 6 -#define ATTR_ANIMATION_SOUNDFILE ATTR_ANIMATION_START + 7 -#define ATTR_ANIMATION_PLAYFULL ATTR_ANIMATION_START + 8 -#define ATTR_ANIMATION_TRANSPCOLOR ATTR_ANIMATION_START + 9 +#define ATTR_ANIMATION_START ATTR_TBX_DUMMY + 1 +#define ATTR_ANIMATION_ACTIVE ATTR_ANIMATION_START +#define ATTR_ANIMATION_EFFECT ATTR_ANIMATION_START + 1 +#define ATTR_ANIMATION_SPEED ATTR_ANIMATION_START + 2 +#define ATTR_ANIMATION_INVISIBLE ATTR_ANIMATION_START + 3 +#define ATTR_ANIMATION_FADEOUT ATTR_ANIMATION_START + 4 +#define ATTR_ANIMATION_COLOR ATTR_ANIMATION_START + 5 +#define ATTR_ANIMATION_SOUNDON ATTR_ANIMATION_START + 6 +#define ATTR_ANIMATION_SOUNDFILE ATTR_ANIMATION_START + 7 +#define ATTR_ANIMATION_PLAYFULL ATTR_ANIMATION_START + 8 +#define ATTR_ANIMATION_TRANSPCOLOR ATTR_ANIMATION_START + 9 #define ATTR_ANIMATION_TEXTEFFECT ATTR_ANIMATION_START + 10 #define ATTR_ANIMATION_END ATTR_ANIMATION_TEXTEFFECT -#define ATTR_ACTION_START ATTR_ANIMATION_END + 1 -#define ATTR_ACTION ATTR_ACTION_START -#define ATTR_ACTION_EFFECT ATTR_ACTION_START + 1 -#define ATTR_ACTION_EFFECTSPEED ATTR_ACTION_START + 2 -#define ATTR_ACTION_FILENAME ATTR_ACTION_START + 3 -#define ATTR_ACTION_SOUNDON ATTR_ACTION_START + 4 -#define ATTR_ACTION_PLAYFULL ATTR_ACTION_START + 5 -#define ATTR_ACTION_END ATTR_ACTION_PLAYFULL - -#define ATTR_PRINTOPTIONS_START ATTR_ACTION_END + 1 -#define ATTR_PRINTOPTIONS_PRINT ATTR_PRINTOPTIONS_START -#define ATTR_PRINTOPTIONS_PAGESIZE ATTR_PRINTOPTIONS_START + 1 -#define ATTR_PRINTOPTIONS_FADEOUT ATTR_PRINTOPTIONS_START + 2 -#define ATTR_PRINTOPTIONS_DATE ATTR_PRINTOPTIONS_START + 3 -#define ATTR_PRINTOPTIONS_TIME ATTR_PRINTOPTIONS_START + 4 -#define ATTR_PRINTOPTIONS_PAGENAME ATTR_PRINTOPTIONS_START + 5 -#define ATTR_PRINTOPTIONS_END ATTR_PRINTOPTIONS_PAGENAME - -#define ATTR_COPY_START ATTR_PRINTOPTIONS_END + 1 -#define ATTR_COPY_NUMBER ATTR_COPY_START -#define ATTR_COPY_MOVE_X ATTR_COPY_START + 1 -#define ATTR_COPY_MOVE_Y ATTR_COPY_START + 2 -#define ATTR_COPY_ANGLE ATTR_COPY_START + 3 -#define ATTR_COPY_WIDTH ATTR_COPY_START + 4 -#define ATTR_COPY_HEIGHT ATTR_COPY_START + 5 -#define ATTR_COPY_START_COLOR ATTR_COPY_START + 6 -#define ATTR_COPY_END_COLOR ATTR_COPY_START + 7 -#define ATTR_COPY_END ATTR_COPY_END_COLOR - -#define ATTR_SNAPLINE_START ATTR_COPY_END + 1 -#define ATTR_SNAPLINE_KIND ATTR_SNAPLINE_START -#define ATTR_SNAPLINE_X ATTR_SNAPLINE_START + 1 -#define ATTR_SNAPLINE_Y ATTR_SNAPLINE_START + 2 -#define ATTR_SNAPLINE_END ATTR_SNAPLINE_Y - -#define ATTR_OPTIONS_START ATTR_SNAPLINE_END + 1 -#define ATTR_OPTIONS ATTR_OPTIONS_START -#define ATTR_OPTIONS_LAYOUT ATTR_OPTIONS_START + 1 -#define ATTR_OPTIONS_CONTENTS ATTR_OPTIONS_START + 2 -#define ATTR_OPTIONS_MISC ATTR_OPTIONS_START + 3 -#define ATTR_OPTIONS_SNAP ATTR_OPTIONS_START + 4 -#define ATTR_OPTIONS_PRINT ATTR_OPTIONS_START + 5 -#define ATTR_OPTIONS_END ATTR_OPTIONS_PRINT - -#define ATTR_OPTIONS_SCALE_START ATTR_OPTIONS_END + 1 -#define ATTR_OPTIONS_SCALE_X ATTR_OPTIONS_SCALE_START -#define ATTR_OPTIONS_SCALE_Y ATTR_OPTIONS_SCALE_START + 1 -#define ATTR_OPTIONS_SCALE_WIDTH ATTR_OPTIONS_SCALE_START + 2 -#define ATTR_OPTIONS_SCALE_HEIGHT ATTR_OPTIONS_SCALE_START + 3 -#define ATTR_OPTIONS_SCALE_END ATTR_OPTIONS_SCALE_HEIGHT - -#define ATTR_PUBLISH_START ATTR_OPTIONS_SCALE_END + 1 -#define ATTR_PUBLISH_LOCATION ATTR_PUBLISH_START -#define ATTR_PUBLISH_WITHCONTENTSPAGE ATTR_PUBLISH_START + 1 -#define ATTR_PUBLISH_RESOLUTION ATTR_PUBLISH_START + 2 -#define ATTR_PUBLISH_MODE ATTR_PUBLISH_START + 3 -#define ATTR_PUBLISH_FORMAT ATTR_PUBLISH_START + 4 -#define ATTR_PUBLISH_COMPRESSION ATTR_PUBLISH_START + 5 -#define ATTR_PUBLISH_WITHNOTES ATTR_PUBLISH_START + 6 -#define ATTR_PUBLISH_AUTHOR ATTR_PUBLISH_START + 9 -#define ATTR_PUBLISH_EMAIL ATTR_PUBLISH_START + 10 -#define ATTR_PUBLISH_WWW ATTR_PUBLISH_START + 11 -#define ATTR_PUBLISH_INFO ATTR_PUBLISH_START + 12 -#define ATTR_PUBLISH_WITHDOWNLOAD ATTR_PUBLISH_START + 13 -#define ATTR_PUBLISH_WITHSTAROFFICE ATTR_PUBLISH_START + 14 -#define ATTR_PUBLISH_BUTTONS ATTR_PUBLISH_START + 15 -#define ATTR_PUBLISH_USERATTR ATTR_PUBLISH_START + 16 -#define ATTR_PUBLISH_BACKCOLOR ATTR_PUBLISH_START + 17 -#define ATTR_PUBLISH_TEXTCOLOR ATTR_PUBLISH_START + 18 -#define ATTR_PUBLISH_LINKCOLOR ATTR_PUBLISH_START + 19 -#define ATTR_PUBLISH_VLINKCOLOR ATTR_PUBLISH_START + 20 -#define ATTR_PUBLISH_ALINKCOLOR ATTR_PUBLISH_START + 21 -#define ATTR_PUBLISH_USEATTRIBS ATTR_PUBLISH_START + 22 -#define ATTR_PUBLISH_USECOLOR ATTR_PUBLISH_START + 23 -#define ATTR_PUBLISH_WEBSHOW ATTR_PUBLISH_START + 24 -#define ATTR_PUBLISH_SCRIPT ATTR_PUBLISH_START + 25 -#define ATTR_PUBLISH_URLPATH ATTR_PUBLISH_START + 26 -#define ATTR_PUBLISH_CGIPATH ATTR_PUBLISH_START + 27 -#define ATTR_PUBLISH_INDEX ATTR_PUBLISH_START + 28 -#define ATTR_PUBLISH_SLIDECHG ATTR_PUBLISH_START + 29 -#define ATTR_PUBLISH_SLIDEDURATION ATTR_PUBLISH_START + 30 -#define ATTR_PUBLISH_ENDLESS ATTR_PUBLISH_START + 31 -#define ATTR_PUBLISH_SLIDESOUND ATTR_PUBLISH_START + 32 -#define ATTR_PUBLISH_END ATTR_PUBLISH_SLIDESOUND - -#define ATTR_PRESLAYOUT_START ATTR_PUBLISH_END + 1 -#define ATTR_PRESLAYOUT_NAME ATTR_PRESLAYOUT_START -#define ATTR_PRESLAYOUT_LOAD ATTR_PRESLAYOUT_START + 1 -#define ATTR_PRESLAYOUT_MASTER_PAGE ATTR_PRESLAYOUT_START + 2 -#define ATTR_PRESLAYOUT_CHECK_MASTERS ATTR_PRESLAYOUT_START + 3 -#define ATTR_PRESLAYOUT_END ATTR_PRESLAYOUT_CHECK_MASTERS +#define ATTR_ACTION_START ATTR_ANIMATION_END + 1 +#define ATTR_ACTION ATTR_ACTION_START +#define ATTR_ACTION_EFFECT ATTR_ACTION_START + 1 +#define ATTR_ACTION_EFFECTSPEED ATTR_ACTION_START + 2 +#define ATTR_ACTION_FILENAME ATTR_ACTION_START + 3 +#define ATTR_ACTION_SOUNDON ATTR_ACTION_START + 4 +#define ATTR_ACTION_PLAYFULL ATTR_ACTION_START + 5 +#define ATTR_ACTION_END ATTR_ACTION_PLAYFULL + +#define ATTR_PRINTOPTIONS_START ATTR_ACTION_END + 1 +#define ATTR_PRINTOPTIONS_PRINT ATTR_PRINTOPTIONS_START +#define ATTR_PRINTOPTIONS_PAGESIZE ATTR_PRINTOPTIONS_START + 1 +#define ATTR_PRINTOPTIONS_FADEOUT ATTR_PRINTOPTIONS_START + 2 +#define ATTR_PRINTOPTIONS_DATE ATTR_PRINTOPTIONS_START + 3 +#define ATTR_PRINTOPTIONS_TIME ATTR_PRINTOPTIONS_START + 4 +#define ATTR_PRINTOPTIONS_PAGENAME ATTR_PRINTOPTIONS_START + 5 +#define ATTR_PRINTOPTIONS_END ATTR_PRINTOPTIONS_PAGENAME + +#define ATTR_COPY_START ATTR_PRINTOPTIONS_END + 1 +#define ATTR_COPY_NUMBER ATTR_COPY_START +#define ATTR_COPY_MOVE_X ATTR_COPY_START + 1 +#define ATTR_COPY_MOVE_Y ATTR_COPY_START + 2 +#define ATTR_COPY_ANGLE ATTR_COPY_START + 3 +#define ATTR_COPY_WIDTH ATTR_COPY_START + 4 +#define ATTR_COPY_HEIGHT ATTR_COPY_START + 5 +#define ATTR_COPY_START_COLOR ATTR_COPY_START + 6 +#define ATTR_COPY_END_COLOR ATTR_COPY_START + 7 +#define ATTR_COPY_END ATTR_COPY_END_COLOR + +#define ATTR_SNAPLINE_START ATTR_COPY_END + 1 +#define ATTR_SNAPLINE_KIND ATTR_SNAPLINE_START +#define ATTR_SNAPLINE_X ATTR_SNAPLINE_START + 1 +#define ATTR_SNAPLINE_Y ATTR_SNAPLINE_START + 2 +#define ATTR_SNAPLINE_END ATTR_SNAPLINE_Y + +#define ATTR_OPTIONS_START ATTR_SNAPLINE_END + 1 +#define ATTR_OPTIONS ATTR_OPTIONS_START +#define ATTR_OPTIONS_LAYOUT ATTR_OPTIONS_START + 1 +#define ATTR_OPTIONS_CONTENTS ATTR_OPTIONS_START + 2 +#define ATTR_OPTIONS_MISC ATTR_OPTIONS_START + 3 +#define ATTR_OPTIONS_SNAP ATTR_OPTIONS_START + 4 +#define ATTR_OPTIONS_PRINT ATTR_OPTIONS_START + 5 +#define ATTR_OPTIONS_END ATTR_OPTIONS_PRINT + +#define ATTR_OPTIONS_SCALE_START ATTR_OPTIONS_END + 1 +#define ATTR_OPTIONS_SCALE_X ATTR_OPTIONS_SCALE_START +#define ATTR_OPTIONS_SCALE_Y ATTR_OPTIONS_SCALE_START + 1 +#define ATTR_OPTIONS_SCALE_WIDTH ATTR_OPTIONS_SCALE_START + 2 +#define ATTR_OPTIONS_SCALE_HEIGHT ATTR_OPTIONS_SCALE_START + 3 +#define ATTR_OPTIONS_SCALE_END ATTR_OPTIONS_SCALE_HEIGHT + +#define ATTR_PUBLISH_START ATTR_OPTIONS_SCALE_END + 1 +#define ATTR_PUBLISH_LOCATION ATTR_PUBLISH_START +#define ATTR_PUBLISH_WITHCONTENTSPAGE ATTR_PUBLISH_START + 1 +#define ATTR_PUBLISH_RESOLUTION ATTR_PUBLISH_START + 2 +#define ATTR_PUBLISH_MODE ATTR_PUBLISH_START + 3 +#define ATTR_PUBLISH_FORMAT ATTR_PUBLISH_START + 4 +#define ATTR_PUBLISH_COMPRESSION ATTR_PUBLISH_START + 5 +#define ATTR_PUBLISH_WITHNOTES ATTR_PUBLISH_START + 6 +#define ATTR_PUBLISH_AUTHOR ATTR_PUBLISH_START + 9 +#define ATTR_PUBLISH_EMAIL ATTR_PUBLISH_START + 10 +#define ATTR_PUBLISH_WWW ATTR_PUBLISH_START + 11 +#define ATTR_PUBLISH_INFO ATTR_PUBLISH_START + 12 +#define ATTR_PUBLISH_WITHDOWNLOAD ATTR_PUBLISH_START + 13 +#define ATTR_PUBLISH_WITHSTAROFFICE ATTR_PUBLISH_START + 14 +#define ATTR_PUBLISH_BUTTONS ATTR_PUBLISH_START + 15 +#define ATTR_PUBLISH_USERATTR ATTR_PUBLISH_START + 16 +#define ATTR_PUBLISH_BACKCOLOR ATTR_PUBLISH_START + 17 +#define ATTR_PUBLISH_TEXTCOLOR ATTR_PUBLISH_START + 18 +#define ATTR_PUBLISH_LINKCOLOR ATTR_PUBLISH_START + 19 +#define ATTR_PUBLISH_VLINKCOLOR ATTR_PUBLISH_START + 20 +#define ATTR_PUBLISH_ALINKCOLOR ATTR_PUBLISH_START + 21 +#define ATTR_PUBLISH_USEATTRIBS ATTR_PUBLISH_START + 22 +#define ATTR_PUBLISH_USECOLOR ATTR_PUBLISH_START + 23 +#define ATTR_PUBLISH_WEBSHOW ATTR_PUBLISH_START + 24 +#define ATTR_PUBLISH_SCRIPT ATTR_PUBLISH_START + 25 +#define ATTR_PUBLISH_URLPATH ATTR_PUBLISH_START + 26 +#define ATTR_PUBLISH_CGIPATH ATTR_PUBLISH_START + 27 +#define ATTR_PUBLISH_INDEX ATTR_PUBLISH_START + 28 +#define ATTR_PUBLISH_SLIDECHG ATTR_PUBLISH_START + 29 +#define ATTR_PUBLISH_SLIDEDURATION ATTR_PUBLISH_START + 30 +#define ATTR_PUBLISH_ENDLESS ATTR_PUBLISH_START + 31 +#define ATTR_PUBLISH_SLIDESOUND ATTR_PUBLISH_START + 32 +#define ATTR_PUBLISH_END ATTR_PUBLISH_SLIDESOUND + +#define ATTR_PRESLAYOUT_START ATTR_PUBLISH_END + 1 +#define ATTR_PRESLAYOUT_NAME ATTR_PRESLAYOUT_START +#define ATTR_PRESLAYOUT_LOAD ATTR_PRESLAYOUT_START + 1 +#define ATTR_PRESLAYOUT_MASTER_PAGE ATTR_PRESLAYOUT_START + 2 +#define ATTR_PRESLAYOUT_CHECK_MASTERS ATTR_PRESLAYOUT_START + 3 +#define ATTR_PRESLAYOUT_END ATTR_PRESLAYOUT_CHECK_MASTERS // Pack & Go Attribute #define ATTR_PACKNGO_START ATTR_PRESLAYOUT_END + 1 -#define ATTR_PACKNGO_UNLINK ATTR_PACKNGO_START -#define ATTR_PACKNGO_COMPRESS ATTR_PACKNGO_START + 1 -#define ATTR_PACKNGO_SPANNING ATTR_PACKNGO_START + 2 -#define ATTR_PACKNGO_MEDIUMSIZE ATTR_PACKNGO_START + 3 -#define ATTR_PACKNGO_END ATTR_PACKNGO_MEDIUMSIZE +#define ATTR_PACKNGO_UNLINK ATTR_PACKNGO_START +#define ATTR_PACKNGO_COMPRESS ATTR_PACKNGO_START + 1 +#define ATTR_PACKNGO_SPANNING ATTR_PACKNGO_START + 2 +#define ATTR_PACKNGO_MEDIUMSIZE ATTR_PACKNGO_START + 3 +#define ATTR_PACKNGO_END ATTR_PACKNGO_MEDIUMSIZE // paragraph numbering attributes -#define ATTR_PARANUMBERING_START ATTR_PACKNGO_MEDIUMSIZE + 1 -#define ATTR_NUMBER_NEWSTART ATTR_PARANUMBERING_START -#define ATTR_NUMBER_NEWSTART_AT ATTR_PARANUMBERING_START + 1 -#define ATTR_PARANUMBERING_END ATTR_NUMBER_NEWSTART_AT +#define ATTR_PARANUMBERING_START ATTR_PACKNGO_MEDIUMSIZE + 1 +#define ATTR_NUMBER_NEWSTART ATTR_PARANUMBERING_START +#define ATTR_NUMBER_NEWSTART_AT ATTR_PARANUMBERING_START + 1 +#define ATTR_PARANUMBERING_END ATTR_NUMBER_NEWSTART_AT #endif // _SDATTR_HRC diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx index 85e231f0a357..d0cb60816dcf 100644 --- a/sd/inc/sdattr.hxx +++ b/sd/inc/sdattr.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ //================================================================== -// Layer-Attribute +// Layer-Attribute //================================================================== class SdAttrLayerName : public SfxStringItem @@ -120,10 +120,10 @@ public: DiaEffectItem( ::com::sun::star::presentation::FadeEffect eFade = com::sun::star::presentation::FadeEffect_NONE ); DiaEffectItem( SvStream& rIn ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; - USHORT GetValueCount() const { return FADE_EFFECT_COUNT; } - ::com::sun::star::presentation::FadeEffect GetValue() const + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + USHORT GetValueCount() const { return FADE_EFFECT_COUNT; } + ::com::sun::star::presentation::FadeEffect GetValue() const { return (::com::sun::star::presentation::FadeEffect) SfxEnumItem::GetValue(); } }; @@ -136,10 +136,10 @@ public: DiaSpeedItem( FadeSpeed = FADE_SPEED_MEDIUM ); DiaSpeedItem( SvStream& rIn ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; - USHORT GetValueCount() const { return FADE_SPEED_COUNT; } - FadeSpeed GetValue() const + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + USHORT GetValueCount() const { return FADE_SPEED_COUNT; } + FadeSpeed GetValue() const { return (FadeSpeed) SfxEnumItem::GetValue(); } }; @@ -152,10 +152,10 @@ public: DiaAutoItem( PresChange = PRESCHANGE_MANUAL ); DiaAutoItem( SvStream& rIn ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; - USHORT GetValueCount() const { return PRESCHANGE_COUNT; } - PresChange GetValue() const { return (PresChange) SfxEnumItem::GetValue(); } + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + USHORT GetValueCount() const { return PRESCHANGE_COUNT; } + PresChange GetValue() const { return (PresChange) SfxEnumItem::GetValue(); } }; //------------------------------------------------------------------ @@ -167,7 +167,7 @@ public: DiaTimeItem( UINT32 nValue = 0L ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; }; #endif // _SDATTR_HXX diff --git a/sd/inc/sdcgmfilter.hxx b/sd/inc/sdcgmfilter.hxx index f6f2c633ae64..1d90dada1d75 100644 --- a/sd/inc/sdcgmfilter.hxx +++ b/sd/inc/sdcgmfilter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/inc/sddll.hxx b/sd/inc/sddll.hxx index 20d09179553e..ed0dcc0030fd 100644 --- a/sd/inc/sddll.hxx +++ b/sd/inc/sddll.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,8 +61,8 @@ public: ~SdDLL(); // static-init/exit-code must be linked to the application - static void LibInit(); // called from SfxApplication-subclass::Init() - static void LibExit(); // called from SfxApplication-subclass::Exit() + static void LibInit(); // called from SfxApplication-subclass::Init() + static void LibExit(); // called from SfxApplication-subclass::Exit() // DLL-init/exit-code must be linked to the DLL only static void Init(); // called directly after loading the DLL diff --git a/sd/inc/sddllapi.h b/sd/inc/sddllapi.h index b6c3a4be17e9..f76257c6e098 100644 --- a/sd/inc/sddllapi.h +++ b/sd/inc/sddllapi.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/inc/sdenumdef.hxx b/sd/inc/sdenumdef.hxx index edabe4d6df18..db4e90c6018b 100644 --- a/sd/inc/sdenumdef.hxx +++ b/sd/inc/sdenumdef.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/inc/sderror.hxx b/sd/inc/sderror.hxx index 2564584cb3eb..af0d92f2fcf1 100644 --- a/sd/inc/sderror.hxx +++ b/sd/inc/sderror.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,13 +30,13 @@ #include <tools/errcode.hxx> -#define ERROR_SD_BASE (ERRCODE_AREA_SD) -#define ERROR_SD_READ_BASE (ERROR_SD_BASE | ERRCODE_CLASS_READ) -#define ERROR_SD_WRITE_BASE (ERROR_SD_BASE | ERRCODE_CLASS_WRITE) +#define ERROR_SD_BASE (ERRCODE_AREA_SD) +#define ERROR_SD_READ_BASE (ERROR_SD_BASE | ERRCODE_CLASS_READ) +#define ERROR_SD_WRITE_BASE (ERROR_SD_BASE | ERRCODE_CLASS_WRITE) -#define WARN_SD_BASE (ERRCODE_AREA_SD | ERRCODE_WARNING_MASK) -#define WARN_SD_READ_BASE (WARN_SD_BASE | ERRCODE_CLASS_READ ) -#define WARN_SD_WRITE_BASE (WARN_SD_BASE | ERRCODE_CLASS_WRITE ) +#define WARN_SD_BASE (ERRCODE_AREA_SD | ERRCODE_WARNING_MASK) +#define WARN_SD_READ_BASE (WARN_SD_BASE | ERRCODE_CLASS_READ ) +#define WARN_SD_WRITE_BASE (WARN_SD_BASE | ERRCODE_CLASS_WRITE ) // Import errors diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx index ad32cd3466ea..dffe972ccedf 100644 --- a/sd/inc/sdfilter.hxx +++ b/sd/inc/sdfilter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,27 +52,27 @@ public: SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ); virtual ~SdFilter(); - sal_Bool IsProgress() const { return mbShowProgress; } - sal_Bool IsDraw() const { return mbIsDraw; } - sal_Bool IsImpress() const { return !mbIsDraw; } + sal_Bool IsProgress() const { return mbShowProgress; } + sal_Bool IsDraw() const { return mbIsDraw; } + sal_Bool IsImpress() const { return !mbIsDraw; } virtual sal_Bool Export() = 0; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel; - ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > mxStatusIndicator; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel; + ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > mxStatusIndicator; - SfxMedium& mrMedium; - ::sd::DrawDocShell& mrDocShell; - SdDrawDocument& mrDocument; - sal_Bool mbIsDraw : 1; - sal_Bool mbShowProgress : 1; + SfxMedium& mrMedium; + ::sd::DrawDocShell& mrDocShell; + SdDrawDocument& mrDocument; + sal_Bool mbIsDraw : 1; + sal_Bool mbShowProgress : 1; - ::osl::Module* OpenLibrary( const ::rtl::OUString& rLibraryName ) const; - void CreateStatusIndicator(); + ::osl::Module* OpenLibrary( const ::rtl::OUString& rLibraryName ) const; + void CreateStatusIndicator(); private: - ::rtl::OUString ImplGetFullLibraryName( const ::rtl::OUString& rLibraryName ) const; + ::rtl::OUString ImplGetFullLibraryName( const ::rtl::OUString& rLibraryName ) const; }; diff --git a/sd/inc/sdgrffilter.hxx b/sd/inc/sdgrffilter.hxx index 7d4ef3ab9a3b..17691c22624e 100644 --- a/sd/inc/sdgrffilter.hxx +++ b/sd/inc/sdgrffilter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,8 +49,8 @@ public: sal_Bool Import(); sal_Bool Export(); - static void SaveGraphic( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ); - static void HandleGraphicFilterError( USHORT nFilterError, ULONG nStreamError = ERRCODE_NONE ); + static void SaveGraphic( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ); + static void HandleGraphicFilterError( USHORT nFilterError, ULONG nStreamError = ERRCODE_NONE ); }; #endif // _SD_SDGRFFILTER_HXX diff --git a/sd/inc/sdhtmlfilter.hxx b/sd/inc/sdhtmlfilter.hxx index 9b1a11d839a3..5271e6a7f086 100644 --- a/sd/inc/sdhtmlfilter.hxx +++ b/sd/inc/sdhtmlfilter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,17 +34,17 @@ // - SdHTMLFilter - // ---------------- -class SdHTMLFilter +class SdHTMLFilter : public SdFilter { public: SdHTMLFilter ( - SfxMedium& rMedium, - ::sd::DrawDocShell& rDocShell, + SfxMedium& rMedium, + ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress); virtual ~SdHTMLFilter (void); - virtual sal_Bool Export(); + virtual sal_Bool Export(); private: DECL_LINK( IOProgressHdl, USHORT* ); diff --git a/sd/inc/sdiocmpt.hxx b/sd/inc/sdiocmpt.hxx index d2724b99ec75..9ca1e772d160 100644 --- a/sd/inc/sdiocmpt.hxx +++ b/sd/inc/sdiocmpt.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,14 +33,14 @@ ////////////////////////////////////////////////////////////////////////////// class SvStream; -class old_SdrDownCompat +class old_SdrDownCompat { protected: - SvStream& rStream; - UINT32 nSubRecSiz; - UINT32 nSubRecPos; - UINT16 nMode; - BOOL bOpen; + SvStream& rStream; + UINT32 nSubRecSiz; + UINT32 nSubRecPos; + UINT16 nMode; + BOOL bOpen; protected: void Read(); @@ -64,13 +64,13 @@ private: public: // nNewMode: STREAM_READ oder STREAM_WRITE - // nVer: nur beim Schreiben angeben + // nVer: nur beim Schreiben angeben SdIOCompat(SvStream& rNewStream, USHORT nNewMode, UINT16 nVer = SDIOCOMPAT_VERSIONDONTKNOW); ~SdIOCompat(); - UINT16 GetVersion() const { return nVersion; } + UINT16 GetVersion() const { return nVersion; } }; -#endif // _SD_SDIOCMPT_HXX +#endif // _SD_SDIOCMPT_HXX diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index f0d5cc64a3c4..792cc8747b13 100755 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -105,25 +105,25 @@ public: DECL_LINK( CalcFieldValueHdl, EditFieldInfo* ); SdModule(SfxObjectFactory* pDrawObjFact, SfxObjectFactory* pGraphicObjFact); - virtual ~SdModule(); + virtual ~SdModule(); - SdTransferable* pTransferClip; - SdTransferable* pTransferDrag; - SdTransferable* pTransferSelection; + SdTransferable* pTransferClip; + SdTransferable* pTransferDrag; + SdTransferable* pTransferSelection; - void Execute(SfxRequest& rReq); - void GetState(SfxItemSet&); + void Execute(SfxRequest& rReq); + void GetState(SfxItemSet&); - virtual void FillStatusBar(StatusBar& rBar); + virtual void FillStatusBar(StatusBar& rBar); - SdOptions* GetSdOptions(DocumentType eDocType); - SD_DLLPUBLIC SvStorageStreamRef GetOptionStream( const String& rOptionName, SdOptionStreamMode eMode ); + SdOptions* GetSdOptions(DocumentType eDocType); + SD_DLLPUBLIC SvStorageStreamRef GetOptionStream( const String& rOptionName, SdOptionStreamMode eMode ); - BOOL GetWaterCan() const { return bWaterCan; } - void SetWaterCan( BOOL bWC ) { bWaterCan = bWC; } + BOOL GetWaterCan() const { return bWaterCan; } + void SetWaterCan( BOOL bWC ) { bWaterCan = bWC; } - SvxSearchItem* GetSearchItem() { return (pSearchItem); } - void SetSearchItem(SvxSearchItem* pItem) { pSearchItem = pItem; } + SvxSearchItem* GetSearchItem() { return (pSearchItem); } + void SetSearchItem(SvxSearchItem* pItem) { pSearchItem = pItem; } /** Return the virtual device that can be used for printer independent layout. @@ -139,30 +139,30 @@ public: */ OutputDevice* GetRefDevice (::sd::DrawDocShell& rDocShell); - SD_DLLPUBLIC SvNumberFormatter* GetNumberFormatter(); + SD_DLLPUBLIC SvNumberFormatter* GetNumberFormatter(); //virtuelle Methoden fuer den Optionendialog - virtual SfxItemSet* CreateItemSet( USHORT nId ); - virtual void ApplyItemSet( USHORT nId, const SfxItemSet& rSet ); - virtual SfxTabPage* CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet ); + virtual SfxItemSet* CreateItemSet( USHORT nId ); + virtual void ApplyItemSet( USHORT nId, const SfxItemSet& rSet ); + virtual SfxTabPage* CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet ); protected: - SdOptions* pImpressOptions; - SdOptions* pDrawOptions; - SvxSearchItem* pSearchItem; + SdOptions* pImpressOptions; + SdOptions* pDrawOptions; + SvxSearchItem* pSearchItem; SvNumberFormatter* pNumberFormatter; - SvStorageRef xOptionStorage; - BOOL bAutoSave; - BOOL bWaterCan; - SfxErrorHandler* mpErrorHdl; + SvStorageRef xOptionStorage; + BOOL bAutoSave; + BOOL bWaterCan; + SfxErrorHandler* mpErrorHdl; /** This device is used for printer independent layout. It is virtual in the sense that it does not represent a printer. The pointer may be NULL when the virtual device could not be created. */ OutputDevice* mpVirtualRefDevice; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); private: SfxFrame* ExecuteNewDocument( SfxRequest& rReq ); diff --git a/sd/inc/sdobjfac.hxx b/sd/inc/sdobjfac.hxx index b533fe8844de..01e28732f931 100644 --- a/sd/inc/sdobjfac.hxx +++ b/sd/inc/sdobjfac.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index e4125051c526..744c37b49665 100755 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,7 +97,7 @@ namespace sd { bool mbDateTimeVisible; bool mbDateTimeIsFixed; String maDateTimeText; - int meDateTimeFormat; + int meDateTimeFormat; HeaderFooterSettings(); @@ -125,31 +125,31 @@ friend class sd::UndoGeoObject; friend class sd::UndoAttrObject; protected: - PageKind mePageKind; // Seitentyp - AutoLayout meAutoLayout; // AutoLayout - sd::ShapeList maPresentationShapeList; // Praesentationsobjekte + PageKind mePageKind; // Seitentyp + AutoLayout meAutoLayout; // AutoLayout + sd::ShapeList maPresentationShapeList; // Praesentationsobjekte sd::ScopeLock maLockAutoLayoutArrangement; - BOOL mbSelected; // Selektionskennung - PresChange mePresChange; // manuell/automatisch/halbautomatisch - UINT32 mnTime; // Anzeigedauer in Sekunden - BOOL mbSoundOn; // mit/ohne Sound (TRUE/FALSE) - BOOL mbExcluded; // wird in der Show nicht/doch + BOOL mbSelected; // Selektionskennung + PresChange mePresChange; // manuell/automatisch/halbautomatisch + UINT32 mnTime; // Anzeigedauer in Sekunden + BOOL mbSoundOn; // mit/ohne Sound (TRUE/FALSE) + BOOL mbExcluded; // wird in der Show nicht/doch // angezeigt (TRUE/FALSE) - String maLayoutName; // Name des Layouts + String maLayoutName; // Name des Layouts String maSoundFile; // Pfad zum Soundfile (MSDOS-Notation) - bool mbLoopSound; - bool mbStopSound; + bool mbLoopSound; + bool mbStopSound; String maCreatedPageName; // von GetPageName erzeugter Seitenname String maFileName; // Filename - String maBookmarkName; // Bookmarkname - BOOL mbScaleObjects; // Objekte sollen skaliert werden - BOOL mbBackgroundFullSize; // Hintergrundobjekt auf ganze Seite darstellen + String maBookmarkName; // Bookmarkname + BOOL mbScaleObjects; // Objekte sollen skaliert werden + BOOL mbBackgroundFullSize; // Hintergrundobjekt auf ganze Seite darstellen rtl_TextEncoding meCharSet; // Text-Encoding USHORT mnPaperBin; // PaperBin Orientation meOrientation; // Print-Orientation - SdPageLink* mpPageLink; // PageLink (nur bei gelinkten Seiten) + SdPageLink* mpPageLink; // PageLink (nur bei gelinkten Seiten) - sd::AnnotationVector maAnnotations; + sd::AnnotationVector maAnnotations; /** holds the smil animation sequences for this page */ ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxAnimationNode; @@ -159,11 +159,11 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage(); - SfxItemSet* mpItems; + SfxItemSet* mpItems; SfxItemSet* getOrCreateItems(); - sd::HeaderFooterSettings maHeaderFooterSettings; + sd::HeaderFooterSettings maHeaderFooterSettings; // new transition settings sal_Int16 mnTransitionType; @@ -181,40 +181,40 @@ public: virtual SdrPage* Clone() const; virtual SdrPage* Clone(SdrModel* pNewModel) const; - virtual void SetSize(const Size& aSize); - virtual void SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 Lwr); - virtual void SetLftBorder(INT32 nBorder); - virtual void SetRgtBorder(INT32 nBorder); - virtual void SetUppBorder(INT32 nBorder); - virtual void SetLwrBorder(INT32 nBorder); - virtual void SetModel(SdrModel* pNewModel); + virtual void SetSize(const Size& aSize); + virtual void SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 Lwr); + virtual void SetLftBorder(INT32 nBorder); + virtual void SetRgtBorder(INT32 nBorder); + virtual void SetUppBorder(INT32 nBorder); + virtual void SetLwrBorder(INT32 nBorder); + virtual void SetModel(SdrModel* pNewModel); virtual FASTBOOL IsReadOnly() const; - sd::ShapeList& GetPresentationShapeList() { return maPresentationShapeList; } + sd::ShapeList& GetPresentationShapeList() { return maPresentationShapeList; } void EnsureMasterPageDefaultBackground(); SdrObject* CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rectangle& rRect, BOOL bInsert=FALSE); - SdrObject* CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert); - SdrObject* GetPresObj(PresObjKind eObjKind, int nIndex = 1, bool bFuzzySearch = false ); + SdrObject* CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert); + SdrObject* GetPresObj(PresObjKind eObjKind, int nIndex = 1, bool bFuzzySearch = false ); PresObjKind GetPresObjKind(SdrObject* pObj) const; String GetPresObjText(PresObjKind eObjKind) const; SfxStyleSheet* GetStyleSheetForMasterPageBackground() const; - SfxStyleSheet* GetStyleSheetForPresObj(PresObjKind eObjKind) const; - bool RestoreDefaultText( SdrObject* pObj ); + SfxStyleSheet* GetStyleSheetForPresObj(PresObjKind eObjKind) const; + bool RestoreDefaultText( SdrObject* pObj ); /** returns true if the given SdrObject is inside the presentation object list */ - bool IsPresObj(const SdrObject* pObj); + bool IsPresObj(const SdrObject* pObj); /** removes the given SdrObject from the presentation object list */ - void RemovePresObj(const SdrObject* pObj); + void RemovePresObj(const SdrObject* pObj); /** inserts the given SdrObject into the presentation object list */ - void InsertPresObj(SdrObject* pObj, PresObjKind eKind ); + void InsertPresObj(SdrObject* pObj, PresObjKind eKind ); - void SetAutoLayout(AutoLayout eLayout, BOOL bInit=FALSE, BOOL bCreate=FALSE); - AutoLayout GetAutoLayout() const { return meAutoLayout; } + void SetAutoLayout(AutoLayout eLayout, BOOL bInit=FALSE, BOOL bCreate=FALSE); + AutoLayout GetAutoLayout() const { return meAutoLayout; } void CreateTitleAndLayout(BOOL bInit=FALSE, BOOL bCreate=FALSE); - SdrObject* InsertAutoLayoutShape(SdrObject* pObj, PresObjKind eObjKind, bool bVertical, Rectangle aRect, bool bInit ); + SdrObject* InsertAutoLayoutShape(SdrObject* pObj, PresObjKind eObjKind, bool bVertical, Rectangle aRect, bool bInit ); virtual void NbcInsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL); @@ -228,86 +228,86 @@ public: virtual void SetLinkData(const String& rLinkName, const String& rLinkData); - void SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eObjKind, const String& rStr ); + void SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eObjKind, const String& rStr ); - void SetPageKind(PageKind ePgType) { mePageKind = ePgType; } - PageKind GetPageKind() const { return mePageKind; } + void SetPageKind(PageKind ePgType) { mePageKind = ePgType; } + PageKind GetPageKind() const { return mePageKind; } - void SetSelected(BOOL bSel) { mbSelected = bSel; } - BOOL IsSelected() const { return mbSelected; } + void SetSelected(BOOL bSel) { mbSelected = bSel; } + BOOL IsSelected() const { return mbSelected; } - void SetFadeEffect(::com::sun::star::presentation::FadeEffect eNewEffect); - ::com::sun::star::presentation::FadeEffect GetFadeEffect() const; + void SetFadeEffect(::com::sun::star::presentation::FadeEffect eNewEffect); + ::com::sun::star::presentation::FadeEffect GetFadeEffect() const; - void SetPresChange(PresChange eChange) { mePresChange = eChange; } - PresChange GetPresChange() const { return mePresChange; } + void SetPresChange(PresChange eChange) { mePresChange = eChange; } + PresChange GetPresChange() const { return mePresChange; } - void SetTime(UINT32 nNewTime) { mnTime = nNewTime; } - UINT32 GetTime() const { return mnTime; } + void SetTime(UINT32 nNewTime) { mnTime = nNewTime; } + UINT32 GetTime() const { return mnTime; } - void SetSound(BOOL bNewSoundOn) { mbSoundOn = bNewSoundOn; } - BOOL IsSoundOn() const { return mbSoundOn; } + void SetSound(BOOL bNewSoundOn) { mbSoundOn = bNewSoundOn; } + BOOL IsSoundOn() const { return mbSoundOn; } - void SetExcluded(BOOL bNewExcluded) { mbExcluded = bNewExcluded; } - BOOL IsExcluded() const { return mbExcluded; } + void SetExcluded(BOOL bNewExcluded) { mbExcluded = bNewExcluded; } + BOOL IsExcluded() const { return mbExcluded; } - void SetScaleObjects(BOOL bScale) { mbScaleObjects = bScale; } - BOOL IsScaleObjects() const { return mbScaleObjects; } + void SetScaleObjects(BOOL bScale) { mbScaleObjects = bScale; } + BOOL IsScaleObjects() const { return mbScaleObjects; } - void SetSoundFile(const String& rStr) { maSoundFile = rStr; } - String GetSoundFile() const { return maSoundFile; } + void SetSoundFile(const String& rStr) { maSoundFile = rStr; } + String GetSoundFile() const { return maSoundFile; } - void SetLoopSound( bool bLoopSound ) { mbLoopSound = bLoopSound; } - bool IsLoopSound() const { return mbLoopSound; } + void SetLoopSound( bool bLoopSound ) { mbLoopSound = bLoopSound; } + bool IsLoopSound() const { return mbLoopSound; } - void SetStopSound( bool bStopSound ) { mbStopSound = bStopSound; } - bool IsStopSound() const { return mbStopSound; } + void SetStopSound( bool bStopSound ) { mbStopSound = bStopSound; } + bool IsStopSound() const { return mbStopSound; } - sal_Int16 getTransitionType() const; - void setTransitionType( sal_Int16 nTransitionType ); + sal_Int16 getTransitionType() const; + void setTransitionType( sal_Int16 nTransitionType ); - sal_Int16 getTransitionSubtype() const; - void setTransitionSubtype( sal_Int16 nTransitionSubtype ); + sal_Int16 getTransitionSubtype() const; + void setTransitionSubtype( sal_Int16 nTransitionSubtype ); - sal_Bool getTransitionDirection() const; - void setTransitionDirection( sal_Bool bTransitionbDirection ); + sal_Bool getTransitionDirection() const; + void setTransitionDirection( sal_Bool bTransitionbDirection ); - sal_Int32 getTransitionFadeColor() const; - void setTransitionFadeColor( sal_Int32 nTransitionFadeColor ); + sal_Int32 getTransitionFadeColor() const; + void setTransitionFadeColor( sal_Int32 nTransitionFadeColor ); - double getTransitionDuration() const; - void setTransitionDuration( double fTranstionDuration ); + double getTransitionDuration() const; + void setTransitionDuration( double fTranstionDuration ); // Virtuelle Methoden von SdrObjUserCall virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect); - void SetLayoutName(String aName); - virtual String GetLayoutName() const { return maLayoutName; } + void SetLayoutName(String aName); + virtual String GetLayoutName() const { return maLayoutName; } - void SetFileName(const String& aName) { maFileName = aName; } - virtual String GetFileName() const { return maFileName; } - void SetBookmarkName(const String& aName) { maBookmarkName = aName; } - virtual String GetBookmarkName() const { return maBookmarkName; } - SdPageLink* GetLink() { return mpPageLink; } + void SetFileName(const String& aName) { maFileName = aName; } + virtual String GetFileName() const { return maFileName; } + void SetBookmarkName(const String& aName) { maBookmarkName = aName; } + virtual String GetBookmarkName() const { return maBookmarkName; } + SdPageLink* GetLink() { return mpPageLink; } - void ConnectLink(); - void DisconnectLink(); + void ConnectLink(); + void DisconnectLink(); void ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderRect, BOOL bScaleAllObj); const String& GetName() const; - String GetRealName() const { return FmFormPage::GetName(); }; + String GetRealName() const { return FmFormPage::GetName(); }; void SetPresentationLayout(const String& rLayoutName, BOOL bReplaceStyleSheets = TRUE, BOOL bSetMasterPage = TRUE, BOOL bReverseOrder = FALSE); - void EndListenOutlineText(); + void EndListenOutlineText(); - void SetBackgroundFullSize( BOOL bIn ); - BOOL IsBackgroundFullSize() const { return mbBackgroundFullSize; } + void SetBackgroundFullSize( BOOL bIn ); + BOOL IsBackgroundFullSize() const { return mbBackgroundFullSize; } rtl_TextEncoding GetCharSet() { return(meCharSet); } @@ -355,8 +355,8 @@ public: like printing. */ virtual bool checkVisibility( - const sdr::contact::ViewObjectContact& rOriginal, - const sdr::contact::DisplayInfo& rDisplayInfo, + const sdr::contact::ViewObjectContact& rOriginal, + const sdr::contact::DisplayInfo& rDisplayInfo, bool bEdit ); /** callback from the sd::View when a new paragraph for one object on this page is created */ @@ -410,4 +410,4 @@ private: void onRemoveObject( SdrObject* pObject ); }; -#endif // _SDPAGE_HXX +#endif // _SDPAGE_HXX diff --git a/sd/inc/sdpptwrp.hxx b/sd/inc/sdpptwrp.hxx index f9dde9946f2c..3eaa7bcfaf92 100644 --- a/sd/inc/sdpptwrp.hxx +++ b/sd/inc/sdpptwrp.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,10 +47,10 @@ public: sal_Bool Export(); // these methods are necassary for the export to PowerPoint - void PreSaveBasic(); // restaures the original basic storage + void PreSaveBasic(); // restaures the original basic storage private: - SvMemoryStream* pBas; + SvMemoryStream* pBas; }; #endif // _SD_PPTWRP_HXX diff --git a/sd/inc/sdresid.hxx b/sd/inc/sdresid.hxx index db41ccdb689c..8db18e8b96af 100644 --- a/sd/inc/sdresid.hxx +++ b/sd/inc/sdresid.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/inc/sduiks.hrc b/sd/inc/sduiks.hrc index 6904cc2999d1..218b4ee8c76f 100644 --- a/sd/inc/sduiks.hrc +++ b/sd/inc/sduiks.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,29 +29,29 @@ #include <usr/uiks.hrc> -#define SD_UIK_SHAPE_FACTORY UIK_DRAWING(00) -#define SD_UIK_POLYGON_FACTORY UIK_DRAWING(01) -#define SD_UIK_3D_SHAPE_FACTORY UIK_DRAWING(02) -#define SD_UIK_TEXT_FACTORY UIK_DRAWING(03) -#define SD_UIK_SNAP_FACTORY UIK_DRAWING(04) +#define SD_UIK_SHAPE_FACTORY UIK_DRAWING(00) +#define SD_UIK_POLYGON_FACTORY UIK_DRAWING(01) +#define SD_UIK_3D_SHAPE_FACTORY UIK_DRAWING(02) +#define SD_UIK_TEXT_FACTORY UIK_DRAWING(03) +#define SD_UIK_SNAP_FACTORY UIK_DRAWING(04) -#define SD_UIK_DRAW_PAGES UIK_DRAWING(10) -#define SD_UIK_DRAW_PAGE_MANIPULATOR UIK_DRAWING(11) +#define SD_UIK_DRAW_PAGES UIK_DRAWING(10) +#define SD_UIK_DRAW_PAGE_MANIPULATOR UIK_DRAWING(11) -#define SD_UIK_SHAPE UIK_DRAWING(20) -#define SD_UIK_CONNECTOR UIK_DRAWING(21) -#define SD_UIK_CONNECTABLE UIK_DRAWING(22) -#define SD_UIK_SHAPE_3D UIK_DRAWING(23) +#define SD_UIK_SHAPE UIK_DRAWING(20) +#define SD_UIK_CONNECTOR UIK_DRAWING(21) +#define SD_UIK_CONNECTABLE UIK_DRAWING(22) +#define SD_UIK_SHAPE_3D UIK_DRAWING(23) #define SD_UIK_SHAPE_GROUP UIK_DRAWING(24) #define SD_UIK_SHAPE_MIRRORER UIK_DRAWING(25) -#define SD_UIK_SHAPE_ALIGNER UIK_DRAWING(26) -#define SD_UIK_SHAPE_ARRANGER UIK_DRAWING(27) -#define SD_UIK_SHAPE_CONVERTER UIK_DRAWING(28) -#define SD_UIK_ANIMATOR UIK_DRAWING(29) +#define SD_UIK_SHAPE_ALIGNER UIK_DRAWING(26) +#define SD_UIK_SHAPE_ARRANGER UIK_DRAWING(27) +#define SD_UIK_SHAPE_CONVERTER UIK_DRAWING(28) +#define SD_UIK_ANIMATOR UIK_DRAWING(29) -#define SD_UIK_DRAW_PAGE UIK_DRAWING(30) -#define SD_UIK_SHAPES UIK_DRAWING(31) -#define SD_UIK_GROUP UIK_DRAWING(32) +#define SD_UIK_DRAW_PAGE UIK_DRAWING(30) +#define SD_UIK_SHAPES UIK_DRAWING(31) +#define SD_UIK_GROUP UIK_DRAWING(32) #define SD_UIK_COMBINE UIK_DRAWING(33) #define SD_UIK_CONNECT UIK_DRAWING(34) #define SD_UIK_CONNECT UIK_DRAWING(35) @@ -59,12 +59,12 @@ #define SD_UIK_PRESENTATION UIK_DRAWING(40) #define SD_UIK_PRESENTATION_NAVIGATION UIK_DRAWING(41) #define SD_UIK_CUSTOM_PRESENTATION UIK_DRAWING(42) -#define SD_UIK_CUSTOM_PRESENTATIONS UIK_DRAWING(43) -#define SD_UIK_CUSTOM_PRESENTATIONS UIK_DRAWING(44) +#define SD_UIK_CUSTOM_PRESENTATIONS UIK_DRAWING(43) +#define SD_UIK_CUSTOM_PRESENTATIONS UIK_DRAWING(44) -#define SD_UIK_ZOOM UIK_DRAWING(50) -#define SD_UIK_DRAW_VIEW UIK_DRAWING(51) -#define SD_UIK_OUTLINE_VIEW UIK_DRAWING(52) +#define SD_UIK_ZOOM UIK_DRAWING(50) +#define SD_UIK_DRAW_VIEW UIK_DRAWING(51) +#define SD_UIK_OUTLINE_VIEW UIK_DRAWING(52) #define SD_UIK_SLIDE_VIEW UIK_DRAWING(53) #define SD_UIK_SLIDE_VIEW UIK_DRAWING(53) diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx index 60045b701d57..a09b5ec67bec 100644 --- a/sd/inc/sdundo.hxx +++ b/sd/inc/sdundo.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,9 +39,9 @@ public: TYPEINFO(); SdUndoAction(SdDrawDocument* pSdDrawDocument) : mpDoc(pSdDrawDocument) {} - virtual ~SdUndoAction() {} + virtual ~SdUndoAction() {} - void SetComment(String& rStr) { maComment = rStr; } + void SetComment(String& rStr) { maComment = rStr; } virtual String GetComment() const { return maComment; } virtual SdUndoAction* Clone() const { return NULL; } @@ -50,4 +50,4 @@ protected: String maComment; }; -#endif // _SD_SDUNDO_HXX +#endif // _SD_SDUNDO_HXX diff --git a/sd/inc/sdxmlwrp.hxx b/sd/inc/sdxmlwrp.hxx index 00532c1a142d..5199ecb2c274 100644 --- a/sd/inc/sdxmlwrp.hxx +++ b/sd/inc/sdxmlwrp.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,18 +36,18 @@ enum SdXMLFilterMode { - SDXMLMODE_Normal, // standard load and save of the complete document - SDXMLMODE_Preview, // only for import, only the first draw page and its master page is loaded - SDXMLMODE_Organizer // only for import, only the styles are loaded + SDXMLMODE_Normal, // standard load and save of the complete document + SDXMLMODE_Preview, // only for import, only the first draw page and its master page is loaded + SDXMLMODE_Organizer // only for import, only the styles are loaded }; class SdXMLFilter : public SdFilter { public: - SdXMLFilter( - SfxMedium& rMedium, - ::sd::DrawDocShell& rDocShell, - sal_Bool bShowProgress, + SdXMLFilter( + SfxMedium& rMedium, + ::sd::DrawDocShell& rDocShell, + sal_Bool bShowProgress, SdXMLFilterMode eFilterMode = SDXMLMODE_Normal, ULONG nStoreVer = SOFFICE_FILEFORMAT_8 ); virtual ~SdXMLFilter (void); @@ -60,4 +60,4 @@ private: ULONG mnStoreVer; }; -#endif // _SDXMLWRP_HXX +#endif // _SDXMLWRP_HXX diff --git a/sd/inc/shapelist.hxx b/sd/inc/shapelist.hxx index 1b87a6a9e10f..a453723a8a5e 100755 --- a/sd/inc/shapelist.hxx +++ b/sd/inc/shapelist.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ namespace sd bool hasMore() const; const std::list< SdrObject* >& getList() const { return maShapeList; } - + private: virtual void ObjectInDestruction(const SdrObject& rObject); @@ -85,4 +85,4 @@ namespace sd }; } -#endif // _SHAPELIST_HXX +#endif // _SHAPELIST_HXX diff --git a/sd/inc/stlfamily.hxx b/sd/inc/stlfamily.hxx index ecb3f6996a28..d7bdcbf0e93b 100644 --- a/sd/inc/stlfamily.hxx +++ b/sd/inc/stlfamily.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,9 +87,9 @@ public: virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); - + virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); + // XNameReplace virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); @@ -118,9 +118,9 @@ private: SfxStyleFamily mnFamily; rtl::Reference< SfxStyleSheetPool > mxPool; - SdStyleFamilyImpl* mpImpl; + SdStyleFamilyImpl* mpImpl; }; typedef rtl::Reference< SdStyleFamily > SdStyleFamilyRef; -#endif // _SD_STLFAMILY_HXX +#endif // _SD_STLFAMILY_HXX diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index fd9dbeae5977..99253157e339 100755 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,8 +64,8 @@ class SdStyleSheetPool : public SdStyleSheetPoolBase, public SfxListener public: SdStyleSheetPool(SfxItemPool const& rPool, SdDrawDocument* pDocument); - void SetActualStyleSheet(SfxStyleSheetBase* pActStyleSheet) { mpActualStyleSheet = pActStyleSheet; } - SfxStyleSheetBase* GetActualStyleSheet() { return mpActualStyleSheet; } + void SetActualStyleSheet(SfxStyleSheetBase* pActStyleSheet) { mpActualStyleSheet = pActStyleSheet; } + SfxStyleSheetBase* GetActualStyleSheet() { return mpActualStyleSheet; } SfxStyleSheetBase* GetTitleSheet(const String& rLayoutName); @@ -75,27 +75,27 @@ public: /** creates all layout style sheets for the givin layout name if they don't exist yet. - @param rLayoutName Must be the name of a master page - @param bCheck If set to true, the debug version will assert if a style + @param rLayoutName Must be the name of a master page + @param bCheck If set to true, the debug version will assert if a style had to be created. This is used to assert errors in documents when styles are missing. */ SD_DLLPUBLIC void CreateLayoutStyleSheets(const String& rLayoutName, sal_Bool bCheck = sal_False ); List* CreateLayoutSheetNames(const String& rLayoutName) const; - void CreateLayoutSheetList(const String& rLayoutName, SdStyleSheetVector& rLayoutSheets); + void CreateLayoutSheetList(const String& rLayoutName, SdStyleSheetVector& rLayoutSheets); void CopyLayoutSheets(const String& rLayoutName, SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets ); void CopyGraphicSheets(SdStyleSheetPool& rSourcePool); void CopyCellSheets(SdStyleSheetPool& rSourcePool); void CopyTableStyles(SdStyleSheetPool& rSourcePool); void CreatePseudosIfNecessary(); - void UpdateStdNames(); - static void PutNumBulletItem( SfxStyleSheetBase* pSheet, Font& rBulletFont ); + void UpdateStdNames(); + static void PutNumBulletItem( SfxStyleSheetBase* pSheet, Font& rBulletFont ); Font GetBulletFont() const; - SdDrawDocument* GetDoc() const { return mpDoc; } + SdDrawDocument* GetDoc() const { return mpDoc; } - static SdStyleSheetVector CreateChildList( SdStyleSheet* pSheet ); + static SdStyleSheetVector CreateChildList( SdStyleSheet* pSheet ); public: @@ -139,13 +139,13 @@ protected: void RemoveStyleFamily( const SdPage* pPage ); private: - SfxStyleSheetBase* mpActualStyleSheet; - SdDrawDocument* mpDoc; - SdStyleFamilyRef mxGraphicFamily; - SdStyleFamilyRef mxCellFamily; - SdStyleFamilyMap maStyleFamilyMap; + SfxStyleSheetBase* mpActualStyleSheet; + SdDrawDocument* mpDoc; + SdStyleFamilyRef mxGraphicFamily; + SdStyleFamilyRef mxCellFamily; + SdStyleFamilyMap maStyleFamilyMap; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxTableFamily; - rtl::OUString msTableFamilyName; + rtl::OUString msTableFamilyName; }; -#endif // _SD_STLPOOL_HXX +#endif // _SD_STLPOOL_HXX diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index 138b06ae077d..57397ebd0257 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ class ModifyListenerForewarder; -typedef cppu::ImplInheritanceHelper5< SfxUnoStyleSheet, +typedef cppu::ImplInheritanceHelper5< SfxUnoStyleSheet, ::com::sun::star::beans::XPropertySet, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::beans::XPropertyState, @@ -62,14 +62,14 @@ public: SdStyleSheet( const rtl::OUString& rDisplayName, SfxStyleSheetBasePool& rPool, SfxStyleFamily eFamily, USHORT nMask ); SdStyleSheet( const SdStyleSheet& ); - virtual BOOL SetParent (const String& rParentName); + virtual BOOL SetParent (const String& rParentName); virtual SfxItemSet& GetItemSet(); - virtual BOOL IsUsed() const; - virtual BOOL HasFollowSupport() const; - virtual BOOL HasParentSupport() const; - virtual BOOL HasClearParentSupport() const; - virtual BOOL SetName( const UniString& ); - virtual void SetHelpId( const String& r, ULONG nId ); + virtual BOOL IsUsed() const; + virtual BOOL HasFollowSupport() const; + virtual BOOL HasParentSupport() const; + virtual BOOL HasClearParentSupport() const; + virtual BOOL SetName( const UniString& ); + virtual void SetHelpId( const String& r, ULONG nId ); void AdjustToFontHeight(SfxItemSet& rSet, BOOL bOnlyMissingItems = TRUE); @@ -134,13 +134,13 @@ protected: virtual void Store(SvStream& rOut); virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); - virtual ~SdStyleSheet(); + virtual ~SdStyleSheet(); void throwIfDisposed() throw (::com::sun::star::uno::RuntimeException); virtual void disposing(); - rtl::OUString msApiName; + rtl::OUString msApiName; rtl::Reference< SfxStyleSheetBasePool > mxPool; /** boradcast helper for events */ @@ -149,13 +149,13 @@ protected: boost::scoped_ptr< ModifyListenerForewarder > mpModifyListenerForewarder; private: - SdStyleSheet& operator=( const SdStyleSheet& ); // not implemented + SdStyleSheet& operator=( const SdStyleSheet& ); // not implemented }; typedef rtl::Reference< SdStyleSheet > SdStyleSheetRef; typedef std::vector< SdStyleSheetRef > SdStyleSheetVector; -#endif // _SD_STLSHEET_HXX +#endif // _SD_STLSHEET_HXX diff --git a/sd/inc/strmname.h b/sd/inc/strmname.h index 0d4823aeffce..ed555b8478ea 100644 --- a/sd/inc/strmname.h +++ b/sd/inc/strmname.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/inc/textapi.hxx b/sd/inc/textapi.hxx index 6fa186596fba..99186d46da7c 100755 --- a/sd/inc/textapi.hxx +++ b/sd/inc/textapi.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,13 +48,13 @@ class TextApiObject : public SvxUnoText public: static rtl::Reference< TextApiObject > create( SdDrawDocument* pDoc ); - virtual ~TextApiObject() throw(); - + virtual ~TextApiObject() throw(); + virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - + OutlinerParaObject* CreateText(); - void SetText( OutlinerParaObject& rText ); - String GetText(); + void SetText( OutlinerParaObject& rText ); + String GetText(); static TextApiObject* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& ); diff --git a/sd/inc/undo/undofactory.hxx b/sd/inc/undo/undofactory.hxx index 64f57b67cabd..ac39f8b699a8 100644 --- a/sd/inc/undo/undofactory.hxx +++ b/sd/inc/undo/undofactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,4 +47,4 @@ public: } -#endif // _SD_UNDOMANAGER_HXX +#endif // _SD_UNDOMANAGER_HXX diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx index b2e40c1e7442..871e48f94e85 100644 --- a/sd/inc/undo/undomanager.hxx +++ b/sd/inc/undo/undomanager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,15 +40,15 @@ public: UndoManager( USHORT nMaxUndoActionCount = 20 ); virtual void EnterListAction(const UniString &rComment, const UniString& rRepeatComment, USHORT nId=0); - virtual void LeaveListAction(); + virtual void LeaveListAction(); - virtual void AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg=FALSE ); + virtual void AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg=FALSE ); - bool isInListAction() const { return mnListLevel != 0; } - bool isInUndo() const { return maIsInUndoLock.isLocked(); } + bool isInListAction() const { return mnListLevel != 0; } + bool isInUndo() const { return maIsInUndoLock.isLocked(); } - virtual BOOL Undo( USHORT nCount=1 ); - virtual BOOL Redo( USHORT nCount=1 ); + virtual BOOL Undo( USHORT nCount=1 ); + virtual BOOL Redo( USHORT nCount=1 ); /** Set or reset the undo manager linked with the called undo manager. */ @@ -58,7 +58,7 @@ private: using SfxUndoManager::Undo; using SfxUndoManager::Redo; - int mnListLevel; + int mnListLevel; ScopeLock maIsInUndoLock; /** Used when the outline view is visible as a last resort to @@ -78,4 +78,4 @@ private: } -#endif // _SD_UNDOMANAGER_HXX +#endif // _SD_UNDOMANAGER_HXX diff --git a/sd/inc/undo/undoobjects.hxx b/sd/inc/undo/undoobjects.hxx index 78c922d8414e..5048d92923f4 100644 --- a/sd/inc/undo/undoobjects.hxx +++ b/sd/inc/undo/undoobjects.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,9 +52,9 @@ protected: virtual void Redo(); private: - SfxUndoAction* mpUndoUsercall; - SfxUndoAction* mpUndoAnimation; - SfxUndoAction* mpUndoPresObj; + SfxUndoAction* mpUndoUsercall; + SfxUndoAction* mpUndoAnimation; + SfxUndoAction* mpUndoPresObj; }; /////////////////////////////////////////////////////////////////////// @@ -112,7 +112,7 @@ public: private: SfxUndoAction* mpUndoAnimation; - bool mbNewEmptyPresObj; + bool mbNewEmptyPresObj; SdrObjectWeakRef mxSdrObject; }; @@ -128,8 +128,8 @@ public: virtual void Redo(); protected: - SdrObjUserCall* mpOldUserCall; - SdrObjUserCall* mpNewUserCall; + SdrObjUserCall* mpOldUserCall; + SdrObjUserCall* mpNewUserCall; SdrObjectWeakRef mxSdrObject; }; @@ -199,4 +199,4 @@ protected: } // namespace sd -#endif // _SD_UNDOOBJECTS_HXX +#endif // _SD_UNDOOBJECTS_HXX diff --git a/sd/inc/undoanim.hxx b/sd/inc/undoanim.hxx index 0d36a9ec01c9..8c173039b19f 100644 --- a/sd/inc/undoanim.hxx +++ b/sd/inc/undoanim.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ public: virtual String GetComment() const; private: - UndoAnimationImpl* mpImpl; + UndoAnimationImpl* mpImpl; }; struct UndoAnimationPathImpl; @@ -86,7 +86,7 @@ public: virtual String GetComment() const; private: - UndoTransitionImpl* mpImpl; + UndoTransitionImpl* mpImpl; }; } diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi index a261f7a7d14a..38115b852bb9 100644 --- a/sd/sdi/SlideSorterController.sdi +++ b/sd/sdi/SlideSorterController.sdi @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/sdi/ToolPanelViewShell.sdi b/sd/sdi/ToolPanelViewShell.sdi index a72342c52da5..c954a6312089 100644 --- a/sd/sdi/ToolPanelViewShell.sdi +++ b/sd/sdi/ToolPanelViewShell.sdi @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -177,26 +177,26 @@ SfxVoidItem TaskPaneEditMaster SID_TP_EDIT_MASTER SfxVoidItem TaskPaneInsertPage SID_INSERTPAGE_LAYOUT_MENU [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Synchron; Readonly = TRUE, - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_INSERT; ] diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi index 3602e711db1b..82eaced38258 100755 --- a/sd/sdi/ViewShellBase.sdi +++ b/sd/sdi/ViewShellBase.sdi @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/sdi/_docsh.sdi b/sd/sdi/_docsh.sdi index c63d20c0f5f6..cb534cf5cdc8 100644 --- a/sd/sdi/_docsh.sdi +++ b/sd/sdi/_docsh.sdi @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index 6d0d3ef33ce9..6b338c71fea2 100755 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -722,7 +722,7 @@ interface DrawView ExecMethod = FuPermanent ; StateMethod = GetMenuState ; ] - + SID_OBJECT_CROP // ole : no, status : play rec [ ExecMethod = FuPermanent ; @@ -2235,13 +2235,13 @@ interface DrawView ExecMethod = FuSupport ; StateMethod = GetMenuState ; ] - + SID_FORMATPAINTBRUSH // [ ExecMethod = FuPermanent ; StateMethod = GetMenuState ; ] - + SID_HEADER_AND_FOOTER // ole : no, status : ? [ ExecMethod = ExecCtrl ; @@ -2259,13 +2259,13 @@ interface DrawView ExecMethod = ExecCtrl ; StateMethod = GetMenuState ; ] - + SID_MASTER_LAYOUTS [ ExecMethod = ExecCtrl ; StateMethod = GetMenuState ; ] - + SID_OPT_LOCALE_CHANGED // ole : no, status : ? [ ExecMethod = ExecCtrl ; @@ -2316,7 +2316,7 @@ interface DrawView [ ExecMethod = FuTemporary ; StateMethod = GetMenuState ; - ] + ] SID_EXTRUSION_DIRECTION_FLOATER [ ExecMethod = FuTemporary ; @@ -2416,17 +2416,17 @@ interface DrawView [ ExecMethod = FuTemporary ; StateMethod = GetMenuState ; - ] + ] SID_DRAW_FONTWORK [ ExecMethod = FuTemporary ; StateMethod = GetMenuState ; - ] + ] SID_DRAW_FONTWORK_VERTICAL [ ExecMethod = FuTemporary ; StateMethod = GetMenuState ; - ] + ] SID_DRAWTBX_CS_BASIC [ ExecMethod = FuPermanent ; @@ -2461,7 +2461,7 @@ interface DrawView [ ExecMethod = FuPermanent ; StateMethod = GetMenuState ; - ] + ] SID_AVMEDIA_PLAYER // ole : yes, status : ? [ ExecMethod = FuTemporary ; diff --git a/sd/sdi/docshell.sdi b/sd/sdi/docshell.sdi index b69a5bc9c041..7817dee02fc6 100644 --- a/sd/sdi/docshell.sdi +++ b/sd/sdi/docshell.sdi @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/sdi/drtxtob.sdi b/sd/sdi/drtxtob.sdi index f4133f0f4643..a2d48deece88 100755 --- a/sd/sdi/drtxtob.sdi +++ b/sd/sdi/drtxtob.sdi @@ -74,63 +74,63 @@ shell TextObjectBar [ ExecMethod = Execute; StateMethod = GetAttrState; -// Cachable, AutoUpdate; +// Cachable, AutoUpdate; ] SID_ATTR_PARA_ADJUST_CENTER // ole : ?, status : ? [ ExecMethod = Execute; StateMethod = GetAttrState; -// Cachable, AutoUpdate; +// Cachable, AutoUpdate; ] SID_ATTR_PARA_ADJUST_RIGHT // ole : ?, status : ? [ ExecMethod = Execute; StateMethod = GetAttrState; -// Cachable, AutoUpdate; +// Cachable, AutoUpdate; ] SID_ATTR_PARA_ADJUST_BLOCK // ole : ?, status : ? [ ExecMethod = Execute; StateMethod = GetAttrState; -// Cachable, AutoUpdate; +// Cachable, AutoUpdate; ] SID_ATTR_PARA_LEFT_TO_RIGHT // ole : ?, status : ? [ ExecMethod = Execute; StateMethod = GetAttrState; -// Cachable, AutoUpdate; +// Cachable, AutoUpdate; ] SID_ATTR_PARA_RIGHT_TO_LEFT // ole : ?, status : ? [ ExecMethod = Execute; StateMethod = GetAttrState; -// Cachable, AutoUpdate; +// Cachable, AutoUpdate; ] SID_ATTR_PARA_LINESPACE_10 // ole : ?, status : ? [ ExecMethod = Execute; StateMethod = GetAttrState; -// Cachable, AutoUpdate; +// Cachable, AutoUpdate; ] SID_ATTR_PARA_LINESPACE_15 // ole : ?, status : ? [ ExecMethod = Execute; StateMethod = GetAttrState; -// Cachable, AutoUpdate; +// Cachable, AutoUpdate; ] SID_ATTR_PARA_LINESPACE_20 // ole : ?, status : ? [ ExecMethod = Execute; StateMethod = GetAttrState; -// Cachable, AutoUpdate; +// Cachable, AutoUpdate; ] SID_SET_SUPER_SCRIPT // ole : ?, status : ? @@ -208,5 +208,5 @@ shell TextObjectBar StateMethod = GetAttrState ; ] - + } diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi index 600bbdf19a06..c2465d5cc720 100644 --- a/sd/sdi/drviewsh.sdi +++ b/sd/sdi/drviewsh.sdi @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -211,12 +211,12 @@ interface ImpressEditView : DrawView [ ExecMethod = ExecuteAnnotation; StateMethod = GetAnnotationState; - ] + ] SID_DELETEALLBYAUTHOR_POSTIT [ ExecMethod = ExecuteAnnotation; StateMethod = GetAnnotationState; - ] + ] } shell DrawViewShell diff --git a/sd/sdi/grdocsh.sdi b/sd/sdi/grdocsh.sdi index d033c02b2824..865d6d83465e 100644 --- a/sd/sdi/grdocsh.sdi +++ b/sd/sdi/grdocsh.sdi @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/sdi/grviewsh.sdi b/sd/sdi/grviewsh.sdi index 7fd5b74cb7c0..cce326b1a97b 100644 --- a/sd/sdi/grviewsh.sdi +++ b/sd/sdi/grviewsh.sdi @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ shell GraphicViewShell [ ExecMethod = ExecuteAnnotation; StateMethod = GetAnnotationState; - ] + ] SID_DELETEALLBYAUTHOR_POSTIT [ ExecMethod = ExecuteAnnotation; diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi index 9639f1adc9dc..e4f3b2a6482f 100755 --- a/sd/sdi/outlnvsh.sdi +++ b/sd/sdi/outlnvsh.sdi @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ interface OutlineView [ ExecMethod = FuTemporary ; StateMethod = GetStatusBarState ; - ] + ] SID_ZOOM_OUT // ole : no, status : play rec [ ExecMethod = FuTemporary ; diff --git a/sd/sdi/sdgslots.sdi b/sd/sdi/sdgslots.sdi index e52bd8ea59e8..54634565d554 100644 --- a/sd/sdi/sdgslots.sdi +++ b/sd/sdi/sdgslots.sdi @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/sdi/sdnew.sdi b/sd/sdi/sdnew.sdi index 2c94a4d59786..9b5e9e32c94c 100644 --- a/sd/sdi/sdnew.sdi +++ b/sd/sdi/sdnew.sdi @@ -56,22 +56,22 @@ SvxObjectItem RulerObject SID_RULER_OBJECT SfxBoolItem OutputQualityContrast SID_OUTPUT_QUALITY_CONTRAST [ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, Asynchron; - Readonly = FALSE, - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + Readonly = FALSE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_VIEW; ] diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi index 0e91fb2c9134..e1d39e7a4199 100755 --- a/sd/sdi/sdraw.sdi +++ b/sd/sdi/sdraw.sdi @@ -2331,27 +2331,27 @@ SfxVoidItem SetFillColor SID_SETFILLCOLOR //#i80528#SfxBoolItem FillDraft SID_FILL_DRAFT //#i80528# //#i80528#[ -//#i80528# /* flags: */ -//#i80528# AutoUpdate = FALSE, -//#i80528# Cachable = Cachable, -//#i80528# FastCall = FALSE, -//#i80528# HasCoreId = FALSE, -//#i80528# HasDialog = FALSE, -//#i80528# ReadOnlyDoc = TRUE, -//#i80528# Toggle = FALSE, -//#i80528# Container = FALSE, -//#i80528# RecordAbsolute = FALSE, -//#i80528# RecordPerSet; -//#i80528# Synchron; +//#i80528# /* flags: */ +//#i80528# AutoUpdate = FALSE, +//#i80528# Cachable = Cachable, +//#i80528# FastCall = FALSE, +//#i80528# HasCoreId = FALSE, +//#i80528# HasDialog = FALSE, +//#i80528# ReadOnlyDoc = TRUE, +//#i80528# Toggle = FALSE, +//#i80528# Container = FALSE, +//#i80528# RecordAbsolute = FALSE, +//#i80528# RecordPerSet; +//#i80528# Synchron; //#i80528# -//#i80528# Readonly = FALSE, +//#i80528# Readonly = FALSE, //#i80528# -//#i80528# /* config: */ -//#i80528# AccelConfig = TRUE, -//#i80528# MenuConfig = TRUE, -//#i80528# StatusBarConfig = FALSE, -//#i80528# ToolBoxConfig = TRUE, -//#i80528# GroupId = GID_VIEW; +//#i80528# /* config: */ +//#i80528# AccelConfig = TRUE, +//#i80528# MenuConfig = TRUE, +//#i80528# StatusBarConfig = FALSE, +//#i80528# ToolBoxConfig = TRUE, +//#i80528# GroupId = GID_VIEW; //#i80528#] //-------------------------------------------------------------------------- @@ -2992,27 +2992,27 @@ SfxVoidItem GradientStartColor SID_SETGRADSTARTCOLOR //#i80528#SfxBoolItem GraphicDraft SID_GRAPHIC_DRAFT //#i80528# //#i80528#[ -//#i80528# /* flags: */ -//#i80528# AutoUpdate = FALSE, -//#i80528# Cachable = Cachable, -//#i80528# FastCall = FALSE, -//#i80528# HasCoreId = FALSE, -//#i80528# HasDialog = FALSE, -//#i80528# ReadOnlyDoc = TRUE, -//#i80528# Toggle = FALSE, -//#i80528# Container = FALSE, -//#i80528# RecordAbsolute = FALSE, -//#i80528# RecordPerSet; -//#i80528# Synchron; +//#i80528# /* flags: */ +//#i80528# AutoUpdate = FALSE, +//#i80528# Cachable = Cachable, +//#i80528# FastCall = FALSE, +//#i80528# HasCoreId = FALSE, +//#i80528# HasDialog = FALSE, +//#i80528# ReadOnlyDoc = TRUE, +//#i80528# Toggle = FALSE, +//#i80528# Container = FALSE, +//#i80528# RecordAbsolute = FALSE, +//#i80528# RecordPerSet; +//#i80528# Synchron; //#i80528# -//#i80528# Readonly = FALSE, +//#i80528# Readonly = FALSE, //#i80528# -//#i80528# /* config: */ -//#i80528# AccelConfig = TRUE, -//#i80528# MenuConfig = TRUE, -//#i80528# StatusBarConfig = FALSE, -//#i80528# ToolBoxConfig = TRUE, -//#i80528# GroupId = GID_VIEW; +//#i80528# /* config: */ +//#i80528# AccelConfig = TRUE, +//#i80528# MenuConfig = TRUE, +//#i80528# StatusBarConfig = FALSE, +//#i80528# ToolBoxConfig = TRUE, +//#i80528# GroupId = GID_VIEW; //#i80528#] //-------------------------------------------------------------------------- @@ -4034,27 +4034,27 @@ SfxVoidItem LineColor SID_SETLINECOLOR //#i80528#SfxBoolItem LineDraft SID_LINE_DRAFT //#i80528# //#i80528#[ -//#i80528# /* flags: */ -//#i80528# AutoUpdate = FALSE, -//#i80528# Cachable = Cachable, -//#i80528# FastCall = FALSE, -//#i80528# HasCoreId = FALSE, -//#i80528# HasDialog = FALSE, -//#i80528# ReadOnlyDoc = TRUE, -//#i80528# Toggle = FALSE, -//#i80528# Container = FALSE, -//#i80528# RecordAbsolute = FALSE, -//#i80528# RecordPerSet; -//#i80528# Synchron; +//#i80528# /* flags: */ +//#i80528# AutoUpdate = FALSE, +//#i80528# Cachable = Cachable, +//#i80528# FastCall = FALSE, +//#i80528# HasCoreId = FALSE, +//#i80528# HasDialog = FALSE, +//#i80528# ReadOnlyDoc = TRUE, +//#i80528# Toggle = FALSE, +//#i80528# Container = FALSE, +//#i80528# RecordAbsolute = FALSE, +//#i80528# RecordPerSet; +//#i80528# Synchron; //#i80528# -//#i80528# Readonly = FALSE, +//#i80528# Readonly = FALSE, //#i80528# -//#i80528# /* config: */ -//#i80528# AccelConfig = TRUE, -//#i80528# MenuConfig = TRUE, -//#i80528# StatusBarConfig = FALSE, -//#i80528# ToolBoxConfig = TRUE, -//#i80528# GroupId = GID_VIEW; +//#i80528# /* config: */ +//#i80528# AccelConfig = TRUE, +//#i80528# MenuConfig = TRUE, +//#i80528# StatusBarConfig = FALSE, +//#i80528# ToolBoxConfig = TRUE, +//#i80528# GroupId = GID_VIEW; //#i80528#] //-------------------------------------------------------------------------- @@ -6300,27 +6300,27 @@ SfxVoidItem TextAttributes SID_TEXTATTR_DLG //#i80528#SfxBoolItem TextDraft SID_TEXT_DRAFT //#i80528# //#i80528#[ -//#i80528# /* flags: */ -//#i80528# AutoUpdate = FALSE, -//#i80528# Cachable = Cachable, -//#i80528# FastCall = FALSE, -//#i80528# HasCoreId = FALSE, -//#i80528# HasDialog = FALSE, -//#i80528# ReadOnlyDoc = TRUE, -//#i80528# Toggle = FALSE, -//#i80528# Container = FALSE, -//#i80528# RecordAbsolute = FALSE, -//#i80528# RecordPerSet; -//#i80528# Synchron; +//#i80528# /* flags: */ +//#i80528# AutoUpdate = FALSE, +//#i80528# Cachable = Cachable, +//#i80528# FastCall = FALSE, +//#i80528# HasCoreId = FALSE, +//#i80528# HasDialog = FALSE, +//#i80528# ReadOnlyDoc = TRUE, +//#i80528# Toggle = FALSE, +//#i80528# Container = FALSE, +//#i80528# RecordAbsolute = FALSE, +//#i80528# RecordPerSet; +//#i80528# Synchron; //#i80528# -//#i80528# Readonly = FALSE, +//#i80528# Readonly = FALSE, //#i80528# -//#i80528# /* config: */ -//#i80528# AccelConfig = TRUE, -//#i80528# MenuConfig = TRUE, -//#i80528# StatusBarConfig = FALSE, -//#i80528# ToolBoxConfig = TRUE, -//#i80528# GroupId = GID_VIEW; +//#i80528# /* config: */ +//#i80528# AccelConfig = TRUE, +//#i80528# MenuConfig = TRUE, +//#i80528# StatusBarConfig = FALSE, +//#i80528# ToolBoxConfig = TRUE, +//#i80528# GroupId = GID_VIEW; //#i80528#] //-------------------------------------------------------------------------- diff --git a/sd/sdi/sdslots.hrc b/sd/sdi/sdslots.hrc index 472f794be479..5001e9fce283 100644 --- a/sd/sdi/sdslots.hrc +++ b/sd/sdi/sdslots.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/sdi/sdslots.sdi b/sd/sdi/sdslots.sdi index fbfc8da1903b..10c07bbffc78 100755 --- a/sd/sdi/sdslots.sdi +++ b/sd/sdi/sdslots.sdi @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -103,6 +103,6 @@ ModulePrefix( "Sd" ) include "SlideSorterController.sdi" include "ViewShellBase.sdi" include "mediaob.sdi" - include "tables.sdi" + include "tables.sdi" include "ToolPanelViewShell.sdi" } diff --git a/sd/sdi/tables.sdi b/sd/sdi/tables.sdi index 8126df09b75a..9dc9f5951410 100644 --- a/sd/sdi/tables.sdi +++ b/sd/sdi/tables.sdi @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ shell TableObjectBar [ ExecMethod = Execute ; StateMethod = GetState ; - ] + ] SID_FRAME_LINESTYLE [ ExecMethod = Execute; @@ -42,7 +42,7 @@ shell TableObjectBar ExecMethod = Execute; StateMethod = GetAttrState; ] - SID_ATTR_BORDER + SID_ATTR_BORDER [ ExecMethod = Execute; StateMethod = GetAttrState; diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx index a6a925ab63d2..002cca85c45a 100644 --- a/sd/source/core/CustomAnimationCloner.cxx +++ b/sd/source/core/CustomAnimationCloner.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 33b9c233909b..b2b3b6320cad 100755 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -112,7 +112,7 @@ using ::com::sun::star::util::XChangesNotifier; using ::com::sun::star::util::XChangesListener; namespace sd -{ +{ class MainSequenceChangeGuard { public: @@ -142,7 +142,7 @@ private: }; CustomAnimationEffect::CustomAnimationEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) -: mnNodeType(-1), +: mnNodeType(-1), mnPresetClass(-1), mfBegin(-1.0), mfDuration(-1.0), @@ -359,7 +359,7 @@ sal_Int32 CustomAnimationEffect::getNumberOfSubitems( const Any& aTarget, sal_In } else { - sal_Int32 nDone; + sal_Int32 nDone; for( nPos = 0; nPos < nEndPos; nPos++ ) { nPos = xBI->nextCharacters(aText, nPos, aLocale, i18n::CharacterIteratorMode::SKIPCELL, 0, nDone); @@ -645,7 +645,7 @@ bool CustomAnimationEffect::calculateIterateDuration() } } - // if we also animate the form first, we have to add the + // if we also animate the form first, we have to add the // sub effect duration to the whole effect duration if( mnTargetSubItem == ShapeAnimationSubType::AS_WHOLE ) fDuration += fSubEffectDuration; @@ -698,7 +698,7 @@ void CustomAnimationEffect::setTarget( const ::com::sun::star::uno::Any& rTarget Reference< XCommand > xCommand( aElem, UNO_QUERY ); if( xCommand.is() ) xCommand->setTarget( rTarget ); - } + } } } } @@ -758,7 +758,7 @@ void CustomAnimationEffect::setDuration( double fDuration ) double fScale = fDuration / mfDuration; mfDuration = fDuration; mfAbsoluteDuration = mfDuration; - + // calculate effect duration and get target shape Reference< XEnumerationAccess > xEnumerationAccess( mxNode, UNO_QUERY ); if( xEnumerationAccess.is() ) @@ -913,7 +913,7 @@ Reference< XShape > CustomAnimationEffect::getTargetShape() const // -------------------------------------------------------------------- -Any CustomAnimationEffect::getRepeatCount() const +Any CustomAnimationEffect::getRepeatCount() const { if( mxNode.is() ) { @@ -928,7 +928,7 @@ Any CustomAnimationEffect::getRepeatCount() const // -------------------------------------------------------------------- -Any CustomAnimationEffect::getEnd() const +Any CustomAnimationEffect::getEnd() const { if( mxNode.is() ) { @@ -983,9 +983,9 @@ Reference< XAnimationNode > CustomAnimationEffect::createAfterEffectNode() const Reference< XMultiServiceFactory > xMsf( ::comphelper::getProcessServiceFactory() ); - const char* pServiceName = maDimColor.hasValue() ? + const char* pServiceName = maDimColor.hasValue() ? "com.sun.star.animations.AnimateColor" : "com.sun.star.animations.AnimateSet"; - + Reference< XAnimate > xAnimate( xMsf->createInstance(OUString::createFromAscii(pServiceName) ), UNO_QUERY_THROW ); Any aTo; @@ -1006,7 +1006,7 @@ Reference< XAnimationNode > CustomAnimationEffect::createAfterEffectNode() const if( !mbAfterEffectOnNextEffect ) // sameClick { Event aEvent; - + aEvent.Source <<= getNode(); aEvent.Trigger = EventTrigger::END_EVENT; aEvent.Repeat = 0; @@ -1043,7 +1043,7 @@ void CustomAnimationEffect::setIterateType( sal_Int16 nIterateType ) Reference< XMultiServiceFactory > xMsf( ::comphelper::getProcessServiceFactory() ); const char * pServiceName = nIterateType ? "com.sun.star.animations.IterateContainer" : "com.sun.star.animations.ParallelTimeContainer"; - Reference< XTimeContainer > xNewContainer( + Reference< XTimeContainer > xNewContainer( xMsf->createInstance( OUString::createFromAscii(pServiceName) ), UNO_QUERY_THROW ); Reference< XTimeContainer > xOldContainer( mxNode, UNO_QUERY_THROW ); @@ -1141,7 +1141,7 @@ void CustomAnimationEffect::setIterateInterval( double fIterateInterval ) // -------------------------------------------------------------------- -::rtl::OUString CustomAnimationEffect::getPath() const +::rtl::OUString CustomAnimationEffect::getPath() const { ::rtl::OUString aPath; @@ -1228,7 +1228,7 @@ Any CustomAnimationEffect::getProperty( sal_Int32 nNodeType, const OUString& rAt { Sequence<Any> aValues( xAnimate->getValues() ); if( aValues.hasElements() ) - aProperty = aValues[ eValue == VALUE_FIRST ? 0 : aValues.getLength() - 1 ]; + aProperty = aValues[ eValue == VALUE_FIRST ? 0 : aValues.getLength() - 1 ]; } break; } @@ -1275,7 +1275,7 @@ bool CustomAnimationEffect::setProperty( sal_Int32 nNodeType, const OUString& rA case VALUE_FROM: if( xAnimate->getFrom() != rValue ) { - xAnimate->setFrom( rValue ); + xAnimate->setFrom( rValue ); bChanged = true; } break; @@ -1284,9 +1284,9 @@ bool CustomAnimationEffect::setProperty( sal_Int32 nNodeType, const OUString& rA { xAnimate->setTo( rValue ); bChanged = true; - } + } break; - case VALUE_BY: + case VALUE_BY: if( xAnimate->getTo() != rValue ) { xAnimate->setBy( rValue ); @@ -1304,7 +1304,7 @@ bool CustomAnimationEffect::setProperty( sal_Int32 nNodeType, const OUString& rA if( aValues[ nIndex ] != rValue ) { - aValues[ nIndex ] = rValue; + aValues[ nIndex ] = rValue; xAnimate->setValues( aValues ); bChanged = true; } @@ -1425,7 +1425,7 @@ void CustomAnimationEffect::setColor( sal_Int32 nIndex, const Any& rColor ) xAnimate->setTo(rColor); } break; - + } } } @@ -1469,7 +1469,7 @@ Any CustomAnimationEffect::getTransformationProperty( sal_Int32 nTransformType, { Sequence<Any> aValues( xTransform->getValues() ); if( aValues.hasElements() ) - aProperty = aValues[ eValue == VALUE_FIRST ? 0 : aValues.getLength() - 1 ]; + aProperty = aValues[ eValue == VALUE_FIRST ? 0 : aValues.getLength() - 1 ]; } break; } @@ -1513,7 +1513,7 @@ bool CustomAnimationEffect::setTransformationProperty( sal_Int32 nTransformType, case VALUE_FROM: if( xTransform->getFrom() != rValue ) { - xTransform->setFrom( rValue ); + xTransform->setFrom( rValue ); bChanged = true; } break; @@ -1836,7 +1836,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPres } p++; } - + if( bFilter ) { aUserData = ::comphelper::containerToSequence< NamedValue, std::vector< NamedValue > >( aNewUserData ); @@ -1847,9 +1847,9 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPres Any aTarget( rTarget ); sal_Int16 nSubItem = ShapeAnimationSubType::AS_WHOLE; - if( aTarget.getValueType() == ::getCppuType((const ParagraphTarget*)0) ) + if( aTarget.getValueType() == ::getCppuType((const ParagraphTarget*)0) ) { - nSubItem = ShapeAnimationSubType::ONLY_TEXT; + nSubItem = ShapeAnimationSubType::ONLY_TEXT; } else if( pPreset->isTextOnly() ) { @@ -1859,7 +1859,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPres { // thats bad, we target a shape here but the effect is only for text // so change subitem - nSubItem = ShapeAnimationSubType::ONLY_TEXT; + nSubItem = ShapeAnimationSubType::ONLY_TEXT; } } @@ -1870,7 +1870,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPres pEffect->setTargetSubItem( nSubItem ); if( fDuration != -1.0 ) pEffect->setDuration( fDuration ); - + maEffects.push_back(pEffect); rebuild(); @@ -1902,8 +1902,8 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const SdrPathObj& rPathOb sal_Int16 nSubItem = ShapeAnimationSubType::AS_WHOLE; - if( rTarget.getValueType() == ::getCppuType((const ParagraphTarget*)0) ) - nSubItem = ShapeAnimationSubType::ONLY_TEXT; + if( rTarget.getValueType() == ::getCppuType((const ParagraphTarget*)0) ) + nSubItem = ShapeAnimationSubType::ONLY_TEXT; Reference< XAnimationNode > xEffectNode( xEffectContainer, UNO_QUERY_THROW ); pEffect.reset( new CustomAnimationEffect( xEffectNode ) ); @@ -1919,7 +1919,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const SdrPathObj& rPathOb pEffect->updatePathFromSdrPathObj( rPathObj ); if( fDuration != -1.0 ) pEffect->setDuration( fDuration ); - + maEffects.push_back(pEffect); rebuild(); @@ -2038,7 +2038,7 @@ void EffectSequenceHelper::implRebuild() Any aBegin( makeAny( aEvent ) ); if( bFirst ) { - // if the first node is not a click action, this click container + // if the first node is not a click action, this click container // must not have INDEFINITE begin but start at 0s bFirst = false; if( pEffect->getNodeType() != EffectNodeType::ON_CLICK ) @@ -2189,8 +2189,8 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode) Reference< XTimeContainer > xClickContainer( xContainer->getParent(), UNO_QUERY_THROW ); Reference< XTimeContainer > xSequenceContainer( xClickContainer->getParent(), UNO_QUERY_THROW ); - Reference< XTimeContainer > xNextContainer; - + Reference< XTimeContainer > xNextContainer; + // first try if we have an after effect container if( !implFindNextContainer( xClickContainer, xContainer, xNextContainer ) ) { @@ -2215,7 +2215,7 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode) { Reference< XAnimationNode > xNode( xNextContainer, UNO_QUERY_THROW ); xNode->setBegin( makeAny( (double)0.0 ) ); -// xNode->setFill( AnimationFill::HOLD ); +// xNode->setFill( AnimationFill::HOLD ); xNextClickContainer->appendChild( xNode ); } } @@ -2246,7 +2246,7 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode) { Reference< XAnimationNode > xNode( xNextContainer, UNO_QUERY_THROW ); xNode->setBegin( makeAny( (double)0.0 ) ); -// xNode->setFill( AnimationFill::HOLD ); +// xNode->setFill( AnimationFill::HOLD ); xNewClickContainer->appendChild( xNode ); } } @@ -2457,7 +2457,7 @@ void EffectSequenceHelper::disposeTextRange( const com::sun::star::uno::Any& aTa // -------------------------------------------------------------------- CustomAnimationTextGroup::CustomAnimationTextGroup( const Reference< XShape >& rTarget, sal_Int32 nGroupId ) -: maTarget( rTarget ), +: maTarget( rTarget ), mnGroupId( nGroupId ) { reset(); @@ -2494,7 +2494,7 @@ void CustomAnimationTextGroup::addEffect( CustomAnimationEffectPtr& pEffect ) if( mnLastPara != -1 ) mbTextReverse = mnLastPara > aParaTarget.Paragraph; - + mnLastPara = aParaTarget.Paragraph; const sal_Int32 nParaDepth = pEffect->getParaDepth(); @@ -2580,7 +2580,7 @@ void EffectSequenceHelper::updateTextGroups() // -------------------------------------------------------------------- -CustomAnimationTextGroupPtr EffectSequenceHelper::createTextGroup( CustomAnimationEffectPtr pEffect, sal_Int32 nTextGrouping, double fTextGroupingAuto, sal_Bool bAnimateForm, sal_Bool bTextReverse ) +CustomAnimationTextGroupPtr EffectSequenceHelper::createTextGroup( CustomAnimationEffectPtr pEffect, sal_Int32 nTextGrouping, double fTextGroupingAuto, sal_Bool bAnimateForm, sal_Bool bTextReverse ) { // first finde a free group-id sal_Int32 nGroupId = 0; @@ -2602,7 +2602,7 @@ CustomAnimationTextGroupPtr EffectSequenceHelper::createTextGroup( CustomAnimati Reference< XShape > xTarget( pEffect->getTargetShape() ); - CustomAnimationTextGroupPtr pTextGroup( new CustomAnimationTextGroup( xTarget, nGroupId ) ); + CustomAnimationTextGroupPtr pTextGroup( new CustomAnimationTextGroup( xTarget, nGroupId ) ); maGroupMap[nGroupId] = pTextGroup; bool bUsed = false; @@ -2611,7 +2611,7 @@ CustomAnimationTextGroupPtr EffectSequenceHelper::createTextGroup( CustomAnimati if( (nTextGrouping == 0) || bAnimateForm ) { sal_Int16 nSubItem; - if( nTextGrouping == 0) + if( nTextGrouping == 0) nSubItem = bAnimateForm ? ShapeAnimationSubType::AS_WHOLE : ShapeAnimationSubType::ONLY_TEXT; else nSubItem = ShapeAnimationSubType::ONLY_BACKGROUND; @@ -2667,7 +2667,7 @@ void EffectSequenceHelper::createTextGroupParagraphEffects( CustomAnimationTextG { if( bTextReverse ) // sort them aParaList.push_front( nPara ); - else + else aParaList.push_back( nPara ); } } @@ -2836,7 +2836,7 @@ void EffectSequenceHelper::setAnimateForm( CustomAnimationTextGroupPtr pTextGrou if( bAnimateForm ) { EffectSequence::iterator aInsertIter( find( (*aIter) ) ); - + CustomAnimationEffectPtr pEffect; if( (aEffects.size() == 1) && ((*aIter)->getTarget().getValueType() != ::getCppuType((const ParagraphTarget*)0) ) ) { @@ -2855,7 +2855,7 @@ void EffectSequenceHelper::setAnimateForm( CustomAnimationTextGroupPtr pTextGrou pTextGroup->addEffect( pEffect ); } - + if( !bAnimateForm && (aEffects.size() == 1) ) { CustomAnimationEffectPtr pEffect( (*aIter) ); @@ -3188,7 +3188,7 @@ void EffectSequenceHelper::processAfterEffect( const Reference< XAnimationNode > { (void)e; DBG_ERROR( "sd::EffectSequenceHelper::processAfterEffect(), exception cought!" ); - } + } } /* @@ -3196,7 +3196,7 @@ double EffectSequenceHelper::calculateIterateNodeDuration( { Reference< i18n::XBreakIterator > xBI( ImplGetBreakIterator() ); - sal_Int32 nDone; + sal_Int32 nDone; sal_Int32 nNextCellBreak( xBI->nextCharacters(rTxt, nIdx, rLocale, i18n::CharacterIteratorMode::SKIPCELL, 0, nDone) ); i18n::Boundary nNextWordBoundary( xBI->getWordBoundary(rTxt, nIdx, rLocale, i18n::WordType::ANY_WORD, sal_True) ); sal_Int32 nNextSentenceBreak( xBI->endOfSentence(rTxt, nIdx, rLocale) ); @@ -3495,7 +3495,7 @@ CustomAnimationEffectPtr MainSequence::getEffectFromOffset( sal_Int32 nOffset ) { if( nOffset < getCount() ) return EffectSequenceHelper::getEffectFromOffset( nOffset ); - + nOffset -= getCount(); InteractiveSequenceList::const_iterator aIter( maInteractiveSequenceList.begin() ); @@ -3526,7 +3526,7 @@ bool MainSequence::disposeShape( const Reference< XShape >& xShape ) bChanges = true; } else - { + { bChanges |= (*aIter++)->disposeShape( xShape ); } } diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index fb02f01480e7..f2a5375c1ec5 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -264,7 +264,7 @@ Reference< XAnimationNode > implImportEffects( const Reference< XMultiServiceFac try { // create stream - SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( rPath, STREAM_READ ); + SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( rPath, STREAM_READ ); Reference<XInputStream> xInputStream( new utl::OInputStreamWrapper( pIStm, sal_True ) ); // prepare ParserInputSrouce @@ -632,10 +632,10 @@ Reference< XAnimationNode > CustomAnimationPresets::getRandomPreset( sal_Int16 n const PresetCategoryList* pCategoryList = 0; switch( nPresetClass ) { - case EffectPresetClass::ENTRANCE: pCategoryList = &maEntrancePresets; break; - case EffectPresetClass::EXIT: pCategoryList = &maExitPresets; break; - case EffectPresetClass::EMPHASIS: pCategoryList = &maEmphasisPresets; break; - case EffectPresetClass::MOTIONPATH: pCategoryList = &maMotionPathsPresets; break; + case EffectPresetClass::ENTRANCE: pCategoryList = &maEntrancePresets; break; + case EffectPresetClass::EXIT: pCategoryList = &maExitPresets; break; + case EffectPresetClass::EMPHASIS: pCategoryList = &maEmphasisPresets; break; + case EffectPresetClass::MOTIONPATH: pCategoryList = &maMotionPathsPresets; break; default: pCategoryList = 0; } diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx index cbb9a1019baf..04ecd4c3109c 100644 --- a/sd/source/core/EffectMigration.cxx +++ b/sd/source/core/EffectMigration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,105 +51,105 @@ using ::rtl::OUString; struct deprecated_FadeEffect_conversion_table_entry { - FadeEffect meFadeEffect; + FadeEffect meFadeEffect; const sal_Char* mpPresetId; } deprecated_FadeEffect_conversion_table[] = { // OOo 1.x transitions - { FadeEffect_FADE_FROM_LEFT, "wipe-right" }, - { FadeEffect_FADE_FROM_TOP, "wipe-down" }, - { FadeEffect_FADE_FROM_RIGHT, "wipe-left" }, - { FadeEffect_FADE_FROM_BOTTOM, "wipe-up" }, - - { FadeEffect_CLOCKWISE, "wheel-clockwise-1-spoke" }, - - { FadeEffect_UNCOVER_TO_LEFT, "uncover-left" }, - { FadeEffect_UNCOVER_TO_UPPERLEFT, "uncover-left-up" }, - { FadeEffect_UNCOVER_TO_TOP, "uncover-up" }, - { FadeEffect_UNCOVER_TO_UPPERRIGHT, "uncover-right-up" }, - { FadeEffect_UNCOVER_TO_RIGHT, "uncover-right" }, - { FadeEffect_UNCOVER_TO_LOWERRIGHT, "uncover-right-down" }, - { FadeEffect_UNCOVER_TO_BOTTOM, "uncover-down" }, - { FadeEffect_UNCOVER_TO_LOWERLEFT, "uncover-left-down" }, - - { FadeEffect_VERTICAL_LINES, "random-bars-vertical" }, - { FadeEffect_HORIZONTAL_LINES, "random-bars-horizontal" }, - - { FadeEffect_VERTICAL_CHECKERBOARD, "checkerboard-down" }, - { FadeEffect_HORIZONTAL_CHECKERBOARD, "checkerboard-across" }, - - { FadeEffect_FADE_TO_CENTER, "box-in" }, - { FadeEffect_FADE_FROM_CENTER, "box-out" }, - - { FadeEffect_VERTICAL_STRIPES, "venetian-blinds-vertical" }, - { FadeEffect_HORIZONTAL_STRIPES, "venetian-blinds-horizontal" }, - - { FadeEffect_MOVE_FROM_LEFT, "cover-right" }, - { FadeEffect_MOVE_FROM_TOP, "cover-down" }, - { FadeEffect_MOVE_FROM_RIGHT, "cover-left" }, - { FadeEffect_MOVE_FROM_BOTTOM, "cover-up" }, - { FadeEffect_MOVE_FROM_UPPERLEFT, "cover-right-down" }, - { FadeEffect_MOVE_FROM_UPPERRIGHT, "cover-left-down" }, - { FadeEffect_MOVE_FROM_LOWERRIGHT, "cover-left-up" }, - { FadeEffect_MOVE_FROM_LOWERLEFT, "cover-right-up" }, - - { FadeEffect_DISSOLVE, "dissolve" }, - - { FadeEffect_RANDOM, "random-transition" }, - - { FadeEffect_ROLL_FROM_LEFT, "push-right" }, - { FadeEffect_ROLL_FROM_TOP, "push-down" }, - { FadeEffect_ROLL_FROM_RIGHT, "push-left" }, - { FadeEffect_ROLL_FROM_BOTTOM, "push-up" }, - - { FadeEffect_CLOSE_VERTICAL, "split-horizontal-in" }, - { FadeEffect_CLOSE_HORIZONTAL, "split-vertical-in" }, - { FadeEffect_OPEN_VERTICAL, "split-horizontal-out" }, - { FadeEffect_OPEN_HORIZONTAL, "split-vertical-out" }, - - { FadeEffect_FADE_FROM_UPPERLEFT, "diagonal-squares-right-down" }, - { FadeEffect_FADE_FROM_UPPERRIGHT, "diagonal-squares-left-down" }, - { FadeEffect_FADE_FROM_LOWERLEFT, "diagonal-squares-right-up" }, - { FadeEffect_FADE_FROM_LOWERRIGHT, "diagonal-squares-left-up" }, + { FadeEffect_FADE_FROM_LEFT, "wipe-right" }, + { FadeEffect_FADE_FROM_TOP, "wipe-down" }, + { FadeEffect_FADE_FROM_RIGHT, "wipe-left" }, + { FadeEffect_FADE_FROM_BOTTOM, "wipe-up" }, + + { FadeEffect_CLOCKWISE, "wheel-clockwise-1-spoke" }, + + { FadeEffect_UNCOVER_TO_LEFT, "uncover-left" }, + { FadeEffect_UNCOVER_TO_UPPERLEFT, "uncover-left-up" }, + { FadeEffect_UNCOVER_TO_TOP, "uncover-up" }, + { FadeEffect_UNCOVER_TO_UPPERRIGHT, "uncover-right-up" }, + { FadeEffect_UNCOVER_TO_RIGHT, "uncover-right" }, + { FadeEffect_UNCOVER_TO_LOWERRIGHT, "uncover-right-down" }, + { FadeEffect_UNCOVER_TO_BOTTOM, "uncover-down" }, + { FadeEffect_UNCOVER_TO_LOWERLEFT, "uncover-left-down" }, + + { FadeEffect_VERTICAL_LINES, "random-bars-vertical" }, + { FadeEffect_HORIZONTAL_LINES, "random-bars-horizontal" }, + + { FadeEffect_VERTICAL_CHECKERBOARD, "checkerboard-down" }, + { FadeEffect_HORIZONTAL_CHECKERBOARD, "checkerboard-across" }, + + { FadeEffect_FADE_TO_CENTER, "box-in" }, + { FadeEffect_FADE_FROM_CENTER, "box-out" }, + + { FadeEffect_VERTICAL_STRIPES, "venetian-blinds-vertical" }, + { FadeEffect_HORIZONTAL_STRIPES, "venetian-blinds-horizontal" }, + + { FadeEffect_MOVE_FROM_LEFT, "cover-right" }, + { FadeEffect_MOVE_FROM_TOP, "cover-down" }, + { FadeEffect_MOVE_FROM_RIGHT, "cover-left" }, + { FadeEffect_MOVE_FROM_BOTTOM, "cover-up" }, + { FadeEffect_MOVE_FROM_UPPERLEFT, "cover-right-down" }, + { FadeEffect_MOVE_FROM_UPPERRIGHT, "cover-left-down" }, + { FadeEffect_MOVE_FROM_LOWERRIGHT, "cover-left-up" }, + { FadeEffect_MOVE_FROM_LOWERLEFT, "cover-right-up" }, + + { FadeEffect_DISSOLVE, "dissolve" }, + + { FadeEffect_RANDOM, "random-transition" }, + + { FadeEffect_ROLL_FROM_LEFT, "push-right" }, + { FadeEffect_ROLL_FROM_TOP, "push-down" }, + { FadeEffect_ROLL_FROM_RIGHT, "push-left" }, + { FadeEffect_ROLL_FROM_BOTTOM, "push-up" }, + + { FadeEffect_CLOSE_VERTICAL, "split-horizontal-in" }, + { FadeEffect_CLOSE_HORIZONTAL, "split-vertical-in" }, + { FadeEffect_OPEN_VERTICAL, "split-horizontal-out" }, + { FadeEffect_OPEN_HORIZONTAL, "split-vertical-out" }, + + { FadeEffect_FADE_FROM_UPPERLEFT, "diagonal-squares-right-down" }, + { FadeEffect_FADE_FROM_UPPERRIGHT, "diagonal-squares-left-down" }, + { FadeEffect_FADE_FROM_LOWERLEFT, "diagonal-squares-right-up" }, + { FadeEffect_FADE_FROM_LOWERRIGHT, "diagonal-squares-left-up" }, // OOo 1.x transitions not in OOo 2.x - { FadeEffect_CLOCKWISE, "clock-wipe-twelve" }, - { FadeEffect_COUNTERCLOCKWISE, "reverse-clock-wipe-twelve" }, - { FadeEffect_SPIRALIN_LEFT, "spiral-wipe-top-left-clockwise" }, - { FadeEffect_SPIRALIN_RIGHT, "spiral-wipe-top-right-counter-clockwise" }, - { FadeEffect_SPIRALOUT_LEFT, "spiral-wipe-out-to-bottom-right-clockwise" }, - { FadeEffect_SPIRALOUT_RIGHT, "spiral-wipe-out-to-bottom-left-counter-clockwise" }, - { FadeEffect_WAVYLINE_FROM_LEFT, "snake-wipe-top-left-vertical" }, - { FadeEffect_WAVYLINE_FROM_TOP, "snake-wipe-top-left-horizontal" }, - { FadeEffect_WAVYLINE_FROM_RIGHT, "snake-wipe-bottom-right-vertical" }, - { FadeEffect_WAVYLINE_FROM_BOTTOM, "snake-wipe-bottom-right-horizontal" }, - { FadeEffect_STRETCH_FROM_LEFT, "wipe-right" }, // todo - { FadeEffect_STRETCH_FROM_TOP, "wipe-down" }, // todo - { FadeEffect_STRETCH_FROM_RIGHT, "wipe-left" }, // todo - { FadeEffect_STRETCH_FROM_BOTTOM, "wipe-up" }, // todo + { FadeEffect_CLOCKWISE, "clock-wipe-twelve" }, + { FadeEffect_COUNTERCLOCKWISE, "reverse-clock-wipe-twelve" }, + { FadeEffect_SPIRALIN_LEFT, "spiral-wipe-top-left-clockwise" }, + { FadeEffect_SPIRALIN_RIGHT, "spiral-wipe-top-right-counter-clockwise" }, + { FadeEffect_SPIRALOUT_LEFT, "spiral-wipe-out-to-bottom-right-clockwise" }, + { FadeEffect_SPIRALOUT_RIGHT, "spiral-wipe-out-to-bottom-left-counter-clockwise" }, + { FadeEffect_WAVYLINE_FROM_LEFT, "snake-wipe-top-left-vertical" }, + { FadeEffect_WAVYLINE_FROM_TOP, "snake-wipe-top-left-horizontal" }, + { FadeEffect_WAVYLINE_FROM_RIGHT, "snake-wipe-bottom-right-vertical" }, + { FadeEffect_WAVYLINE_FROM_BOTTOM, "snake-wipe-bottom-right-horizontal" }, + { FadeEffect_STRETCH_FROM_LEFT, "wipe-right" }, // todo + { FadeEffect_STRETCH_FROM_TOP, "wipe-down" }, // todo + { FadeEffect_STRETCH_FROM_RIGHT, "wipe-left" }, // todo + { FadeEffect_STRETCH_FROM_BOTTOM, "wipe-up" }, // todo // OOo 1.x not available transitions - { FadeEffect_CLOCKWISE, "wheel-clockwise-2-spokes" }, - { FadeEffect_CLOCKWISE, "wheel-clockwise-3-spokes" }, - { FadeEffect_CLOCKWISE, "wheel-clockwise-4-spokes" }, - { FadeEffect_CLOCKWISE, "wheel-clockwise-8-spokes" }, + { FadeEffect_CLOCKWISE, "wheel-clockwise-2-spokes" }, + { FadeEffect_CLOCKWISE, "wheel-clockwise-3-spokes" }, + { FadeEffect_CLOCKWISE, "wheel-clockwise-4-spokes" }, + { FadeEffect_CLOCKWISE, "wheel-clockwise-8-spokes" }, - { FadeEffect_FADE_FROM_CENTER, "shape-circle" }, - { FadeEffect_FADE_FROM_CENTER, "shape-diamond" }, - { FadeEffect_FADE_FROM_CENTER, "shape-plus" }, + { FadeEffect_FADE_FROM_CENTER, "shape-circle" }, + { FadeEffect_FADE_FROM_CENTER, "shape-diamond" }, + { FadeEffect_FADE_FROM_CENTER, "shape-plus" }, - { FadeEffect_CLOCKWISE, "wedge" }, + { FadeEffect_CLOCKWISE, "wedge" }, - { FadeEffect_DISSOLVE, "fade-through-black" }, + { FadeEffect_DISSOLVE, "fade-through-black" }, - { FadeEffect_CLOCKWISE, "zoom-rotate-in" }, + { FadeEffect_CLOCKWISE, "zoom-rotate-in" }, - { FadeEffect_HORIZONTAL_LINES, "comb-horizontal" }, - { FadeEffect_VERTICAL_LINES, "comb-vertical" }, + { FadeEffect_HORIZONTAL_LINES, "comb-horizontal" }, + { FadeEffect_VERTICAL_LINES, "comb-vertical" }, - { FadeEffect_DISSOLVE, "fade-smoothly" }, + { FadeEffect_DISSOLVE, "fade-smoothly" }, { FadeEffect_NONE, 0 } }; @@ -202,7 +202,7 @@ FadeEffect EffectMigration::GetFadeEffect( const SdPage* pPage ) const TransitionPresetList::const_iterator aEndIt( rPresetList.end()); for( ; aIt != aEndIt; ++aIt ) { - if( ( (*aIt)->getTransition() == pPage->getTransitionType() ) && + if( ( (*aIt)->getTransition() == pPage->getTransitionType() ) && ( (*aIt)->getSubtype() == pPage->getTransitionSubtype() ) && ( (*aIt)->getDirection() == pPage->getTransitionDirection() ) && ( (*aIt)->getFadeColor() == pPage->getTransitionFadeColor() ) ) @@ -221,7 +221,7 @@ FadeEffect EffectMigration::GetFadeEffect( const SdPage* pPage ) struct deprecated_AnimationEffect_conversion_table_entry { - AnimationEffect meEffect; + AnimationEffect meEffect; const sal_Char* mpPresetId; const sal_Char* mpPresetSubType; } @@ -252,7 +252,7 @@ deprecated_AnimationEffect_conversion_table[] = { AnimationEffect_MOVE_FROM_LOWERRIGHT, "ooo-entrance-fly-in","from-bottom-right" }, { AnimationEffect_MOVE_FROM_LOWERLEFT, "ooo-entrance-fly-in","from-bottom-left" }, - { AnimationEffect_MOVE_FROM_BOTTOM, "ooo-entrance-fly-in-slow", "from-bottom" }, + { AnimationEffect_MOVE_FROM_BOTTOM, "ooo-entrance-fly-in-slow", "from-bottom" }, { AnimationEffect_MOVE_FROM_LEFT, "ooo-entrance-fly-in-slow", "from-left" }, { AnimationEffect_MOVE_FROM_RIGHT, "ooo-entrance-fly-in-slow", "from-right" }, { AnimationEffect_MOVE_FROM_TOP, "ooo-entrance-fly-in-slow", "from-top" }, @@ -415,7 +415,7 @@ deprecated_AnimationEffect_conversion_table[] = EffectSequence::iterator ImplFindEffect( MainSequencePtr& pMainSequence, const Reference< XShape >& rShape, sal_Int16 nSubItem ) { EffectSequence::iterator aIter; - + for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ ) { CustomAnimationEffectPtr pEffect( (*aIter) ); @@ -566,7 +566,7 @@ AnimationEffect EffectMigration::GetAnimationEffect( SvxShape* pShape ) const Reference< XShape > xShape( pShape ); EffectSequence::iterator aIter; - + for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ ) { CustomAnimationEffectPtr pEffect( (*aIter) ); @@ -587,7 +587,7 @@ AnimationEffect EffectMigration::GetAnimationEffect( SvxShape* pShape ) } // now find old effect - AnimationEffect eEffect = AnimationEffect_NONE; + AnimationEffect eEffect = AnimationEffect_NONE; if( !ConvertPreset( aPresetId, &aPresetSubType, eEffect ) ) ConvertPreset( aPresetId, 0, eEffect ); @@ -659,7 +659,7 @@ void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect { pShapeEffect = (*aIterOnlyBackground); } - else + else { EffectSequence::iterator aIterAsWhole( ImplFindEffect( pMainSequence, xShape, ShapeAnimationSubType::AS_WHOLE ) ); if( aIterAsWhole != aEnd ) @@ -693,7 +693,7 @@ void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect const bool bManual = (pPage == 0) || (pPage->GetPresChange() == PRESCHANGE_MANUAL); // now create effects for each paragraph - pGroup = + pGroup = pMainSequence-> createTextGroup( pShapeEffect, 10, bManual ? -1 : 0.0, sal_True, sal_False ); } @@ -762,7 +762,7 @@ AnimationEffect EffectMigration::GetTextAnimationEffect( SvxShape* pShape ) } // now find old effect - AnimationEffect eEffect = AnimationEffect_NONE; + AnimationEffect eEffect = AnimationEffect_NONE; if( !ConvertPreset( aPresetId, &aPresetSubType, eEffect ) ) ConvertPreset( aPresetId, 0, eEffect ); @@ -781,7 +781,7 @@ bool EffectMigration::ConvertPreset( const OUString& rPresetId, const OUString* deprecated_AnimationEffect_conversion_table_entry* p = deprecated_AnimationEffect_conversion_table; while( p->mpPresetId ) { - if( rPresetId.equalsAscii( p->mpPresetId ) && + if( rPresetId.equalsAscii( p->mpPresetId ) && (( p->mpPresetSubType == 0 ) || ( pPresetSubType == 0) || ( pPresetSubType->equalsAscii( p->mpPresetSubType )) ) ) @@ -855,7 +855,7 @@ void EffectMigration::SetAnimationSpeed( SvxShape* pShape, AnimationSpeed eSpeed EffectSequence::iterator aIter; bool bNeedRebuild = false; - + for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ ) { CustomAnimationEffectPtr pEffect( (*aIter) ); @@ -935,7 +935,7 @@ void EffectMigration::SetDimColor( SvxShape* pShape, sal_Int32 nColor ) EffectSequence::iterator aIter; bool bNeedRebuild = false; - + for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ ) { CustomAnimationEffectPtr pEffect( (*aIter) ); @@ -966,11 +966,11 @@ sal_Int32 EffectMigration::GetDimColor( SvxShape* pShape ) const Reference< XShape > xShape( pShape ); EffectSequence::iterator aIter; - + for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ ) { CustomAnimationEffectPtr pEffect( (*aIter) ); - if( (pEffect->getTargetShape() == xShape) && + if( (pEffect->getTargetShape() == xShape) && pEffect->getDimColor().hasValue() && pEffect->hasAfterEffect()) { @@ -1006,7 +1006,7 @@ void EffectMigration::SetDimHide( SvxShape* pShape, sal_Bool bDimHide ) EffectSequence::iterator aIter; bool bNeedRebuild = false; - + for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ ) { CustomAnimationEffectPtr pEffect( (*aIter) ); @@ -1080,7 +1080,7 @@ void EffectMigration::SetDimPrevious( SvxShape* pShape, sal_Bool bDimPrevious ) EffectSequence::iterator aIter; bool bNeedRebuild = false; - + for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ ) { CustomAnimationEffectPtr pEffect( (*aIter) ); @@ -1149,7 +1149,7 @@ void EffectMigration::SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos { Reference< XShape > xThis( pShape ); Reference< XShape > xCurrent; - + EffectSequence::iterator aIter( rSequence.begin() ); EffectSequence::iterator aEnd( rSequence.end() ); for( nPos = 0; aIter != aEnd; aIter++ ) @@ -1196,7 +1196,7 @@ void EffectMigration::SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos aEffects.push_back( (*(*aIter)) ); rSequence.erase( (*aIter++) ); } - + if( nNewPos > nCurrentPos ) nNewPos++; @@ -1275,7 +1275,7 @@ void EffectMigration::UpdateSoundEffect( SvxShape* pShape, SdAnimationInfo* pInf EffectSequence::iterator aIter; bool bNeedRebuild = false; - + OUString aSoundFile; if( pInfo->mbSoundOn ) aSoundFile = pInfo->maSoundFile; @@ -1318,8 +1318,8 @@ OUString EffectMigration::GetSoundFile( SvxShape* pShape ) const Reference< XShape > xShape( pShape ); EffectSequence::iterator aIter; - - for( aIter = pMainSequence->getBegin(); + + for( aIter = pMainSequence->getBegin(); (aSoundFile.getLength() == 0) && (aIter != pMainSequence->getEnd()); aIter++ ) { diff --git a/sd/source/core/PageListWatcher.cxx b/sd/source/core/PageListWatcher.cxx index 90cd25e151a0..b31dce70d90e 100644 --- a/sd/source/core/PageListWatcher.cxx +++ b/sd/source/core/PageListWatcher.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -105,7 +105,7 @@ SdPage* ImpPageListWatcher::GetSdPage(PageKind ePgKind, sal_uInt32 nPgNum) pRetval = maPageVectorStandard[nPgNum]; else { - DBG_ASSERT(nPgNum <= maPageVectorStandard.size(), + DBG_ASSERT(nPgNum <= maPageVectorStandard.size(), "ImpPageListWatcher::GetSdPage(PK_STANDARD): access out of range"); DBG_WARNING2 (" %d > %d", nPgNum, nPgNum<maPageVectorStandard.size()); @@ -127,15 +127,15 @@ SdPage* ImpPageListWatcher::GetSdPage(PageKind ePgKind, sal_uInt32 nPgNum) } case PK_HANDOUT: { -// #11420# for models used to transfer drawing shapes via clipboard its -// ok to not have a handout page -// DBG_ASSERT(mpHandoutPage, "ImpPageListWatcher::GetSdPage: access to non existing handout page (!)"); +// #11420# for models used to transfer drawing shapes via clipboard its +// ok to not have a handout page +// DBG_ASSERT(mpHandoutPage, "ImpPageListWatcher::GetSdPage: access to non existing handout page (!)"); DBG_ASSERT(nPgNum == 0L, "ImpPageListWatcher::GetSdPage: access to non existing handout page (!)"); if (nPgNum == 0) pRetval = mpHandoutPage; else { - DBG_ASSERT(nPgNum == 0L, + DBG_ASSERT(nPgNum == 0L, "ImpPageListWatcher::GetSdPage: access to non existing handout page (!)"); } break; diff --git a/sd/source/core/PageListWatcher.hxx b/sd/source/core/PageListWatcher.hxx index 9b7a14fd8dc1..a5280477f127 100644 --- a/sd/source/core/PageListWatcher.hxx +++ b/sd/source/core/PageListWatcher.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,13 +44,13 @@ protected: // typedefs for a vector of SdPages typedef ::std::vector< SdPage* > SdPageVector; - const SdrModel& mrModel; + const SdrModel& mrModel; - SdPageVector maPageVectorStandard; - SdPageVector maPageVectorNotes; - SdPage* mpHandoutPage; + SdPageVector maPageVectorStandard; + SdPageVector maPageVectorNotes; + SdPage* mpHandoutPage; - sal_Bool mbPageListValid; + sal_Bool mbPageListValid; void ImpRecreateSortedPageListOnDemand(); virtual sal_uInt32 ImpGetPageCount() const = 0; diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx index c6f5c11a9164..a0bc4931b7bd 100644 --- a/sd/source/core/TransitionPreset.cxx +++ b/sd/source/core/TransitionPreset.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx index a2aed2388e28..9aa989070209 100644 --- a/sd/source/core/anminfo.cxx +++ b/sd/source/core/anminfo.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,24 +47,24 @@ using namespace ::com::sun::star; SdAnimationInfo::SdAnimationInfo(SdrObject& rObject) : SdrObjUserData(SdUDInventor, SD_ANIMATIONINFO_ID, 0), - mePresObjKind (PRESOBJ_NONE), - meEffect (presentation::AnimationEffect_NONE), - meTextEffect (presentation::AnimationEffect_NONE), - meSpeed (presentation::AnimationSpeed_SLOW), - mbActive (TRUE), - mbDimPrevious (FALSE), - mbIsMovie (FALSE), - mbDimHide (FALSE), - mbSoundOn (FALSE), - mbPlayFull (FALSE), - mpPathObj (NULL), - meClickAction (presentation::ClickAction_NONE), - meSecondEffect (presentation::AnimationEffect_NONE), - meSecondSpeed (presentation::AnimationSpeed_SLOW), - mbSecondSoundOn (FALSE), - mbSecondPlayFull (FALSE), - mnVerb (0), - mnPresOrder (LIST_APPEND), + mePresObjKind (PRESOBJ_NONE), + meEffect (presentation::AnimationEffect_NONE), + meTextEffect (presentation::AnimationEffect_NONE), + meSpeed (presentation::AnimationSpeed_SLOW), + mbActive (TRUE), + mbDimPrevious (FALSE), + mbIsMovie (FALSE), + mbDimHide (FALSE), + mbSoundOn (FALSE), + mbPlayFull (FALSE), + mpPathObj (NULL), + meClickAction (presentation::ClickAction_NONE), + meSecondEffect (presentation::AnimationEffect_NONE), + meSecondSpeed (presentation::AnimationSpeed_SLOW), + mbSecondSoundOn (FALSE), + mbSecondPlayFull (FALSE), + mnVerb (0), + mnPresOrder (LIST_APPEND), mrObject (rObject) { maBlueScreen = RGB_Color(COL_LIGHTMAGENTA); @@ -72,30 +72,30 @@ SdAnimationInfo::SdAnimationInfo(SdrObject& rObject) } SdAnimationInfo::SdAnimationInfo(const SdAnimationInfo& rAnmInfo, SdrObject& rObject) - : SdrObjUserData (rAnmInfo), - mePresObjKind (PRESOBJ_NONE), - meEffect (rAnmInfo.meEffect), - meTextEffect (rAnmInfo.meTextEffect), - meSpeed (rAnmInfo.meSpeed), - mbActive (rAnmInfo.mbActive), - mbDimPrevious (rAnmInfo.mbDimPrevious), - mbIsMovie (rAnmInfo.mbIsMovie), - mbDimHide (rAnmInfo.mbDimHide), - maBlueScreen (rAnmInfo.maBlueScreen), - maDimColor (rAnmInfo.maDimColor), - maSoundFile (rAnmInfo.maSoundFile), - mbSoundOn (rAnmInfo.mbSoundOn), - mbPlayFull (rAnmInfo.mbPlayFull), - mpPathObj (NULL), - meClickAction (rAnmInfo.meClickAction), - meSecondEffect (rAnmInfo.meSecondEffect), - meSecondSpeed (rAnmInfo.meSecondSpeed), + : SdrObjUserData (rAnmInfo), + mePresObjKind (PRESOBJ_NONE), + meEffect (rAnmInfo.meEffect), + meTextEffect (rAnmInfo.meTextEffect), + meSpeed (rAnmInfo.meSpeed), + mbActive (rAnmInfo.mbActive), + mbDimPrevious (rAnmInfo.mbDimPrevious), + mbIsMovie (rAnmInfo.mbIsMovie), + mbDimHide (rAnmInfo.mbDimHide), + maBlueScreen (rAnmInfo.maBlueScreen), + maDimColor (rAnmInfo.maDimColor), + maSoundFile (rAnmInfo.maSoundFile), + mbSoundOn (rAnmInfo.mbSoundOn), + mbPlayFull (rAnmInfo.mbPlayFull), + mpPathObj (NULL), + meClickAction (rAnmInfo.meClickAction), + meSecondEffect (rAnmInfo.meSecondEffect), + meSecondSpeed (rAnmInfo.meSecondSpeed), maSecondSoundFile (rAnmInfo.maSecondSoundFile), - mbSecondSoundOn (rAnmInfo.mbSecondSoundOn), - mbSecondPlayFull (rAnmInfo.mbSecondPlayFull), -// maBookmark (rAnmInfo.maBookmark), - mnVerb (rAnmInfo.mnVerb), - mnPresOrder (LIST_APPEND), + mbSecondSoundOn (rAnmInfo.mbSecondSoundOn), + mbSecondPlayFull (rAnmInfo.mbSecondPlayFull), +// maBookmark (rAnmInfo.maBookmark), + mnVerb (rAnmInfo.mnVerb), + mnPresOrder (LIST_APPEND), mrObject (rObject) { // can not be copied diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx index b9a8bd9c0f6d..e61ead7f809b 100644 --- a/sd/source/core/annotations/Annotation.cxx +++ b/sd/source/core/annotations/Annotation.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const rtl::OUString& namespace sd { class Annotation : private ::cppu::BaseMutex, - public ::cppu::WeakComponentImplHelper1< XAnnotation>, + public ::cppu::WeakComponentImplHelper1< XAnnotation>, public ::cppu::PropertySetMixin< XAnnotation > { public: @@ -68,7 +68,7 @@ public: SdPage* GetPage() const { return mpPage; } SdrModel* GetModel() { return (mpPage != 0) ? mpPage->GetModel() : 0; } - + // XInterface: virtual Any SAL_CALL queryInterface(Type const & type) throw (RuntimeException); virtual void SAL_CALL acquire() throw () { ::cppu::WeakComponentImplHelper1< XAnnotation >::acquire(); } @@ -84,7 +84,7 @@ public: virtual void SAL_CALL removeVetoableChangeListener(const OUString & PropertyName, const Reference< XVetoableChangeListener > & aListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException); // ::com::sun::star::office::XAnnotation: - virtual ::com::sun::star::uno::Any SAL_CALL getAnchor() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getAnchor() throw (::com::sun::star::uno::RuntimeException); virtual RealPoint2D SAL_CALL getPosition() throw (RuntimeException); virtual void SAL_CALL setPosition(const RealPoint2D & the_value) throw (RuntimeException); virtual ::com::sun::star::geometry::RealSize2D SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException); @@ -102,7 +102,7 @@ private: // destructor is private and will be called indirectly by the release call virtual ~Annotation() {} void createChangeUndo(); - + // overload WeakComponentImplHelperBase::disposing() // This function is called upon disposing the component, // if your component needs special work when it becomes @@ -129,7 +129,7 @@ public: protected: rtl::Reference< Annotation > mxAnnotation; - bool mbInsert; + bool mbInsert; int mnIndex; }; @@ -145,15 +145,15 @@ struct AnnotationData m_Position = xAnnotation->getPosition(); m_Size = xAnnotation->getSize(); m_Author = xAnnotation->getAuthor(); - m_DateTime = xAnnotation->getDateTime(); + m_DateTime = xAnnotation->getDateTime(); } - + void set( const rtl::Reference< Annotation >& xAnnotation ) { xAnnotation->setPosition(m_Position); xAnnotation->setSize(m_Size); xAnnotation->setAuthor(m_Author); - xAnnotation->setDateTime(m_DateTime); + xAnnotation->setDateTime(m_DateTime); } }; @@ -174,7 +174,7 @@ protected: void createAnnotation( Reference< XAnnotation >& xAnnotation, SdPage* pPage ) { Reference<XComponentContext> xContext (comphelper_getProcessComponentContext()); - xAnnotation.set( new Annotation(xContext, pPage) ); + xAnnotation.set( new Annotation(xContext, pPage) ); pPage->addAnnotation(xAnnotation); } @@ -266,7 +266,7 @@ void SAL_CALL Annotation::setPosition(const RealPoint2D & the_value) throw (Runt Any(), Any(), 0); { osl::MutexGuard g(m_aMutex); - createChangeUndo(); + createChangeUndo(); m_Position = the_value; } } @@ -285,7 +285,7 @@ void SAL_CALL Annotation::setSize(const RealSize2D & the_value) throw (RuntimeEx Any(), Any(), 0); { osl::MutexGuard g(m_aMutex); - createChangeUndo(); + createChangeUndo(); m_Size = the_value; } } @@ -303,7 +303,7 @@ void SAL_CALL Annotation::setAuthor(const OUString & the_value) throw (RuntimeEx Any(), Any(), 0); { osl::MutexGuard g(m_aMutex); - createChangeUndo(); + createChangeUndo(); m_Author = the_value; } } @@ -315,13 +315,13 @@ util::DateTime SAL_CALL Annotation::getDateTime() throw (RuntimeException) } void SAL_CALL Annotation::setDateTime(const util::DateTime & the_value) throw (RuntimeException) -{ +{ prepareSet( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateTime")), Any(), Any(), 0); { osl::MutexGuard g(m_aMutex); - createChangeUndo(); + createChangeUndo(); m_DateTime = the_value; } } @@ -330,8 +330,8 @@ void Annotation::createChangeUndo() { SdrModel* pModel = GetModel(); if( pModel && pModel->IsUndoEnabled() ) - pModel->AddUndo( new UndoAnnotation( *this ) ); - + pModel->AddUndo( new UndoAnnotation( *this ) ); + if( pModel ) { pModel->SetChanged(); @@ -345,7 +345,7 @@ Reference< XText > SAL_CALL Annotation::getTextRange() throw (RuntimeException) osl::MutexGuard g(m_aMutex); if( !m_TextRange.is() && (mpPage != 0) ) { - m_TextRange = TextApiObject::create( static_cast< SdDrawDocument* >( mpPage->GetModel() ) ); + m_TextRange = TextApiObject::create( static_cast< SdDrawDocument* >( mpPage->GetModel() ) ); } return Reference< XText >( m_TextRange.get() ); } @@ -373,14 +373,14 @@ UndoInsertOrRemoveAnnotation::UndoInsertOrRemoveAnnotation( Annotation& rAnnotat if( pPage ) { Reference< XAnnotation > xAnnotation( &rAnnotation ); - + const AnnotationVector& rVec = pPage->getAnnotations(); for( AnnotationVector::const_iterator iter = rVec.begin(); iter != rVec.end(); iter++ ) { if( (*iter) == xAnnotation ) break; - - mnIndex++; + + mnIndex++; } } } @@ -410,7 +410,7 @@ void UndoInsertOrRemoveAnnotation::Redo() if( pPage && pModel ) { Reference< XAnnotation > xAnnotation( mxAnnotation.get() ); - + if( mbInsert ) { pPage->addAnnotation( xAnnotation, mnIndex ); diff --git a/sd/source/core/annotations/AnnotationEnumeration.cxx b/sd/source/core/annotations/AnnotationEnumeration.cxx index d9be4eae13fd..605c65a47beb 100644 --- a/sd/source/core/annotations/AnnotationEnumeration.cxx +++ b/sd/source/core/annotations/AnnotationEnumeration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/core/cusshow.cxx b/sd/source/core/cusshow.cxx index b9f23daedd90..8397f4e7802e 100755 --- a/sd/source/core/cusshow.cxx +++ b/sd/source/core/cusshow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index e2fdc2f805e5..c8e61c4a2e4f 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -112,7 +112,7 @@ SdDrawDocument* SdDrawDocument::pDocLockedInsertingLinks = NULL; ////////////////////////////////////////////////////////////////////////////// PresentationSettings::PresentationSettings() -: mbAll( true ), +: mbAll( true ), mbEndless( false ), mbCustomShow(false), mbManual( false ), @@ -131,7 +131,7 @@ PresentationSettings::PresentationSettings() // --------------------------------------------------------------------------- PresentationSettings::PresentationSettings( const PresentationSettings& r ) -: maPresPage( r.maPresPage ), +: maPresPage( r.maPresPage ), mbAll( r.mbAll ), mbEndless( r.mbEndless ), mbCustomShow( r.mbCustomShow ), @@ -183,7 +183,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) mpMasterPageListWatcher = ::std::auto_ptr<ImpMasterPageListWatcher>( new ImpMasterPageListWatcher(*this)); - SetObjectShell(pDrDocSh); // fuer das VCDrawModel + SetObjectShell(pDrDocSh); // fuer das VCDrawModel if (mpDocSh) { @@ -197,9 +197,9 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) // #92067# Allow UI scale only for draw documents. if( eType == DOCUMENT_TYPE_DRAW ) - SetUIUnit( (FieldUnit)pOptions->GetMetric(), Fraction( nX, nY ) ); // user-defined + SetUIUnit( (FieldUnit)pOptions->GetMetric(), Fraction( nX, nY ) ); // user-defined else - SetUIUnit( (FieldUnit)pOptions->GetMetric(), Fraction( 1, 1 ) ); // default + SetUIUnit( (FieldUnit)pOptions->GetMetric(), Fraction( 1, 1 ) ); // default SetScaleUnit(MAP_100TH_MM); SetScaleFraction(Fraction(1, 1)); @@ -223,7 +223,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) // set linguistic options { const SvtLinguConfig aLinguConfig; - SvtLinguOptions aOptions; + SvtLinguOptions aOptions; aLinguConfig.GetOptions( aOptions ); SetLanguage( MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage, @@ -348,13 +348,13 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) * * Es werden auf Pages und MasterPages folgende Default-Layer angelegt: * - * Layer STR_LAYOUT : Standardlayer fr alle Zeichenobjekte + * Layer STR_LAYOUT : Standardlayer fr alle Zeichenobjekte * * Layer STR_BCKGRND : Hintergrund der MasterPage - * (auf normalen Pages z.Z. keine Verwendung) + * (auf normalen Pages z.Z. keine Verwendung) * * Layer STR_BCKGRNDOBJ: Objekte auf dem Hintergrund der MasterPage - * (auf normalen Pages z.Z. keine Verwendung) + * (auf normalen Pages z.Z. keine Verwendung) * * Layer STR_CONTROLS : Standardlayer fr Controls * @@ -473,7 +473,7 @@ SdrModel* SdDrawDocument::AllocModel() const { // Dokument wird fuer Drag&Drop/Clipboard erzeugt, dafuer muss dem Dokument eine DocShell (SvPersist) bekannt sein SfxObjectShell* pObj = NULL; - ::sd::DrawDocShell* pNewDocSh = NULL; + ::sd::DrawDocShell* pNewDocSh = NULL; if( meDocType == DOCUMENT_TYPE_IMPRESS ) mpCreatingTransferable->SetDocShell( new ::sd::DrawDocShell( @@ -683,7 +683,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode) USHORT nPage, nPageCount; // #96323# create missing layout style sheets for broken documents - // that where created with the 5.2 + // that where created with the 5.2 nPageCount = GetMasterSdPageCount( PK_STANDARD ); for (nPage = 0; nPage < nPageCount; nPage++) { diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 74a1bde5f5f8..07e294cf7ede 100755 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ #include <sfx2/linkmgr.hxx> #include <editeng/editdata.hxx> #include <svx/dialogs.hrc> -#include <svx/dialmgr.hxx> // SVX_RESSTR +#include <svx/dialmgr.hxx> // SVX_RESSTR #include "eetext.hxx" #include <svx/svditer.hxx> @@ -83,7 +83,7 @@ using namespace ::sd; -const long PRINT_OFFSET = 30; // siehe \svx\source\dialog\page.cxx (PB) +const long PRINT_OFFSET = 30; // siehe \svx\source\dialog\page.cxx (PB) using namespace com::sun::star; @@ -261,15 +261,15 @@ USHORT SdDrawDocument::GetMasterSdPageCount(PageKind ePgKind) const /************************************************************************* |* -|* die in den Seitenobjekten der Notizseiten eingetragenen -|* Seitennummern anpassen +|* die in den Seitenobjekten der Notizseiten eingetragenen +|* Seitennummern anpassen |* \************************************************************************/ void SdDrawDocument::UpdatePageObjectsInNotes(USHORT nStartPos) { - USHORT nPageCount = GetPageCount(); - SdPage* pPage = NULL; + USHORT nPageCount = GetPageCount(); + SdPage* pPage = NULL; for (USHORT nPage = nStartPos; nPage < nPageCount; nPage++) { @@ -411,7 +411,7 @@ void SdDrawDocument::UpdatePageRelativeURLs(SdPage* pPage, USHORT nPos, sal_Int3 /************************************************************************* |* -|* Seite verschieben +|* Seite verschieben |* \************************************************************************/ @@ -427,7 +427,7 @@ void SdDrawDocument::MovePage(USHORT nPgNum, USHORT nNewPos) /************************************************************************* |* -|* Seite einfuegen +|* Seite einfuegen |* \************************************************************************/ @@ -448,7 +448,7 @@ void SdDrawDocument::InsertPage(SdrPage* pPage, USHORT nPos) /************************************************************************* |* -|* Seite loeschen +|* Seite loeschen |* \************************************************************************/ @@ -461,14 +461,14 @@ void SdDrawDocument::DeletePage(USHORT nPgNum) /************************************************************************* |* -|* Seite entfernen +|* Seite entfernen |* \************************************************************************/ SdrPage* SdDrawDocument::RemovePage(USHORT nPgNum) { SdrPage* pPage = FmFormModel::RemovePage(nPgNum); - + bool bLast = ((nPgNum+1)/2 == (GetPageCount()+1)/2); ((SdPage*)pPage)->DisconnectLink(); @@ -799,18 +799,18 @@ BOOL SdDrawDocument::CreateMissingNotesAndHandoutPages() /************************************************************************* |* |* - selektierte Seiten hinter genannte Seite schieben -|* (nTargetPage = (USHORT)-1 --> vor erste Seite schieben) +|* (nTargetPage = (USHORT)-1 --> vor erste Seite schieben) |* - ergibt TRUE, wenn Seiten verschoben wurden |* \************************************************************************/ BOOL SdDrawDocument::MovePages(USHORT nTargetPage) { - SdPage* pTargetPage = NULL; - SdPage* pPage = NULL; - USHORT nPage; - USHORT nNoOfPages = GetSdPageCount(PK_STANDARD); - BOOL bSomethingHappened = FALSE; + SdPage* pTargetPage = NULL; + SdPage* pPage = NULL; + USHORT nPage; + USHORT nNoOfPages = GetSdPageCount(PK_STANDARD); + BOOL bSomethingHappened = FALSE; const bool bUndo = IsUndoEnabled(); @@ -818,7 +818,7 @@ BOOL SdDrawDocument::MovePages(USHORT nTargetPage) BegUndo(String(SdResId(STR_UNDO_MOVEPAGES))); // Liste mit selektierten Seiten - List aPageList; + List aPageList; for (nPage = 0; nPage < nNoOfPages; nPage++) { pPage = GetSdPage(nPage, PK_STANDARD); @@ -873,14 +873,14 @@ BOOL SdDrawDocument::MovePages(USHORT nTargetPage) { pTargetPage = GetSdPage(nPage, PK_STANDARD); nTargetPage = nPage; - nTargetPage = 2 * nTargetPage + 1; // PK_STANDARD --> absolut + nTargetPage = 2 * nTargetPage + 1; // PK_STANDARD --> absolut while (aPageList.Count() > 0) { pPage = (SdPage*)aPageList.GetObject(0); nPage = pPage->GetPageNum(); if (nPage > nTargetPage) { - nTargetPage += 2; // hinter (!) der Seite einfuegen + nTargetPage += 2; // hinter (!) der Seite einfuegen if (nPage != nTargetPage) { @@ -999,7 +999,7 @@ IMPL_LINK( SdDrawDocument, WorkStartupHdl, Timer *, EMPTYARG ) if( mpDocSh ) mpDocSh->SetWaitCursor( TRUE ); - BOOL bChanged = IsChanged(); // merken + BOOL bChanged = IsChanged(); // merken // Autolayouts initialisieren SdPage* pHandoutMPage = GetMasterSdPage(0, PK_HANDOUT); @@ -1077,8 +1077,8 @@ SdAnimationInfo* SdDrawDocument::GetAnimationInfo(SdrObject* pObject) const SdAnimationInfo* SdDrawDocument::GetShapeUserData(SdrObject& rObject, bool bCreate /* = false */ ) { - USHORT nUD = 0; - USHORT nUDCount = rObject.GetUserDataCount(); + USHORT nUD = 0; + USHORT nUDCount = rObject.GetUserDataCount(); SdrObjUserData* pUD = 0; SdAnimationInfo* pRet = 0; @@ -1114,8 +1114,8 @@ SdIMapInfo* SdDrawDocument::GetIMapInfo( SdrObject* pObject ) const DBG_ASSERT(pObject, "ohne Objekt keine IMapInfo"); SdrObjUserData* pUserData = NULL; - SdIMapInfo* pIMapInfo = NULL; - USHORT nCount = pObject->GetUserDataCount(); + SdIMapInfo* pIMapInfo = NULL; + USHORT nCount = pObject->GetUserDataCount(); // gibt es in den User-Daten eine IMap-Information? for ( USHORT i = 0; i < nCount; i++ ) @@ -1145,19 +1145,19 @@ IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject* pObj, if ( pIMapInfo ) { - const MapMode aMap100( MAP_100TH_MM ); - Size aGraphSize; - Point aRelPoint( rWinPoint ); - ImageMap& rImageMap = (ImageMap&) pIMapInfo->GetImageMap(); - const Rectangle& rRect = pObj->GetLogicRect(); - BOOL bObjSupported = FALSE; + const MapMode aMap100( MAP_100TH_MM ); + Size aGraphSize; + Point aRelPoint( rWinPoint ); + ImageMap& rImageMap = (ImageMap&) pIMapInfo->GetImageMap(); + const Rectangle& rRect = pObj->GetLogicRect(); + BOOL bObjSupported = FALSE; // HitTest ausfuehren if ( pObj->ISA( SdrGrafObj ) ) // einfaches Grafik-Objekt { - const SdrGrafObj* pGrafObj = (const SdrGrafObj*) pObj; - const GeoStat& rGeo = pGrafObj->GetGeoStat(); - SdrGrafObjGeoData* pGeoData = (SdrGrafObjGeoData*) pGrafObj->GetGeoData(); + const SdrGrafObj* pGrafObj = (const SdrGrafObj*) pObj; + const GeoStat& rGeo = pGrafObj->GetGeoStat(); + SdrGrafObjGeoData* pGeoData = (SdrGrafObjGeoData*) pGrafObj->GetGeoData(); // Drehung rueckgaengig if ( rGeo.nDrehWink ) @@ -1208,7 +1208,7 @@ IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject* pObj, */ void SdDrawDocument::CheckMasterPages() { -// RemoveMasterPage(2); // code to test the creation of notes pages +// RemoveMasterPage(2); // code to test the creation of notes pages USHORT nMaxPages = GetMasterPageCount(); diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 103a197d5a1f..4fa646764c3f 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,9 +79,9 @@ using namespace ::com::sun::star; -#define POOL_BUFFER_SIZE (USHORT)32768 -#define BASIC_BUFFER_SIZE (USHORT)8192 -#define DOCUMENT_BUFFER_SIZE (USHORT)32768 +#define POOL_BUFFER_SIZE (USHORT)32768 +#define BASIC_BUFFER_SIZE (USHORT)8192 +#define DOCUMENT_BUFFER_SIZE (USHORT)32768 /************************************************************************* |* @@ -197,12 +197,12 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(const String& rBookmarkFile) \************************************************************************/ BOOL SdDrawDocument::InsertBookmark( - List* pBookmarkList, // Liste der Namen der einzufuegenden Bookmarks + List* pBookmarkList, // Liste der Namen der einzufuegenden Bookmarks List* pExchangeList, // Liste der zu verwendenen Namen - BOOL bLink, // Bookmarks sollen als Verknuepfung eingefuegt werden - BOOL bReplace, // Aktuellen Seiten (Standard&Notiz) werden ersetzt - USHORT nInsertPos, // Einfuegeposition fuer Seiten - BOOL bNoDialogs, // Keine Dialoge anzeigen + BOOL bLink, // Bookmarks sollen als Verknuepfung eingefuegt werden + BOOL bReplace, // Aktuellen Seiten (Standard&Notiz) werden ersetzt + USHORT nInsertPos, // Einfuegeposition fuer Seiten + BOOL bNoDialogs, // Keine Dialoge anzeigen ::sd::DrawDocShell* pBookmarkDocSh, // Wenn gesetzt, so ist dieses das Source-Dokument BOOL bCopy, // Seiten werden kopiert Point* pObjPos) // Einfuegeposition fuer Objekte @@ -364,10 +364,10 @@ public: virtual ~InsertBookmarkAsPage_FindDuplicateLayouts() {}; virtual void operator()( SdDrawDocument&, SdPage* ); private: - List* mpLayoutsToTransfer; + List* mpLayoutsToTransfer; SdDrawDocument* mpBookmarkDoc; - List* mpBookmarkList; - USHORT mnBMSdPageCount; + List* mpBookmarkList; + USHORT mnBMSdPageCount; }; void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc, SdPage* pBMMPage ) @@ -382,7 +382,7 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc String* pTest = (String*) mpLayoutsToTransfer->First(); BOOL bFound = FALSE; - while (pTest && !bFound) // found yet? + while (pTest && !bFound) // found yet? { if (*pLayout == *pTest) bFound = TRUE; @@ -495,17 +495,17 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( { SdPage* pBMPage = pBookmarkDoc->GetSdPage(0,PK_STANDARD); - if (pBMPage->GetSize() != pRefPage->GetSize() || - pBMPage->GetLftBorder() != pRefPage->GetLftBorder() || - pBMPage->GetRgtBorder() != pRefPage->GetRgtBorder() || - pBMPage->GetUppBorder() != pRefPage->GetUppBorder() || + if (pBMPage->GetSize() != pRefPage->GetSize() || + pBMPage->GetLftBorder() != pRefPage->GetLftBorder() || + pBMPage->GetRgtBorder() != pRefPage->GetRgtBorder() || + pBMPage->GetUppBorder() != pRefPage->GetUppBorder() || pBMPage->GetLwrBorder() != pRefPage->GetLwrBorder()) { String aStr(SdResId(STR_SCALE_OBJECTS)); USHORT nBut = QueryBox( NULL, WB_YES_NO_CANCEL, aStr).Execute(); bScaleObjects = nBut == RET_YES; - bContinue = nBut != RET_CANCEL; + bContinue = nBut != RET_CANCEL; if (!bContinue) { @@ -617,19 +617,19 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( } Merge(*pBookmarkDoc, - 1, // Nicht die Handzettelseite - 0xFFFF, // Aber alle anderen + 1, // Nicht die Handzettelseite + 0xFFFF, // Aber alle anderen nActualInsertPos, // An Position einfuegen bMergeMasterPages, // MasterPages mitnehmen - FALSE, // Aber nur die benoetigten MasterPages - TRUE, // Undo-Aktion erzeugen - bCopy); // Seiten kopieren (oder mergen) + FALSE, // Aber nur die benoetigten MasterPages + TRUE, // Undo-Aktion erzeugen + bCopy); // Seiten kopieren (oder mergen) for (nBMSdPage=0; nBMSdPage < nBMSdPageCount; nBMSdPage++) { - SdPage* pPage = (SdPage*) GetPage(nActualInsertPos); + SdPage* pPage = (SdPage*) GetPage(nActualInsertPos); SdPage* pNotesPage = (SdPage*) GetPage(nActualInsertPos+1); - String* pName = (String*) aNameList.GetObject(nBMSdPage); + String* pName = (String*) aNameList.GetObject(nBMSdPage); // #95991# delay renaming *after* pages are copied (might destroy source otherwise) if( aRenameSet.find(nBMSdPage) != aRenameSet.end() ) @@ -712,13 +712,13 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( } Merge(*pBookmarkDoc, - nBMPage, // Von Seite (Standard) - nBMPage+1, // Bis Seite (Notizen) + nBMPage, // Von Seite (Standard) + nBMPage+1, // Bis Seite (Notizen) nActualInsertPos, // An Position einfuegen bMergeMasterPages, // MasterPages mitnehmen - FALSE, // Aber nur die benoetigten MasterPages - TRUE, // Undo-Aktion erzeugen - bCopy); // Seiten kopieren (oder mergen) + FALSE, // Aber nur die benoetigten MasterPages + TRUE, // Undo-Aktion erzeugen + bCopy); // Seiten kopieren (oder mergen) if( bReplace ) { @@ -855,7 +855,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( USHORT nSdPageStart = (nInsertPos - 1) / 2; USHORT nSdPageEnd = GetSdPageCount(PK_STANDARD) - nSdPageCount + nSdPageStart - 1; - const bool bRemoveEmptyPresObj = pBookmarkDoc && + const bool bRemoveEmptyPresObj = pBookmarkDoc && (pBookmarkDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS) && (GetDocumentType() == DOCUMENT_TYPE_DRAW); @@ -1258,7 +1258,7 @@ SvStream* SdDrawDocument::GetDocumentStream(SdrDocumentStreamInfo& rStreamInfo) uno::Reference < embed::XStorage > xStor; if (mpDocSh) xStor = mpDocSh->GetStorage(); - SvStream* pRet = NULL; + SvStream* pRet = NULL; if( xStor.is() ) { @@ -1315,7 +1315,7 @@ SvStream* SdDrawDocument::GetDocumentStream(SdrDocumentStreamInfo& rStreamInfo) const ULONG nStartPos = pRet->Tell(); const ULONG nEndPos = pRet->Seek( STREAM_SEEK_TO_END ); const ULONG nStmLen = nEndPos - nStartPos; - sal_uChar aTestByte; + sal_uChar aTestByte; // try to read one byte if( nStmLen ) @@ -1440,7 +1440,7 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, BOOL bOnl delete pMaster; if( bUndo ) - EndUndo(); // schon hier, damit sich Joes Actions ZWISCHEN unsere eigenen schieben + EndUndo(); // schon hier, damit sich Joes Actions ZWISCHEN unsere eigenen schieben // alte Layoutvorlagen loeschen, wenn sie nicht mehr benoetigt werden BOOL bDeleteOldStyleSheets = TRUE; @@ -1476,7 +1476,7 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, BOOL bOnl } if (pMasterPage) - break; // Nur diese eine MasterPage! + break; // Nur diese eine MasterPage! } } @@ -1517,12 +1517,12 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, } SdPage* pSelectedPage = GetSdPage(nSdPageNum, PK_STANDARD); - SdPage* pNotes = (SdPage*) GetPage(pSelectedPage->GetPageNum()+1); - SdPage& rOldMaster = (SdPage&)pSelectedPage->TRG_GetMasterPage(); + SdPage* pNotes = (SdPage*) GetPage(pSelectedPage->GetPageNum()+1); + SdPage& rOldMaster = (SdPage&)pSelectedPage->TRG_GetMasterPage(); SdPage& rOldNotesMaster = (SdPage&)pNotes->TRG_GetMasterPage(); - SdPage* pMaster = NULL; - SdPage* pNotesMaster = NULL; - SdPage* pPage = NULL; + SdPage* pMaster = NULL; + SdPage* pNotesMaster = NULL; + SdPage* pPage = NULL; String aOldPageLayoutName(pSelectedPage->GetLayoutName()); String aOldLayoutName(aOldPageLayoutName); aOldLayoutName.Erase(aOldLayoutName.SearchAscii( SD_LT_SEPARATOR )); @@ -1532,7 +1532,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, if (pSourceDoc) { List* pReplList = NULL; - BOOL bLayoutReloaded = FALSE; // Wurde ex. Layout wieder geladen? + BOOL bLayoutReloaded = FALSE; // Wurde ex. Layout wieder geladen? /********************************************************************* |* LayoutName, Page and Notespage @@ -1612,8 +1612,8 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, pSourceStyleSheetPool->SetSearchMask(SD_STYLE_FAMILY_MASTERPAGE); static_cast<SdStyleSheetPool*>( mxStyleSheetPool.get())->SetSearchMask(SD_STYLE_FAMILY_MASTERPAGE); - pReplList = new List; // Liste fuer ersetzte StyleSheets - SdStyleSheetVector aCreatedStyles; // Liste fuer erzeugte StyleSheets + pReplList = new List; // Liste fuer ersetzte StyleSheets + SdStyleSheetVector aCreatedStyles; // Liste fuer erzeugte StyleSheets SfxStyleSheetBase* pHisSheet = pSourceStyleSheetPool->First(); @@ -1629,7 +1629,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, { // Es ist eine gleichnamige Vorlage vorhanden ist: Inhalte ersetzen #ifdef DBG_UTIL - BOOL bTest = + BOOL bTest = #endif pMySheet->SetName(pHisSheet->GetName()); DBG_ASSERT(bTest, "StyleSheet-Umbenennung fehlgeschlagen"); @@ -1768,7 +1768,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, List* pPageList = new List; // #98456, this has to be removed according to CL (KA 07/08/2002) -// #109884# but we need them again to restore the styles of the presentation objects while undo +// #109884# but we need them again to restore the styles of the presentation objects while undo pPageList->Insert(pMaster, LIST_APPEND); pPageList->Insert(pNotesMaster, LIST_APPEND); @@ -1873,13 +1873,13 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, String aName = String(SdResId(STR_LAYOUT_DEFAULT_NAME)); String aTest; BOOL bNotANewName = TRUE; - USHORT nCount = 0; - USHORT nMPgCount = GetMasterPageCount(); + USHORT nCount = 0; + USHORT nMPgCount = GetMasterPageCount(); for (nCount = 0; bNotANewName; nCount++) { // Testnamen bilden - aTest = aName; // Standard, Standard1, Standard2, ... + aTest = aName; // Standard, Standard1, Standard2, ... if (nCount > 0) aTest += String::CreateFromInt32( nCount ); diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 89f74de30494..a4e01ae7458b 100755 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ #include <editeng/lspcitem.hxx> #include <editeng/adjitem.hxx> #include <svx/dialogs.hrc> -#include <svx/dialmgr.hxx> // SVX_RESSTR +#include <svx/dialmgr.hxx> // SVX_RESSTR #include <editeng/bulitem.hxx> #include <svx/xtable.hxx> #include <svx/sxmsuitm.hxx> @@ -159,16 +159,16 @@ void SdDrawDocument::CreateLayoutTemplates() SfxItemSet& rISet = pSheet->GetItemSet(); SfxItemPool* pPool = rISet.GetPool(); - String aNullStr; + String aNullStr; ::basegfx::B2DPolyPolygon aNullPolyPolygon; - Color aNullCol(RGB_Color(COL_BLACK)); + Color aNullCol(RGB_Color(COL_BLACK)); - XDash aNullDash; + XDash aNullDash; XGradient aNullGrad(aNullCol,RGB_Color(COL_WHITE)); aNullGrad.SetStartIntens( 100 ); aNullGrad.SetEndIntens( 100 ); - XHatch aNullHatch(aNullCol); + XHatch aNullHatch(aNullCol); // Linienattribute (Extended OutputDevice) rISet.Put(XLineStyleItem(XLINE_SOLID)); @@ -197,7 +197,7 @@ void SdDrawDocument::CreateLayoutTemplates() // Schattenattribute (Drawing Engine) rISet.Put(SdrShadowItem(FALSE)); rISet.Put(SdrShadowColorItem(aNullStr, RGB_Color(COL_GRAY))); - rISet.Put(SdrShadowXDistItem(300)); // 3 mm Schattendistanz + rISet.Put(SdrShadowXDistItem(300)); // 3 mm Schattendistanz rISet.Put(SdrShadowYDistItem(300)); Font aLatinFont, aCJKFont, aCTLFont; @@ -242,7 +242,7 @@ void SdDrawDocument::CreateLayoutTemplates() rISet.Put(SvxLRSpaceItem(EE_PARA_LRSPACE)); rISet.Put(SvxULSpaceItem(EE_PARA_ULSPACE)); - rISet.Put( SdrTextLeftDistItem( 250 ) ); // sj: (i33745) using text frame distances seems to be a better default + rISet.Put( SdrTextLeftDistItem( 250 ) ); // sj: (i33745) using text frame distances seems to be a better default rISet.Put( SdrTextRightDistItem( 250 ) ); rISet.Put( SdrTextUpperDistItem( 125 ) ); rISet.Put( SdrTextLowerDistItem( 125 ) ); @@ -258,18 +258,18 @@ void SdDrawDocument::CreateLayoutTemplates() // die sind in allen Ebenen identisch aBulletItem.SetStyle(BS_BULLET); aBulletItem.SetStart(1); - aBulletItem.SetScale(45); // in Prozent + aBulletItem.SetScale(45); // in Prozent Font aBulletFont( pSSPool->GetBulletFont() ); - aBulletFont.SetSize(Size(0,635)); // sj: (i33745) changed default from 24 to 18 pt + aBulletFont.SetSize(Size(0,635)); // sj: (i33745) changed default from 24 to 18 pt aBulletItem.SetFont(aBulletFont); - aBulletItem.SetSymbol( 0x25CF ); // Punkt + aBulletItem.SetSymbol( 0x25CF ); // Punkt rISet.Put(aBulletItem); -// SfxUInt16Item aBulletStateItem(EE_PARA_BULLETSTATE, 0); // Bullets nicht sichtbar -// rISet.Put(aBulletStateItem); +// SfxUInt16Item aBulletStateItem(EE_PARA_BULLETSTATE, 0); // Bullets nicht sichtbar +// rISet.Put(aBulletStateItem); // Neues BulletItem pSSPool->PutNumBulletItem( pSheet, aBulletFont ); @@ -309,7 +309,7 @@ void SdDrawDocument::CreateLayoutTemplates() pISet->Put(SdrShadowItem(TRUE)); pISet->Put(SdrShadowColorItem(aNullStr, RGB_Color(COL_GRAY))); - pISet->Put(SdrShadowXDistItem(300)); // 3 mm Schattendistanz + pISet->Put(SdrShadowXDistItem(300)); // 3 mm Schattendistanz pISet->Put(SdrShadowYDistItem(300)); // ---- Objekt ohne Fllung ------------------------------------------- @@ -371,7 +371,7 @@ void SdDrawDocument::CreateLayoutTemplates() pISet->Put(XFillStyleItem(XFILL_NONE)); SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE ); - aLRSpaceItem.SetTxtFirstLineOfst(600); // Erstzeileneinzug 6mm, rechts 0 + aLRSpaceItem.SetTxtFirstLineOfst(600); // Erstzeileneinzug 6mm, rechts 0 pISet->Put(aLRSpaceItem); /* #i35937# @@ -407,7 +407,7 @@ void SdDrawDocument::CreateLayoutTemplates() pISet->Put(SdrShadowItem(TRUE)); pISet->Put(SdrShadowColorItem(aNullStr, RGB_Color(COL_GRAY))); - pISet->Put(SdrShadowXDistItem(200)); // 2 mm Schattendistanz + pISet->Put(SdrShadowXDistItem(200)); // 2 mm Schattendistanz pISet->Put(SdrShadowYDistItem(200)); pISet->Put(SvxFontHeightItem(846, 100, EE_CHAR_FONTHEIGHT )); // 24 pt @@ -431,13 +431,13 @@ void SdDrawDocument::CreateLayoutTemplates() pISet->Put(SdrShadowItem(TRUE)); pISet->Put(SdrShadowColorItem(aNullStr, RGB_Color(COL_GRAY))); - pISet->Put(SdrShadowXDistItem(200)); // 2 mm Schattendistanz + pISet->Put(SdrShadowXDistItem(200)); // 2 mm Schattendistanz pISet->Put(SdrShadowYDistItem(200)); pISet->Put(SvxFontHeightItem(1270, 100, EE_CHAR_FONTHEIGHT )); // 36 pt SvxLRSpaceItem aLRSpItem( 200, 200, 0, 0, EE_PARA_LRSPACE); - pISet->Put( aLRSpItem ); // Erstzeileneinzug 0 mm, links und rechts 2 mm + pISet->Put( aLRSpItem ); // Erstzeileneinzug 0 mm, links und rechts 2 mm /* #i35937# // SvxLRSpaceItem hart gesetzt: NumBulletItem anpassen @@ -581,17 +581,17 @@ void SdDrawDocument::CreateDefaultCellStyles() pSheet = &(pSSPool->Make(aDefaultCellStyleName, SD_STYLE_FAMILY_CELL, nMask)); pSheet->SetHelpId( aHelpFile, HID_SD_CELL_STYLE_DEFAULT ); SfxItemSet& rISet = pSheet->GetItemSet(); -// SfxItemPool* pPool = rISet.GetPool(); +// SfxItemPool* pPool = rISet.GetPool(); - String aNullStr; + String aNullStr; - Color aNullCol(RGB_Color(COL_BLACK)); + Color aNullCol(RGB_Color(COL_BLACK)); - XDash aNullDash; + XDash aNullDash; XGradient aNullGrad(aNullCol,RGB_Color(COL_WHITE)); aNullGrad.SetStartIntens( 100 ); aNullGrad.SetEndIntens( 100 ); - XHatch aNullHatch(aNullCol); + XHatch aNullHatch(aNullCol); rISet.Put(XFillStyleItem(XFILL_SOLID)); rISet.Put(XFillColorItem(String(), RGB_Color(0x00ccccff))); @@ -617,13 +617,13 @@ void SdDrawDocument::CreateDefaultCellStyles() rISet.Put( SvxFontHeightItem( 635, 100, EE_CHAR_FONTHEIGHT_CJK ) ); // 18 pt rISet.Put( SvxFontHeightItem( convertFontHeightToCTL( 635 ), 100, EE_CHAR_FONTHEIGHT_CTL ) ); // 18 pt -// rISet.Put( SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT ) ); -// rISet.Put( SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CJK ) ); -// rISet.Put( SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CTL ) ); +// rISet.Put( SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT ) ); +// rISet.Put( SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CJK ) ); +// rISet.Put( SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CTL ) ); -// rISet.Put( SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC ) ); -// rISet.Put( SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CJK ) ); -// rISet.Put( SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CTL ) ); +// rISet.Put( SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC ) ); +// rISet.Put( SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CJK ) ); +// rISet.Put( SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CTL ) ); // rISet.Put(SvxContourItem(FALSE, EE_CHAR_OUTLINE )); // rISet.Put(SvxShadowedItem(FALSE, EE_CHAR_SHADOW )); @@ -650,7 +650,7 @@ void SdDrawDocument::CreateDefaultCellStyles() Color aWhite( COL_WHITE ); SvxBorderLine aBorderLine( &aWhite, 1, 0, 0 ); - + SvxBoxItem aBoxItem( SDRATTR_TABLE_BORDER ); aBoxItem.SetLine( &aBorderLine, BOX_LINE_TOP ); aBoxItem.SetLine( &aBorderLine, BOX_LINE_BOTTOM ); @@ -679,7 +679,7 @@ void SdDrawDocument::CreateDefaultCellStyles() // ---- Orange -------------------------------------------------- - Any aOrange1( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("orange1") ), aDefaultCellStyleName, RGB_COLORDATA(255,204,153))); + Any aOrange1( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("orange1") ), aDefaultCellStyleName, RGB_COLORDATA(255,204,153))); Any aOrange2( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("orange2") ), aDefaultCellStyleName, RGB_COLORDATA(255,153,102))); Any aOrange3( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("orange3") ), aDefaultCellStyleName, RGB_COLORDATA(255,102,51))); @@ -999,7 +999,7 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj) bLock = pModel->isLocked(); pModel->setLock( sal_True ); } - // taking text from the outliner + // taking text from the outliner ((SdrTextObj*) pObj)->SetOutlinerParaObject( pOutl->CreateParaObject() ); pObj->BroadcastObjectChange(); @@ -1210,9 +1210,9 @@ void SdDrawDocument::RenameLayoutTemplate(const String& rOldLayoutName, const St aSheetName.Insert(rNewName, 0); StyleReplaceData* pReplData = new StyleReplaceData; - pReplData->nFamily = pSheet->GetFamily(); + pReplData->nFamily = pSheet->GetFamily(); pReplData->nNewFamily = pSheet->GetFamily(); - pReplData->aName = pSheet->GetName(); + pReplData->aName = pSheet->GetName(); pReplData->aNewName = aSheetName; aReplList.Insert(pReplData, LIST_APPEND); @@ -1334,17 +1334,17 @@ void SdDrawDocument::SetTextDefaults() const // BulletItem und BulletFont fuer Titel und Gliederung SvxBulletItem aBulletItem(EE_PARA_BULLET); Font aBulletFont( static_cast<SdStyleSheetPool*>( mxStyleSheetPool.get())->GetBulletFont() ); - aBulletFont.SetSize(Size(0,846)); // 24 pt + aBulletFont.SetSize(Size(0,846)); // 24 pt aBulletItem.SetFont(aBulletFont); aBulletItem.SetStyle(BS_BULLET); aBulletItem.SetStart(1); - aBulletItem.SetScale(45); // in Prozent - aBulletItem.SetSymbol( 0x25CF ); // Punkt + aBulletItem.SetScale(45); // in Prozent + aBulletItem.SetSymbol( 0x25CF ); // Punkt pItemPool->SetPoolDefaultItem( aBulletItem ); // Bullets nicht sichtbar -// SfxUInt16Item aBulletStateItem(EE_PARA_BULLETSTATE, 0); -// pItemPool->SetPoolDefaultItem( aBulletStateItem ); +// SfxUInt16Item aBulletStateItem(EE_PARA_BULLETSTATE, 0); +// pItemPool->SetPoolDefaultItem( aBulletStateItem ); // Neues BulletItem SvxNumberFormat aNumberFormat(SVX_NUM_CHAR_SPECIAL); @@ -1436,9 +1436,9 @@ void SdDrawDocument::getDefaultFonts( Font& rLatinFont, Font& rCJKFont, Font& rC { LanguageType eLatin = GetLanguage( EE_CHAR_LANGUAGE ); - // #108374# / #107782#: If the UI language is Korean, the default Latin font has to - // be queried for Korean, too (the Latin language from the document can't be Korean). - // This is the same logic as in SwDocShell::InitNew. + // #108374# / #107782#: If the UI language is Korean, the default Latin font has to + // be queried for Korean, too (the Latin language from the document can't be Korean). + // This is the same logic as in SwDocShell::InitNew. LanguageType eUiLanguage = Application::GetSettings().GetUILanguage(); switch( eUiLanguage ) { diff --git a/sd/source/core/drawdoc_animations.cxx b/sd/source/core/drawdoc_animations.cxx index 3a994ffc0655..3d895407d9dd 100644 --- a/sd/source/core/drawdoc_animations.cxx +++ b/sd/source/core/drawdoc_animations.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src index f1c7058ddf79..24d4f2231ee5 100755 --- a/sd/source/core/glob.src +++ b/sd/source/core/glob.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -372,8 +372,8 @@ String STR_SAVE_DOC Text [ en-US ] = "Save Document" ; }; -#define ERR_CODE( class, err ) (class | (err - ERROR_SD_BASE)) -#define WARN_CODE( class, err ) (class | ( err - WARN_SD_BASE)) +#define ERR_CODE( class, err ) (class | (err - ERROR_SD_BASE)) +#define WARN_CODE( class, err ) (class | ( err - WARN_SD_BASE)) Resource RID_SD_ERRHDL { diff --git a/sd/source/core/pglink.cxx b/sd/source/core/pglink.cxx index 61988c886feb..3a6f5606cb46 100644 --- a/sd/source/core/pglink.cxx +++ b/sd/source/core/pglink.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ /************************************************************************* |* -|* Ctor +|* Ctor |* \************************************************************************/ diff --git a/sd/source/core/sdattr.cxx b/sd/source/core/sdattr.cxx index 4b394a137d56..284efe9b8315 100644 --- a/sd/source/core/sdattr.cxx +++ b/sd/source/core/sdattr.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ using namespace ::com::sun::star; /************************************************************************* |* -|* DiaEffectItem +|* DiaEffectItem |* *************************************************************************/ TYPEINIT1_AUTOFACTORY( DiaEffectItem, SfxEnumItem ); @@ -66,7 +66,7 @@ SfxPoolItem* DiaEffectItem::Create( SvStream& rIn, USHORT ) const /************************************************************************* |* -|* DiaSpeedItem +|* DiaSpeedItem |* *************************************************************************/ TYPEINIT1_AUTOFACTORY( DiaSpeedItem, SfxEnumItem ); @@ -97,7 +97,7 @@ SfxPoolItem* DiaSpeedItem::Create( SvStream& rIn, USHORT ) const /************************************************************************* |* -|* DiaAutoItem +|* DiaAutoItem |* *************************************************************************/ TYPEINIT1_AUTOFACTORY( DiaAutoItem, SfxEnumItem ); @@ -127,7 +127,7 @@ SfxPoolItem* DiaAutoItem::Create( SvStream& rIn, USHORT ) const /************************************************************************* |* -|* DiaTimeItem +|* DiaTimeItem |* *************************************************************************/ TYPEINIT1_AUTOFACTORY( DiaTimeItem, SfxUInt32Item ); diff --git a/sd/source/core/sdiocmpt.cxx b/sd/source/core/sdiocmpt.cxx index 5231aaf261ba..62529590b998 100644 --- a/sd/source/core/sdiocmpt.cxx +++ b/sd/source/core/sdiocmpt.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,9 +36,9 @@ ////////////////////////////////////////////////////////////////////////////// old_SdrDownCompat::old_SdrDownCompat(SvStream& rNewStream, UINT16 nNewMode) -: rStream(rNewStream), - nSubRecSiz(0), - nSubRecPos(0), +: rStream(rNewStream), + nSubRecSiz(0), + nSubRecPos(0), nMode(nNewMode), bOpen(FALSE) { @@ -53,56 +53,56 @@ old_SdrDownCompat::~old_SdrDownCompat() void old_SdrDownCompat::Read() { - rStream >> nSubRecSiz; + rStream >> nSubRecSiz; } void old_SdrDownCompat::Write() { - rStream << nSubRecSiz; + rStream << nSubRecSiz; } void old_SdrDownCompat::OpenSubRecord() { - if(rStream.GetError()) + if(rStream.GetError()) return; + + nSubRecPos = rStream.Tell(); - nSubRecPos = rStream.Tell(); - - if(nMode == STREAM_READ) + if(nMode == STREAM_READ) { - Read(); - } - else if(nMode == STREAM_WRITE) + Read(); + } + else if(nMode == STREAM_WRITE) { - Write(); - } + Write(); + } bOpen = TRUE; } void old_SdrDownCompat::CloseSubRecord() { - if(rStream.GetError()) + if(rStream.GetError()) return; UINT32 nAktPos(rStream.Tell()); - - if(nMode == STREAM_READ) + + if(nMode == STREAM_READ) { UINT32 nReadAnz(nAktPos - nSubRecPos); - if(nReadAnz != nSubRecSiz) + if(nReadAnz != nSubRecSiz) { - rStream.Seek(nSubRecPos + nSubRecSiz); + rStream.Seek(nSubRecPos + nSubRecSiz); } - } - else if(nMode == STREAM_WRITE) + } + else if(nMode == STREAM_WRITE) { - nSubRecSiz = nAktPos - nSubRecPos; - rStream.Seek(nSubRecPos); - Write(); - rStream.Seek(nAktPos); - } - + nSubRecSiz = nAktPos - nSubRecPos; + rStream.Seek(nSubRecPos); + Write(); + rStream.Seek(nAktPos); + } + bOpen = FALSE; } @@ -113,7 +113,7 @@ void old_SdrDownCompat::CloseSubRecord() \************************************************************************/ SdIOCompat::SdIOCompat(SvStream& rNewStream, USHORT nNewMode, UINT16 nVer) -: old_SdrDownCompat(rNewStream, nNewMode), nVersion(nVer) +: old_SdrDownCompat(rNewStream, nNewMode), nVersion(nVer) { if (nNewMode == STREAM_WRITE) { @@ -129,7 +129,7 @@ SdIOCompat::SdIOCompat(SvStream& rNewStream, USHORT nNewMode, UINT16 nVer) } } -SdIOCompat::~SdIOCompat() +SdIOCompat::~SdIOCompat() { } diff --git a/sd/source/core/sdobjfac.cxx b/sd/source/core/sdobjfac.cxx index e02ae442ff8d..1fc12d25579e 100644 --- a/sd/source/core/sdobjfac.cxx +++ b/sd/source/core/sdobjfac.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 82a841a199c8..9eeb12c7ba95 100755 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,33 +95,33 @@ TYPEINIT2( SdPage, FmFormPage, SdrObjUserCall ); /************************************************************************* |* -|* Ctor +|* Ctor |* \************************************************************************/ SdPage::SdPage(SdDrawDocument& rNewDoc, StarBASIC* pBasic, BOOL bMasterPage) -: FmFormPage(rNewDoc, pBasic, bMasterPage) -, SdrObjUserCall() -, mePageKind(PK_STANDARD) -, meAutoLayout(AUTOLAYOUT_NONE) -, mbSelected(FALSE) -, mePresChange(PRESCHANGE_MANUAL) -, mnTime(1) -, mbSoundOn(FALSE) -, mbExcluded(FALSE) +: FmFormPage(rNewDoc, pBasic, bMasterPage) +, SdrObjUserCall() +, mePageKind(PK_STANDARD) +, meAutoLayout(AUTOLAYOUT_NONE) +, mbSelected(FALSE) +, mePresChange(PRESCHANGE_MANUAL) +, mnTime(1) +, mbSoundOn(FALSE) +, mbExcluded(FALSE) , mbLoopSound(FALSE) -, mbStopSound(FALSE) -, mbScaleObjects(TRUE) -, mbBackgroundFullSize( FALSE ) -, meCharSet(gsl_getSystemTextEncoding()) -, mnPaperBin(PAPERBIN_PRINTER_SETTINGS) -, mpPageLink(NULL) -, mpItems(NULL) -, mnTransitionType(0) -, mnTransitionSubtype(0) -, mbTransitionDirection(sal_True) -, mnTransitionFadeColor(0) -, mfTransitionDuration(2.0) +, mbStopSound(FALSE) +, mbScaleObjects(TRUE) +, mbBackgroundFullSize( FALSE ) +, meCharSet(gsl_getSystemTextEncoding()) +, mnPaperBin(PAPERBIN_PRINTER_SETTINGS) +, mpPageLink(NULL) +, mpItems(NULL) +, mnTransitionType(0) +, mnTransitionSubtype(0) +, mbTransitionDirection(sal_True) +, mnTransitionFadeColor(0) +, mfTransitionDuration(2.0) , mbIsPrecious(true) { // Der Layoutname der Seite wird von SVDRAW benutzt, um die Praesentations- @@ -256,7 +256,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec SdrObject* pSdrObj = NULL; - bool bForceText = false; // forces the shape text to be set even if its empty + bool bForceText = false; // forces the shape text to be set even if its empty bool bEmptyPresObj = true; switch( eObjKind ) @@ -365,7 +365,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec // #i105146# We want no content to be displayed for PK_HANDOUT, // so just never set a page as content pSdrObj = new SdrPageObj(0); -// pSdrObj->SetResizeProtect(TRUE); +// pSdrObj->SetResizeProtect(TRUE); } break; @@ -593,7 +593,7 @@ SfxStyleSheet* SdPage::GetStyleSheetForMasterPageBackground() const aName += String(SdResId(STR_LAYOUT_BACKGROUND)); SfxStyleSheetBasePool* pStShPool = pModel->GetStyleSheetPool(); - SfxStyleSheetBase* pResult = pStShPool->Find(aName, SD_STYLE_FAMILY_MASTERPAGE); + SfxStyleSheetBase* pResult = pStShPool->Find(aName, SD_STYLE_FAMILY_MASTERPAGE); return (SfxStyleSheet*)pResult; } @@ -642,7 +642,7 @@ SfxStyleSheet* SdPage::GetStyleSheetForPresObj(PresObjKind eObjKind) const } SfxStyleSheetBasePool* pStShPool = pModel->GetStyleSheetPool(); - SfxStyleSheetBase* pResult = pStShPool->Find(aName, SD_STYLE_FAMILY_MASTERPAGE); + SfxStyleSheetBase* pResult = pStShPool->Find(aName, SD_STYLE_FAMILY_MASTERPAGE); return (SfxStyleSheet*)pResult; } @@ -657,8 +657,8 @@ SdStyleSheet* SdPage::getPresentationStyle( sal_uInt32 nHelpId ) const sal_uInt16 nNameId; switch( nHelpId ) { - case HID_PSEUDOSHEET_TITLE: nNameId = STR_LAYOUT_TITLE; break; - case HID_PSEUDOSHEET_SUBTITLE: nNameId = STR_LAYOUT_SUBTITLE; break; + case HID_PSEUDOSHEET_TITLE: nNameId = STR_LAYOUT_TITLE; break; + case HID_PSEUDOSHEET_SUBTITLE: nNameId = STR_LAYOUT_SUBTITLE; break; case HID_PSEUDOSHEET_OUTLINE1: case HID_PSEUDOSHEET_OUTLINE2: case HID_PSEUDOSHEET_OUTLINE3: @@ -667,10 +667,10 @@ SdStyleSheet* SdPage::getPresentationStyle( sal_uInt32 nHelpId ) const case HID_PSEUDOSHEET_OUTLINE6: case HID_PSEUDOSHEET_OUTLINE7: case HID_PSEUDOSHEET_OUTLINE8: - case HID_PSEUDOSHEET_OUTLINE9: nNameId = STR_LAYOUT_OUTLINE; break; - case HID_PSEUDOSHEET_BACKGROUNDOBJECTS: nNameId = STR_LAYOUT_BACKGROUNDOBJECTS; break; - case HID_PSEUDOSHEET_BACKGROUND: nNameId = STR_LAYOUT_BACKGROUND; break; - case HID_PSEUDOSHEET_NOTES: nNameId = STR_LAYOUT_NOTES; break; + case HID_PSEUDOSHEET_OUTLINE9: nNameId = STR_LAYOUT_OUTLINE; break; + case HID_PSEUDOSHEET_BACKGROUNDOBJECTS: nNameId = STR_LAYOUT_BACKGROUNDOBJECTS; break; + case HID_PSEUDOSHEET_BACKGROUND: nNameId = STR_LAYOUT_BACKGROUND; break; + case HID_PSEUDOSHEET_NOTES: nNameId = STR_LAYOUT_NOTES; break; default: DBG_ERROR( "SdPage::getPresentationStyle(), illegal argument!" ); @@ -684,7 +684,7 @@ SdStyleSheet* SdPage::getPresentationStyle( sal_uInt32 nHelpId ) const } SfxStyleSheetBasePool* pStShPool = pModel->GetStyleSheetPool(); - SfxStyleSheetBase* pResult = pStShPool->Find(aStyleName, SD_STYLE_FAMILY_MASTERPAGE); + SfxStyleSheetBase* pResult = pStShPool->Find(aStyleName, SD_STYLE_FAMILY_MASTERPAGE); return dynamic_cast<SdStyleSheet*>(pResult); } @@ -1103,7 +1103,7 @@ Rectangle SdPage::GetLayoutRect() const |* \*************************************************************************/ -const int MAX_PRESOBJS = 7; // maximum number of presentation objects per layout +const int MAX_PRESOBJS = 7; // maximum number of presentation objects per layout const int VERTICAL = 0x8000; struct LayoutDescriptor @@ -1124,50 +1124,50 @@ LayoutDescriptor::LayoutDescriptor( int nLayout, int k0, int k1, int k2, int k3, meKind[3] = static_cast<PresObjKind>(k3 & (~VERTICAL)); mbVertical[3] = (k3 & VERTICAL) == VERTICAL; meKind[4] = static_cast<PresObjKind>(k4 & (~VERTICAL)); mbVertical[4] = (k4 & VERTICAL) == VERTICAL; meKind[5] = static_cast<PresObjKind>(k5 & (~VERTICAL)); mbVertical[5] = (k5 & VERTICAL) == VERTICAL; - meKind[6] = static_cast<PresObjKind>(k6 & (~VERTICAL)); mbVertical[6] = (k6 & VERTICAL) == VERTICAL; + meKind[6] = static_cast<PresObjKind>(k6 & (~VERTICAL)); mbVertical[6] = (k6 & VERTICAL) == VERTICAL; } static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout ) { static LayoutDescriptor aLayouts[AUTOLAYOUT__END-AUTOLAYOUT__START] = { - LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_TEXT ), // AUTOLAYOUT_TITLE - LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_ENUM - LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_CHART - LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2TEXT - LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTCHART - LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_ORG - LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTCLbIP - LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_CHARTTEXT - LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TAB - LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_CLIPTEXT - LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOBJ - LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OBJECT ), // AUTOLAYOUT_OBJ - LayoutDescriptor( 2, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXT2OBJ - LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOBJ - LayoutDescriptor( 4, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_OBJOVERTEXT - LayoutDescriptor( 3, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2OBJTEXT - LayoutDescriptor( 5, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2OBJOVERTEXT - LayoutDescriptor( 4, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOVEROBJ - LayoutDescriptor( 6, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_4OBJ + LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_TEXT ), // AUTOLAYOUT_TITLE + LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_ENUM + LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_CHART + LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2TEXT + LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTCHART + LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_ORG + LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTCLbIP + LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_CHARTTEXT + LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TAB + LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_CLIPTEXT + LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOBJ + LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OBJECT ), // AUTOLAYOUT_OBJ + LayoutDescriptor( 2, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXT2OBJ + LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOBJ + LayoutDescriptor( 4, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_OBJOVERTEXT + LayoutDescriptor( 3, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2OBJTEXT + LayoutDescriptor( 5, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2OBJOVERTEXT + LayoutDescriptor( 4, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOVEROBJ + LayoutDescriptor( 6, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_4OBJ PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), - LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_NONE ), // AUTOLAYOUT_ONLY_TITLE - LayoutDescriptor( 0, PRESOBJ_NONE ), // AUTOLAYOUT_NONE - LayoutDescriptor( 0, PRESOBJ_PAGE, PRESOBJ_NOTES ), // AUTOLAYOUT_NOTES - LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT1 - LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT2 - LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT3 - LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT4 - LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT6 + LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_NONE ), // AUTOLAYOUT_ONLY_TITLE + LayoutDescriptor( 0, PRESOBJ_NONE ), // AUTOLAYOUT_NONE + LayoutDescriptor( 0, PRESOBJ_PAGE, PRESOBJ_NOTES ), // AUTOLAYOUT_NOTES + LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT1 + LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT2 + LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT3 + LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT4 + LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT6 LayoutDescriptor( 7, PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL, PRESOBJ_OUTLINE ),// AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART - LayoutDescriptor( 8, PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE - LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE - LayoutDescriptor( 9, PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART - LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT9 + LayoutDescriptor( 8, PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE + LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE + LayoutDescriptor( 9, PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART + LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT9 LayoutDescriptor( 10, PRESOBJ_TEXT, PRESOBJ_NONE ), // AUTOLAYOUT_ONLY_TEXT - LayoutDescriptor( 6, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_4CLIPART + LayoutDescriptor( 6, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_4CLIPART PRESOBJ_GRAPHIC, PRESOBJ_GRAPHIC ), - LayoutDescriptor( 11, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_6CLIPART + LayoutDescriptor( 11, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_6CLIPART PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ) }; @@ -1381,7 +1381,7 @@ static void CalcAutoLayoutRectangles( SdPage& rPage, int nLayout, Rectangle* rRe rRectangle[6] = Rectangle (aLayoutPos, aLayoutSize); break; - } + } } } @@ -2236,16 +2236,16 @@ SdrObject* convertPresentationObjectImpl( SdPage& rPage, SdrObject* pSourceObj, /** reuses or creates a presentation shape for an auto layout that fits the given parameter - @param eObjKind + @param eObjKind The kind of presentation shape we like to have - @param nIndex + @param nIndex If > 1 we skip the first nIndex-1 shapes with the presentation shape kind eObjKind while looking for an existing presentation shape - @param bVertical + @param bVertical If true, the shape is created vertical if bInit is true - @param aRect + @param aRect The rectangle that should be used to transform the shape - @param bInit + @param bInit If true the shape is created if not found @returns A presentation shape that was either found or created with the given parameters @@ -2272,10 +2272,10 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind, pUndoManager->AddUndoAction( new UndoObjectUserCall( *pObj ) ); } -// if ( pObj->ISA(SdrGrafObj) && !pObj->IsEmptyPresObj() ) +// if ( pObj->ISA(SdrGrafObj) && !pObj->IsEmptyPresObj() ) ( /*(SdrGrafObj*)*/ pObj)->AdjustToMaxRect( aRect ); -// else -// SetLogicRect( pObj, aRect ); +// else +// SetLogicRect( pObj, aRect ); pObj->SetUserCall(this); @@ -2355,7 +2355,7 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind, } } - if ( pObj && ( pObj->IsEmptyPresObj() || !pObj->ISA(SdrGrafObj) ) ) + if ( pObj && (pObj->GetUserCall() || bInit) && ( pObj->IsEmptyPresObj() || !pObj->ISA(SdrGrafObj) ) ) pObj->AdjustToMaxRect( aRect ); return pObj; @@ -2416,7 +2416,7 @@ void SdPage::InsertPresObj(SdrObject* pObj, PresObjKind eKind ) |* \************************************************************************/ -void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eObjKind, const String& rString ) +void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eObjKind, const String& rString ) { if ( pObj ) { @@ -2600,7 +2600,7 @@ const String& SdPage::GetName() const if ((mePageKind == PK_STANDARD || mePageKind == PK_NOTES) && !mbMaster) { // default name for handout pages - USHORT nNum = (GetPageNum() + 1) / 2; + USHORT nNum = (GetPageNum() + 1) / 2; aCreatedPageName = String(SdResId(STR_PAGE)); aCreatedPageName += sal_Unicode( ' ' ); @@ -2847,7 +2847,7 @@ bool SdPage::checkVisibility( if((eKind == PRESOBJ_FOOTER) || (eKind == PRESOBJ_HEADER) || (eKind == PRESOBJ_DATETIME) || (eKind == PRESOBJ_SLIDENUMBER) ) { const bool bSubContentProcessing(rDisplayInfo.GetSubContentActive()); - + if( bSubContentProcessing || ( pCheckPage->GetPageKind() == PK_HANDOUT && bIsPrinting ) ) { // use the page that is currently processed @@ -2874,7 +2874,7 @@ bool SdPage::checkVisibility( } } } // check for placeholders on master - else if( (eKind != PRESOBJ_NONE) && pCheckPage->IsMasterPage() && ( pVisualizedPage != pCheckPage ) ) + else if( (eKind != PRESOBJ_NONE) && pCheckPage->IsMasterPage() && ( pVisualizedPage != pCheckPage ) ) { // presentation objects on master slide are always invisible if slide is shown. return false; @@ -2974,7 +2974,7 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout, long nBottomBorder = rHandoutMaster.GetLwrBorder(); const long nHeaderFooterHeight = static_cast< long >( (aArea.Height() - nTopBorder - nLeftBorder) * 0.05 ); - + nTopBorder += nHeaderFooterHeight; nBottomBorder += nHeaderFooterHeight; @@ -2986,7 +2986,7 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout, const bool bLandscape = aArea.Width() > aArea.Height(); - static sal_uInt16 aOffsets[5][9] = + static sal_uInt16 aOffsets[5][9] = { { 0, 1, 2, 3, 4, 5, 6, 7, 8 }, // AUTOLAYOUT_HANDOUT9, Portrait, Horizontal order { 0, 2, 4, 1, 3, 5, 0, 0, 0 }, // AUTOLAYOUT_HANDOUT3, Landscape, Vertical @@ -3004,7 +3004,7 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout, break; case AUTOLAYOUT_HANDOUT2: - if( bLandscape ) + if( bLandscape ) { nColCnt = 2; nRowCnt = 1; } @@ -3024,7 +3024,7 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout, nColCnt = 2; nRowCnt = 3; } pOffsets = aOffsets[ bLandscape ? 1 : 0 ]; - break; + break; case AUTOLAYOUT_HANDOUT4: nColCnt = 2; nRowCnt = 2; @@ -3047,7 +3047,7 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout, default: case AUTOLAYOUT_HANDOUT9: nColCnt = 3; nRowCnt = 3; - + if( !bHorizontal ) pOffsets = aOffsets[4]; break; diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index ac6acb35abbc..2b3db02100a2 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,9 +72,9 @@ extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const rtl::OUString& |* Vorlagen fuer Praesentationsobjekte |* |* Vorraussetzungen: - Die Seite muss bereits das richtige Model kennen! -|* - Die entsprechende Masterpage muss bereits im Model sein. -|* - Die entsprechenden StyleSheets muessen bereits im -|* im StyleSheetPool sein. +|* - Die entsprechende Masterpage muss bereits im Model sein. +|* - Die entsprechenden StyleSheets muessen bereits im +|* im StyleSheetPool sein. |* |* bReplaceStyleSheets = TRUE : Benannte StyleSheets werden ausgetauscht |* FALSE: Alle StyleSheets werden neu zugewiesen @@ -94,7 +94,7 @@ void SdPage::SetPresentationLayout(const String& rLayoutName, /********************************************************************* |* Layoutname der Seite \********************************************************************/ - String aOldLayoutName(maLayoutName); // merken + String aOldLayoutName(maLayoutName); // merken maLayoutName = rLayoutName; maLayoutName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR )); maLayoutName += String(SdResId(STR_LAYOUT_OUTLINE)); @@ -382,9 +382,9 @@ void SdPage::DisconnectLink() \************************************************************************/ SdPage::SdPage(const SdPage& rSrcPage) -: FmFormPage(rSrcPage) -, SdrObjUserCall() -, mpItems(NULL) +: FmFormPage(rSrcPage) +, SdrObjUserCall() +, mpItems(NULL) { mePageKind = rSrcPage.mePageKind; meAutoLayout = rSrcPage.meAutoLayout; @@ -394,20 +394,20 @@ SdPage::SdPage(const SdPage& rSrcPage) InsertPresObj(GetObj(pObj->GetOrdNum()), rSrcPage.GetPresObjKind(pObj)); mbSelected = FALSE; - mnTransitionType = rSrcPage.mnTransitionType; + mnTransitionType = rSrcPage.mnTransitionType; mnTransitionSubtype = rSrcPage.mnTransitionSubtype; mbTransitionDirection = rSrcPage.mbTransitionDirection; mnTransitionFadeColor = rSrcPage.mnTransitionFadeColor; mfTransitionDuration = rSrcPage.mfTransitionDuration; - mePresChange = rSrcPage.mePresChange; + mePresChange = rSrcPage.mePresChange; mnTime = rSrcPage.mnTime; mbSoundOn = rSrcPage.mbSoundOn; mbExcluded = rSrcPage.mbExcluded; maLayoutName = rSrcPage.maLayoutName; maSoundFile = rSrcPage.maSoundFile; - mbLoopSound = rSrcPage.mbLoopSound; - mbStopSound = rSrcPage.mbStopSound; + mbLoopSound = rSrcPage.mbLoopSound; + mbStopSound = rSrcPage.mbStopSound; maCreatedPageName = String(); maFileName = rSrcPage.maFileName; maBookmarkName = rSrcPage.maBookmarkName; @@ -519,7 +519,7 @@ void SdPage::getAlienAttributes( com::sun::star::uno::Any& rAttributes ) void SdPage::RemoveEmptyPresentationObjects() { - SdrObjListIter aShapeIter( *this, IM_DEEPWITHGROUPS ); + SdrObjListIter aShapeIter( *this, IM_DEEPWITHGROUPS ); SdrObject* pShape; for( pShape = aShapeIter.Next(); pShape; pShape = aShapeIter.Next() ) @@ -533,58 +533,58 @@ void SdPage::RemoveEmptyPresentationObjects() } } -sal_Int16 SdPage::getTransitionType (void) const +sal_Int16 SdPage::getTransitionType (void) const { - return mnTransitionType; + return mnTransitionType; } void SdPage::setTransitionType( sal_Int16 nTransitionType ) { - mnTransitionType = nTransitionType; + mnTransitionType = nTransitionType; ActionChanged(); } sal_Int16 SdPage::getTransitionSubtype (void) const { - return mnTransitionSubtype; + return mnTransitionSubtype; } void SdPage::setTransitionSubtype ( sal_Int16 nTransitionSubtype ) { - mnTransitionSubtype = nTransitionSubtype; + mnTransitionSubtype = nTransitionSubtype; ActionChanged(); } sal_Bool SdPage::getTransitionDirection (void) const { - return mbTransitionDirection; + return mbTransitionDirection; } void SdPage::setTransitionDirection ( sal_Bool bTransitionbDirection ) { - mbTransitionDirection = bTransitionbDirection; + mbTransitionDirection = bTransitionbDirection; ActionChanged(); } sal_Int32 SdPage::getTransitionFadeColor (void) const { - return mnTransitionFadeColor; + return mnTransitionFadeColor; } -void SdPage::setTransitionFadeColor ( sal_Int32 nTransitionFadeColor ) +void SdPage::setTransitionFadeColor ( sal_Int32 nTransitionFadeColor ) { - mnTransitionFadeColor = nTransitionFadeColor; + mnTransitionFadeColor = nTransitionFadeColor; ActionChanged(); } double SdPage::getTransitionDuration (void) const { - return mfTransitionDuration; + return mfTransitionDuration; } void SdPage::setTransitionDuration ( double fTranstionDuration ) { - mfTransitionDuration = fTranstionDuration; + mfTransitionDuration = fTranstionDuration; ActionChanged(); } @@ -608,7 +608,7 @@ void SdPage::addAnnotation( const Reference< XAnnotation >& xAnnotation, int nIn { maAnnotations.insert( maAnnotations.begin() + nIndex, xAnnotation ); } - + if( pModel && pModel->IsUndoEnabled() ) { SdrUndoAction* pAction = CreateUndoInsertOrRemoveAnnotation( xAnnotation, true ); @@ -617,7 +617,7 @@ void SdPage::addAnnotation( const Reference< XAnnotation >& xAnnotation, int nIn } SetChanged(); - + if( pModel ) { pModel->SetChanged(); diff --git a/sd/source/core/sdpage_animations.cxx b/sd/source/core/sdpage_animations.cxx index df2bfcdfdb18..284fb05fe1d8 100644 --- a/sd/source/core/sdpage_animations.cxx +++ b/sd/source/core/sdpage_animations.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/core/shapelist.cxx b/sd/source/core/shapelist.cxx index bf5b98471b53..0c4ad04055ff 100755 --- a/sd/source/core/shapelist.cxx +++ b/sd/source/core/shapelist.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx index a1a9879b1213..6197c6308df5 100644 --- a/sd/source/core/stlfamily.cxx +++ b/sd/source/core/stlfamily.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,7 +82,7 @@ PresStyleMap& SdStyleFamilyImpl::getStyleSheets() String aLayoutName( maLayoutName ); const sal_uInt16 nLen = aLayoutName.Search(String( RTL_CONSTASCII_USTRINGPARAM(SD_LT_SEPARATOR)))+4; aLayoutName.Erase( nLen ); - + if( (maStyleSheets.size() == 0) || !((*maStyleSheets.begin()).second->GetName().Equals( aLayoutName, 0, nLen )) ) { maStyleSheets.clear(); @@ -130,7 +130,7 @@ SdStyleFamily::~SdStyleFamily() // ---------------------------------------------------------- -void SdStyleFamily::throwIfDisposed() const throw(RuntimeException) +void SdStyleFamily::throwIfDisposed() const throw(RuntimeException) { if( !mxPool.is() ) throw DisposedException(); @@ -179,7 +179,7 @@ SdStyleSheet* SdStyleFamily::GetSheetByName( const OUString& rName ) throw(NoSuc } if( pRet ) return pRet; - + throw NoSuchElementException(); } @@ -279,7 +279,7 @@ Sequence< OUString > SAL_CALL SdStyleFamily::getElementNames() throw(RuntimeExce } } -// *pNames++ = (*iter++).second->GetApiName(); +// *pNames++ = (*iter++).second->GetApiName(); return aNames; } else @@ -298,7 +298,7 @@ Sequence< OUString > SAL_CALL SdStyleFamily::getElementNames() throw(RuntimeExce // ---------------------------------------------------------- -sal_Bool SAL_CALL SdStyleFamily::hasByName( const OUString& aName ) throw(RuntimeException) +sal_Bool SAL_CALL SdStyleFamily::hasByName( const OUString& aName ) throw(RuntimeException) { OGuard aGuard( Application::GetSolarMutex() ); throwIfDisposed(); @@ -454,7 +454,7 @@ void SAL_CALL SdStyleFamily::removeByName( const OUString& rName ) throw(NoSuchE { OGuard aGuard( Application::GetSolarMutex() ); throwIfDisposed(); - + SdStyleSheet* pStyle = GetSheetByName( rName ); if( !pStyle->IsUserDefined() ) @@ -560,10 +560,10 @@ Any SdStyleFamily::getPropertyValue( const OUString& PropertyName ) throw (Unkno OUString sDisplayName; switch( mnFamily ) { - case SD_STYLE_FAMILY_MASTERPAGE: sDisplayName = getName(); break; - case SD_STYLE_FAMILY_CELL: sDisplayName = String( SdResId(STR_CELL_STYLE_FAMILY) ); break; -// case SD_STYLE_FAMILY_GRAPHICS: - default: sDisplayName = String( SdResId(STR_GRAPHICS_STYLE_FAMILY) ); break; + case SD_STYLE_FAMILY_MASTERPAGE: sDisplayName = getName(); break; + case SD_STYLE_FAMILY_CELL: sDisplayName = String( SdResId(STR_CELL_STYLE_FAMILY) ); break; +// case SD_STYLE_FAMILY_GRAPHICS: + default: sDisplayName = String( SdResId(STR_GRAPHICS_STYLE_FAMILY) ); break; } return Any( sDisplayName ); } diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 138863cc313a..1a7b4d2b2a88 100755 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ #include <svx/svdattr.hxx> #include "eetext.hxx" -#include <svx/xtable.hxx> // fuer RGB_Color +#include <svx/xtable.hxx> // fuer RGB_Color #include <editeng/bulitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/adjitem.hxx> @@ -86,9 +86,9 @@ using namespace ::com::sun::star::container; // ---------------------------------------------------------- SdStyleSheetPool::SdStyleSheetPool(SfxItemPool const& _rPool, SdDrawDocument* pDocument) -: SdStyleSheetPoolBase( _rPool ) -, mpActualStyleSheet(NULL) -, mpDoc(pDocument) +: SdStyleSheetPoolBase( _rPool ) +, mpActualStyleSheet(NULL) +, mpDoc(pDocument) { if( mpDoc ) { @@ -97,18 +97,18 @@ SdStyleSheetPool::SdStyleSheetPool(SfxItemPool const& _rPool, SdDrawDocument* pD // create graphics family mxGraphicFamily = new SdStyleFamily( xPool, SD_STYLE_FAMILY_GRAPHICS ); mxCellFamily = new SdStyleFamily( xPool, SD_STYLE_FAMILY_CELL ); - + mxTableFamily = sdr::table::CreateTableDesignFamily(); Reference< XNamed > xNamed( mxTableFamily, UNO_QUERY ); if( xNamed.is() ) msTableFamilyName = xNamed->getName(); - + // create presentation families, one for each master page const sal_uInt16 nCount = mpDoc->GetMasterSdPageCount(PK_STANDARD); for( sal_uInt16 nPage = 0; nPage < nCount; ++nPage ) AddStyleFamily( mpDoc->GetMasterSdPage(nPage,PK_STANDARD) ); -// StartListening( *mpDoc ); +// StartListening( *mpDoc ); } } @@ -266,7 +266,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo ULONG nFontSize = 20; short nFirstIndent = -600; -// USHORT nIndent = nLevel * 1200; +// USHORT nIndent = nLevel * 1200; USHORT nLower = 100; switch (nLevel) @@ -380,9 +380,9 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo rTitleSet.Put(SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT ) ); rTitleSet.Put(SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CJK ) ); rTitleSet.Put(SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CTL ) ); - rTitleSet.Put(SvxFontHeightItem( 1552, 100, EE_CHAR_FONTHEIGHT ) ); // 44 pt - rTitleSet.Put(SvxFontHeightItem( 1552, 100, EE_CHAR_FONTHEIGHT_CJK ) ); // 44 pt - rTitleSet.Put(SvxFontHeightItem( SdDrawDocument::convertFontHeightToCTL( 1552 ), 100, EE_CHAR_FONTHEIGHT_CTL ) ); // 44 pt + rTitleSet.Put(SvxFontHeightItem( 1552, 100, EE_CHAR_FONTHEIGHT ) ); // 44 pt + rTitleSet.Put(SvxFontHeightItem( 1552, 100, EE_CHAR_FONTHEIGHT_CJK ) ); // 44 pt + rTitleSet.Put(SvxFontHeightItem( SdDrawDocument::convertFontHeightToCTL( 1552 ), 100, EE_CHAR_FONTHEIGHT_CTL ) ); // 44 pt rTitleSet.Put(SvxUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE )); rTitleSet.Put(SvxOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE )); rTitleSet.Put(SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT )); @@ -393,11 +393,11 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo rTitleSet.Put(SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR )); rTitleSet.Put(SvxAdjustItem(SVX_ADJUST_CENTER, EE_PARA_JUST )); rTitleSet.Put( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) ); -// rTitleSet.Put( SfxUInt16Item(EE_PARA_BULLETSTATE, 0) ); +// rTitleSet.Put( SfxUInt16Item(EE_PARA_BULLETSTATE, 0) ); // #i16874# enable kerning by default but only for new documents rTitleSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) ); - aBulletFont.SetSize(Size(0,1552)); // 44 pt + aBulletFont.SetSize(Size(0,1552)); // 44 pt PutNumBulletItem( pSheet, aBulletFont ); } @@ -426,7 +426,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo rSubtitleSet.Put(SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT ) ); rSubtitleSet.Put(SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CJK ) ); rSubtitleSet.Put(SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CTL ) ); - rSubtitleSet.Put( SvxFontHeightItem( 1129, 100, EE_CHAR_FONTHEIGHT ) ); // 32 pt + rSubtitleSet.Put( SvxFontHeightItem( 1129, 100, EE_CHAR_FONTHEIGHT ) ); // 32 pt rSubtitleSet.Put( SvxFontHeightItem( 1129, 100, EE_CHAR_FONTHEIGHT_CJK ) ); // 32 pt rSubtitleSet.Put( SvxFontHeightItem( SdDrawDocument::convertFontHeightToCTL( 1129 ), 100, EE_CHAR_FONTHEIGHT_CTL ) ); // 32 pt rSubtitleSet.Put(SvxUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE )); @@ -439,14 +439,14 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo rSubtitleSet.Put(SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR )); rSubtitleSet.Put(SvxAdjustItem(SVX_ADJUST_CENTER, EE_PARA_JUST )); rSubtitleSet.Put( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) ); -// rSubtitleSet.Put( SfxUInt16Item(EE_PARA_BULLETSTATE, 0) ); +// rSubtitleSet.Put( SfxUInt16Item(EE_PARA_BULLETSTATE, 0) ); // #i16874# enable kerning by default but only for new documents rSubtitleSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) ); aSvxLRSpaceItem.SetTxtLeft(0); rSubtitleSet.Put(aSvxLRSpaceItem); Font aTmpFont( GetBulletFont() ); - aTmpFont.SetSize(Size(0, 1129)); // 32 pt + aTmpFont.SetSize(Size(0, 1129)); // 32 pt PutNumBulletItem( pSheet, aTmpFont ); } @@ -475,7 +475,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo rNotesSet.Put( SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT ) ); rNotesSet.Put( SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CJK ) ); rNotesSet.Put( SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CTL ) ); - rNotesSet.Put( SvxFontHeightItem( 705, 100, EE_CHAR_FONTHEIGHT ) ); // 20 pt + rNotesSet.Put( SvxFontHeightItem( 705, 100, EE_CHAR_FONTHEIGHT ) ); // 20 pt rNotesSet.Put( SvxFontHeightItem( 705, 100, EE_CHAR_FONTHEIGHT_CJK ) ); // 20 pt rNotesSet.Put( SvxFontHeightItem( SdDrawDocument::convertFontHeightToCTL( 705 ), 100, EE_CHAR_FONTHEIGHT_CTL ) ); // 20 pt rNotesSet.Put( SvxUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE ) ); @@ -486,7 +486,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo rNotesSet.Put( SvxEmphasisMarkItem(EMPHASISMARK_NONE, EE_CHAR_EMPHASISMARK ) ); rNotesSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF) ); rNotesSet.Put( SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR ) ); -// rNotesSet.Put( SfxUInt16Item(EE_PARA_BULLETSTATE, 0) ); +// rNotesSet.Put( SfxUInt16Item(EE_PARA_BULLETSTATE, 0) ); rNotesSet.Put( SvxLRSpaceItem( 0, 0, 600, -600, EE_PARA_LRSPACE ) ); // #i16874# enable kerning by default but only for new documents rNotesSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) ); @@ -518,7 +518,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo SfxItemSet& rBackgroundObjectsSet = pSheet->GetItemSet(); rBackgroundObjectsSet.Put(SdrShadowItem(FALSE)); rBackgroundObjectsSet.Put(SdrShadowColorItem(String(), Color(COL_GRAY))); - rBackgroundObjectsSet.Put(SdrShadowXDistItem(300)); // 3 mm Schattendistanz + rBackgroundObjectsSet.Put(SdrShadowXDistItem(300)); // 3 mm Schattendistanz rBackgroundObjectsSet.Put(SdrShadowYDistItem(300)); // #i16874# enable kerning by default but only for new documents rBackgroundObjectsSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) ); @@ -552,7 +552,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo |* Graphik-StyleSheets aus dem Quellpool in diesen Pool kopieren |* |* (rSourcePool kann nicht const sein, weil SfxStyleSheetPoolBase::Find -|* nicht const ist) +|* nicht const ist) |* \************************************************************************/ @@ -575,7 +575,7 @@ void SdStyleSheetPool::CopyTableStyles(SdStyleSheetPool& rSourcePool) if( xSource.is() && xFactory.is() && mxTableFamily.is() ) { for( sal_Int32 nIndex = 0; nIndex < xSource->getCount(); nIndex++ ) try - { + { Reference< XStyle > xSourceTableStyle( xSource->getByIndex( nIndex ), UNO_QUERY ); if( xSourceTableStyle.is() ) { @@ -674,7 +674,7 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily |* StyleSheets gefuellt. |* |* (rSourcePool kann nicht const sein, weil SfxStyleSheetPoolBase::Find -|* nicht const ist) +|* nicht const ist) |* \************************************************************************/ @@ -903,33 +903,33 @@ void SdStyleSheetPool::UpdateStdNames() if( !pStyle->IsUserDefined() ) { - String aOldName = pStyle->GetName(); - ULONG nHelpId = pStyle->GetHelpId( aHelpFile ); - SfxStyleFamily eFam = pStyle->GetFamily(); + String aOldName = pStyle->GetName(); + ULONG nHelpId = pStyle->GetHelpId( aHelpFile ); + SfxStyleFamily eFam = pStyle->GetFamily(); BOOL bHelpKnown = TRUE; String aNewName; USHORT nNameId = 0; switch( nHelpId ) { - case HID_STANDARD_STYLESHEET_NAME: nNameId = STR_STANDARD_STYLESHEET_NAME; break; - case HID_POOLSHEET_OBJWITHARROW: nNameId = STR_POOLSHEET_OBJWITHARROW; break; - case HID_POOLSHEET_OBJWITHSHADOW: nNameId = STR_POOLSHEET_OBJWITHSHADOW; break; - case HID_POOLSHEET_OBJWITHOUTFILL: nNameId = STR_POOLSHEET_OBJWITHOUTFILL; break; - case HID_POOLSHEET_TEXT: nNameId = STR_POOLSHEET_TEXT; break; - case HID_POOLSHEET_TEXTBODY: nNameId = STR_POOLSHEET_TEXTBODY; break; + case HID_STANDARD_STYLESHEET_NAME: nNameId = STR_STANDARD_STYLESHEET_NAME; break; + case HID_POOLSHEET_OBJWITHARROW: nNameId = STR_POOLSHEET_OBJWITHARROW; break; + case HID_POOLSHEET_OBJWITHSHADOW: nNameId = STR_POOLSHEET_OBJWITHSHADOW; break; + case HID_POOLSHEET_OBJWITHOUTFILL: nNameId = STR_POOLSHEET_OBJWITHOUTFILL; break; + case HID_POOLSHEET_TEXT: nNameId = STR_POOLSHEET_TEXT; break; + case HID_POOLSHEET_TEXTBODY: nNameId = STR_POOLSHEET_TEXTBODY; break; case HID_POOLSHEET_TEXTBODY_JUSTIFY:nNameId = STR_POOLSHEET_TEXTBODY_JUSTIFY;break; - case HID_POOLSHEET_TEXTBODY_INDENT: nNameId = STR_POOLSHEET_TEXTBODY_INDENT;break; - case HID_POOLSHEET_TITLE: nNameId = STR_POOLSHEET_TITLE; break; - case HID_POOLSHEET_TITLE1: nNameId = STR_POOLSHEET_TITLE1; break; - case HID_POOLSHEET_TITLE2: nNameId = STR_POOLSHEET_TITLE2; break; - case HID_POOLSHEET_HEADLINE: nNameId = STR_POOLSHEET_HEADLINE; break; - case HID_POOLSHEET_HEADLINE1: nNameId = STR_POOLSHEET_HEADLINE1; break; - case HID_POOLSHEET_HEADLINE2: nNameId = STR_POOLSHEET_HEADLINE2; break; - case HID_POOLSHEET_MEASURE: nNameId = STR_POOLSHEET_MEASURE; break; - - case HID_PSEUDOSHEET_TITLE: nNameId = STR_PSEUDOSHEET_TITLE; break; - case HID_PSEUDOSHEET_SUBTITLE: nNameId = STR_PSEUDOSHEET_SUBTITLE; break; + case HID_POOLSHEET_TEXTBODY_INDENT: nNameId = STR_POOLSHEET_TEXTBODY_INDENT;break; + case HID_POOLSHEET_TITLE: nNameId = STR_POOLSHEET_TITLE; break; + case HID_POOLSHEET_TITLE1: nNameId = STR_POOLSHEET_TITLE1; break; + case HID_POOLSHEET_TITLE2: nNameId = STR_POOLSHEET_TITLE2; break; + case HID_POOLSHEET_HEADLINE: nNameId = STR_POOLSHEET_HEADLINE; break; + case HID_POOLSHEET_HEADLINE1: nNameId = STR_POOLSHEET_HEADLINE1; break; + case HID_POOLSHEET_HEADLINE2: nNameId = STR_POOLSHEET_HEADLINE2; break; + case HID_POOLSHEET_MEASURE: nNameId = STR_POOLSHEET_MEASURE; break; + + case HID_PSEUDOSHEET_TITLE: nNameId = STR_PSEUDOSHEET_TITLE; break; + case HID_PSEUDOSHEET_SUBTITLE: nNameId = STR_PSEUDOSHEET_SUBTITLE; break; case HID_PSEUDOSHEET_OUTLINE1: case HID_PSEUDOSHEET_OUTLINE2: case HID_PSEUDOSHEET_OUTLINE3: @@ -938,17 +938,17 @@ void SdStyleSheetPool::UpdateStdNames() case HID_PSEUDOSHEET_OUTLINE6: case HID_PSEUDOSHEET_OUTLINE7: case HID_PSEUDOSHEET_OUTLINE8: - case HID_PSEUDOSHEET_OUTLINE9: nNameId = STR_PSEUDOSHEET_OUTLINE; break; - case HID_PSEUDOSHEET_BACKGROUNDOBJECTS: nNameId = STR_PSEUDOSHEET_BACKGROUNDOBJECTS; break; - case HID_PSEUDOSHEET_BACKGROUND: nNameId = STR_PSEUDOSHEET_BACKGROUND; break; - case HID_PSEUDOSHEET_NOTES: nNameId = STR_PSEUDOSHEET_NOTES; break; - - case HID_SD_CELL_STYLE_DEFAULT: nNameId = STR_STANDARD_STYLESHEET_NAME; break; - case HID_SD_CELL_STYLE_BANDED: nNameId = STR_POOLSHEET_BANDED_CELL; break; - case HID_SD_CELL_STYLE_HEADER: nNameId = STR_POOLSHEET_HEADER; break; - case HID_SD_CELL_STYLE_TOTAL: nNameId = STR_POOLSHEET_TOTAL; break; - case HID_SD_CELL_STYLE_FIRST_COLUMN: nNameId = STR_POOLSHEET_FIRST_COLUMN; break; - case HID_SD_CELL_STYLE_LAST_COLUMN: nNameId = STR_POOLSHEET_LAST_COLUMN; break; + case HID_PSEUDOSHEET_OUTLINE9: nNameId = STR_PSEUDOSHEET_OUTLINE; break; + case HID_PSEUDOSHEET_BACKGROUNDOBJECTS: nNameId = STR_PSEUDOSHEET_BACKGROUNDOBJECTS; break; + case HID_PSEUDOSHEET_BACKGROUND: nNameId = STR_PSEUDOSHEET_BACKGROUND; break; + case HID_PSEUDOSHEET_NOTES: nNameId = STR_PSEUDOSHEET_NOTES; break; + + case HID_SD_CELL_STYLE_DEFAULT: nNameId = STR_STANDARD_STYLESHEET_NAME; break; + case HID_SD_CELL_STYLE_BANDED: nNameId = STR_POOLSHEET_BANDED_CELL; break; + case HID_SD_CELL_STYLE_HEADER: nNameId = STR_POOLSHEET_HEADER; break; + case HID_SD_CELL_STYLE_TOTAL: nNameId = STR_POOLSHEET_TOTAL; break; + case HID_SD_CELL_STYLE_FIRST_COLUMN: nNameId = STR_POOLSHEET_FIRST_COLUMN; break; + case HID_SD_CELL_STYLE_LAST_COLUMN: nNameId = STR_POOLSHEET_LAST_COLUMN; break; default: // 0 oder falsche (alte) HelpId @@ -973,7 +973,7 @@ void SdStyleSheetPool::UpdateStdNames() if ( !pSheetFound ) { // Sheet existiert noch nicht: Altes Sheet wird umbenannt - pStyle->SetName( aNewName ); // setzt auch Parents um + pStyle->SetName( aNewName ); // setzt auch Parents um } else { @@ -1130,7 +1130,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet, aNumberFormat.SetFirstLineOffset(nFirstLineOffset); nFontSize = (USHORT)((nFontSize * 2540L) / 72); // Pt --> 1/100 mm - rBulletFont.SetSize(Size(0,846)); // 24 pt + rBulletFont.SetSize(Size(0,846)); // 24 pt aNumberFormat.SetBulletFont(&rBulletFont); aNumRule.SetLevel( i, aNumberFormat ); } @@ -1258,7 +1258,7 @@ Any SAL_CALL SdStyleSheetPool::getByName( const OUString& aName ) throw(NoSuchEl Sequence< OUString > SAL_CALL SdStyleSheetPool::getElementNames() throw(RuntimeException) { throwIfDisposed(); - + Sequence< OUString > aNames( maStyleFamilyMap.size() + 3 ); OUString* pNames = aNames.getArray(); @@ -1385,7 +1385,7 @@ void SAL_CALL SdStyleSheetPool::dispose() throw (RuntimeException) { } -// EndListening( *mpDoc ); +// EndListening( *mpDoc ); mpDoc = 0; Clear(); diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 7e090d0e9a98..151b7bf28f5e 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,16 +78,16 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::drawing; -#define WID_STYLE_DISPNAME 7998 -#define WID_STYLE_FAMILY 7999 +#define WID_STYLE_DISPNAME 7998 +#define WID_STYLE_FAMILY 7999 static SvxItemPropertySet& GetStylePropertySet() { static const SfxItemPropertyMapEntry aFullPropertyMap_Impl[] = { - { RTL_CONSTASCII_STRINGPARAM("Family"), WID_STYLE_FAMILY, &::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0}, - { RTL_CONSTASCII_STRINGPARAM("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, &XNameContainer::static_type(), 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("DisplayName"), WID_STYLE_DISPNAME, &::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0}, + { RTL_CONSTASCII_STRINGPARAM("Family"), WID_STYLE_FAMILY, &::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0}, + { RTL_CONSTASCII_STRINGPARAM("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, &XNameContainer::static_type(), 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("DisplayName"), WID_STYLE_DISPNAME, &::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0}, SVX_UNOEDIT_NUMBERING_PROPERTIE, SHADOW_PROPERTIES @@ -153,7 +153,7 @@ SdStyleSheet::SdStyleSheet( const SdStyleSheet & r ) SdStyleSheet::~SdStyleSheet() { delete pSet; - pSet = NULL; // damit nachfolgende Destruktoren eine Chance haben + pSet = NULL; // damit nachfolgende Destruktoren eine Chance haben } void SdStyleSheet::SetApiName( const OUString& rApiName ) @@ -248,20 +248,20 @@ SfxItemSet& SdStyleSheet::GetItemSet() // ggfs. das ItemSet 'on demand' anlegen if (!pSet) { - USHORT nWhichPairTable[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST, - XATTR_FILL_FIRST, XATTR_FILL_LAST, + USHORT nWhichPairTable[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST, + XATTR_FILL_FIRST, XATTR_FILL_LAST, - SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, - SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_CONTOURFRAME, + SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, + SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_CONTOURFRAME, - SDRATTR_TEXT_WORDWRAP, SDRATTR_TEXT_AUTOGROWSIZE, + SDRATTR_TEXT_WORDWRAP, SDRATTR_TEXT_AUTOGROWSIZE, - SDRATTR_EDGE_FIRST, SDRATTR_EDGE_LAST, - SDRATTR_MEASURE_FIRST, SDRATTR_MEASURE_LAST, + SDRATTR_EDGE_FIRST, SDRATTR_EDGE_LAST, + SDRATTR_MEASURE_FIRST, SDRATTR_MEASURE_LAST, - EE_PARA_START, EE_CHAR_END, + EE_PARA_START, EE_CHAR_END, - SDRATTR_XMLATTRIBUTES, SDRATTR_TEXT_USEFIXEDCELLHEIGHT, + SDRATTR_XMLATTRIBUTES, SDRATTR_TEXT_USEFIXEDCELLHEIGHT, SDRATTR_3D_FIRST, SDRATTR_3D_LAST, 0, 0 }; @@ -276,18 +276,18 @@ SfxItemSet& SdStyleSheet::GetItemSet() { if (!pSet) { - USHORT nWhichPairTable[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST, - XATTR_FILL_FIRST, XATTR_FILL_LAST, + USHORT nWhichPairTable[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST, + XATTR_FILL_FIRST, XATTR_FILL_LAST, - SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, - SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_CONTOURFRAME, + SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, + SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_CONTOURFRAME, - SDRATTR_TEXT_WORDWRAP, SDRATTR_TEXT_AUTOGROWSIZE, + SDRATTR_TEXT_WORDWRAP, SDRATTR_TEXT_AUTOGROWSIZE, - EE_PARA_START, EE_CHAR_END, + EE_PARA_START, EE_CHAR_END, - SDRATTR_TABLE_FIRST, SDRATTR_TABLE_LAST, - SDRATTR_XMLATTRIBUTES, SDRATTR_XMLATTRIBUTES, + SDRATTR_TABLE_FIRST, SDRATTR_TABLE_LAST, + SDRATTR_XMLATTRIBUTES, SDRATTR_XMLATTRIBUTES, 0, 0 }; @@ -319,14 +319,14 @@ SfxItemSet& SdStyleSheet::GetItemSet() SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_CONTOURFRAME, - SDRATTR_TEXT_WORDWRAP, SDRATTR_TEXT_AUTOGROWSIZE, + SDRATTR_TEXT_WORDWRAP, SDRATTR_TEXT_AUTOGROWSIZE, SDRATTR_EDGE_FIRST, SDRATTR_EDGE_LAST, SDRATTR_MEASURE_FIRST, SDRATTR_MEASURE_LAST, EE_PARA_START, EE_CHAR_END, - SDRATTR_XMLATTRIBUTES, SDRATTR_TEXT_USEFIXEDCELLHEIGHT, + SDRATTR_XMLATTRIBUTES, SDRATTR_TEXT_USEFIXEDCELLHEIGHT, SDRATTR_3D_FIRST, SDRATTR_3D_LAST, 0, 0 }; @@ -342,7 +342,7 @@ SfxItemSet& SdStyleSheet::GetItemSet() /************************************************************************* |* |* IsUsed(), eine Vorlage gilt als benutzt, wenn sie von eingefuegten Objekten -|* oder von benutzten Vorlagen referenziert wird +|* oder von benutzten Vorlagen referenziert wird |* \************************************************************************/ @@ -409,7 +409,7 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const ::sd::DrawViewShell* pDrawViewShell = 0; - ::sd::ViewShellBase* pBase = dynamic_cast< ::sd::ViewShellBase* >( SfxViewShell::Current() ); + ::sd::ViewShellBase* pBase = dynamic_cast< ::sd::ViewShellBase* >( SfxViewShell::Current() ); if( pBase ) pDrawViewShell = dynamic_cast< ::sd::DrawViewShell* >( pBase->GetMainViewShell().get() ); @@ -682,31 +682,31 @@ void SdStyleSheet::SetHelpId( const String& r, ULONG nId ) static struct ApiNameMap { const sal_Char* mpApiName; - sal_uInt32 mnApiNameLength; - sal_uInt32 mnHelpId; + sal_uInt32 mnApiNameLength; + sal_uInt32 mnHelpId; } pApiNameMap[] = { - { RTL_CONSTASCII_STRINGPARAM( "title" ), HID_PSEUDOSHEET_TITLE }, - { RTL_CONSTASCII_STRINGPARAM( "subtitle" ), HID_PSEUDOSHEET_SUBTITLE }, - { RTL_CONSTASCII_STRINGPARAM( "background" ), HID_PSEUDOSHEET_BACKGROUND }, + { RTL_CONSTASCII_STRINGPARAM( "title" ), HID_PSEUDOSHEET_TITLE }, + { RTL_CONSTASCII_STRINGPARAM( "subtitle" ), HID_PSEUDOSHEET_SUBTITLE }, + { RTL_CONSTASCII_STRINGPARAM( "background" ), HID_PSEUDOSHEET_BACKGROUND }, { RTL_CONSTASCII_STRINGPARAM( "backgroundobjects" ),HID_PSEUDOSHEET_BACKGROUNDOBJECTS }, - { RTL_CONSTASCII_STRINGPARAM( "notes" ), HID_PSEUDOSHEET_NOTES }, - { RTL_CONSTASCII_STRINGPARAM( "standard" ), HID_STANDARD_STYLESHEET_NAME }, - { RTL_CONSTASCII_STRINGPARAM( "objectwitharrow" ), HID_POOLSHEET_OBJWITHARROW }, - { RTL_CONSTASCII_STRINGPARAM( "objectwithshadow" ), HID_POOLSHEET_OBJWITHSHADOW }, + { RTL_CONSTASCII_STRINGPARAM( "notes" ), HID_PSEUDOSHEET_NOTES }, + { RTL_CONSTASCII_STRINGPARAM( "standard" ), HID_STANDARD_STYLESHEET_NAME }, + { RTL_CONSTASCII_STRINGPARAM( "objectwitharrow" ), HID_POOLSHEET_OBJWITHARROW }, + { RTL_CONSTASCII_STRINGPARAM( "objectwithshadow" ), HID_POOLSHEET_OBJWITHSHADOW }, { RTL_CONSTASCII_STRINGPARAM( "objectwithoutfill" ),HID_POOLSHEET_OBJWITHOUTFILL }, - { RTL_CONSTASCII_STRINGPARAM( "text" ), HID_POOLSHEET_TEXT }, - { RTL_CONSTASCII_STRINGPARAM( "textbody" ), HID_POOLSHEET_TEXTBODY }, - { RTL_CONSTASCII_STRINGPARAM( "textbodyjustfied" ), HID_POOLSHEET_TEXTBODY_JUSTIFY }, - { RTL_CONSTASCII_STRINGPARAM( "textbodyindent" ), HID_POOLSHEET_TEXTBODY_INDENT }, - { RTL_CONSTASCII_STRINGPARAM( "title" ), HID_POOLSHEET_TITLE }, - { RTL_CONSTASCII_STRINGPARAM( "title1" ), HID_POOLSHEET_TITLE1 }, - { RTL_CONSTASCII_STRINGPARAM( "title2" ), HID_POOLSHEET_TITLE2 }, - { RTL_CONSTASCII_STRINGPARAM( "headline" ), HID_POOLSHEET_HEADLINE }, - { RTL_CONSTASCII_STRINGPARAM( "headline1" ), HID_POOLSHEET_HEADLINE1 }, - { RTL_CONSTASCII_STRINGPARAM( "headline2" ), HID_POOLSHEET_HEADLINE2 }, - { RTL_CONSTASCII_STRINGPARAM( "measure" ), HID_POOLSHEET_MEASURE }, + { RTL_CONSTASCII_STRINGPARAM( "text" ), HID_POOLSHEET_TEXT }, + { RTL_CONSTASCII_STRINGPARAM( "textbody" ), HID_POOLSHEET_TEXTBODY }, + { RTL_CONSTASCII_STRINGPARAM( "textbodyjustfied" ), HID_POOLSHEET_TEXTBODY_JUSTIFY }, + { RTL_CONSTASCII_STRINGPARAM( "textbodyindent" ), HID_POOLSHEET_TEXTBODY_INDENT }, + { RTL_CONSTASCII_STRINGPARAM( "title" ), HID_POOLSHEET_TITLE }, + { RTL_CONSTASCII_STRINGPARAM( "title1" ), HID_POOLSHEET_TITLE1 }, + { RTL_CONSTASCII_STRINGPARAM( "title2" ), HID_POOLSHEET_TITLE2 }, + { RTL_CONSTASCII_STRINGPARAM( "headline" ), HID_POOLSHEET_HEADLINE }, + { RTL_CONSTASCII_STRINGPARAM( "headline1" ), HID_POOLSHEET_HEADLINE1 }, + { RTL_CONSTASCII_STRINGPARAM( "headline2" ), HID_POOLSHEET_HEADLINE2 }, + { RTL_CONSTASCII_STRINGPARAM( "measure" ), HID_POOLSHEET_MEASURE }, { 0, 0, 0 } }; @@ -1113,7 +1113,7 @@ void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, con if( pEntry->nWID == WID_STYLE_FAMILY ) throw PropertyVetoException(); - + if( (pEntry->nWID == EE_PARA_NUMBULLET) && (GetFamily() == SD_STYLE_FAMILY_MASTERPAGE) ) { String aStr; @@ -1136,8 +1136,8 @@ void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, con } throw IllegalArgumentException(); } - - SfxItemSet aSet( GetPool().GetPool(), pEntry->nWID, pEntry->nWID); + + SfxItemSet aSet( GetPool().GetPool(), pEntry->nWID, pEntry->nWID); aSet.Put( rStyleSet ); if( !aSet.Count() ) @@ -1231,12 +1231,12 @@ Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) thro } else { - SfxItemSet aSet( GetPool().GetPool(), pEntry->nWID, pEntry->nWID); + SfxItemSet aSet( GetPool().GetPool(), pEntry->nWID, pEntry->nWID); const SfxPoolItem* pItem; SfxItemSet& rStyleSet = GetItemSet(); - if( rStyleSet.GetItemState( pEntry->nWID, sal_True, &pItem ) == SFX_ITEM_SET ) + if( rStyleSet.GetItemState( pEntry->nWID, sal_True, &pItem ) == SFX_ITEM_SET ) aSet.Put( *pItem ); if( !aSet.Count() ) @@ -1246,7 +1246,7 @@ Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) thro return aAny; // Hole Wert aus ItemSet - aAny = SvxItemPropertySet_getPropertyValue( GetStylePropertySet(),pEntry, aSet ); + aAny = SvxItemPropertySet_getPropertyValue( GetStylePropertySet(),pEntry, aSet ); } if( *pEntry->pType != aAny.getValueType() ) @@ -1327,13 +1327,13 @@ PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyN case SFX_ITEM_DEFAULT: eState = PropertyState_DEFAULT_VALUE; break; -// case SFX_ITEM_DONTCARE: -// case SFX_ITEM_DISABLED: +// case SFX_ITEM_DONTCARE: +// case SFX_ITEM_DISABLED: default: eState = PropertyState_AMBIGUOUS_VALUE; break; } - + // if a item is set, this doesn't mean we want it :) if( ( PropertyState_DIRECT_VALUE == eState ) ) { @@ -1351,7 +1351,7 @@ PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyN if( ( pItem == NULL ) || ( pItem->GetName().Len() == 0) ) eState = PropertyState_DEFAULT_VALUE; } - } + } } return eState; @@ -1415,7 +1415,7 @@ Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName ) t const SfxItemPropertySimpleEntry* pEntry = getPropertyMapEntry( aPropertyName ); if( pEntry == NULL ) throw UnknownPropertyException(); - Any aRet; + Any aRet; if( pEntry->nWID == WID_STYLE_FAMILY ) { aRet <<= GetFamilyString(nFamily); @@ -1431,7 +1431,7 @@ Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName ) t else { SfxItemPool& rMyPool = GetPool().GetPool(); - SfxItemSet aSet( rMyPool, pEntry->nWID, pEntry->nWID); + SfxItemSet aSet( rMyPool, pEntry->nWID, pEntry->nWID); aSet.Put( rMyPool.GetDefaultItem( pEntry->nWID ) ); aRet = SvxItemPropertySet_getPropertyValue( GetStylePropertySet(), pEntry, aSet ); } diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx index ab6c69ee8fdc..8aff0cebebbb 100755 --- a/sd/source/core/text/textapi.cxx +++ b/sd/source/core/text/textapi.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,8 +59,8 @@ public: virtual void Redo(); protected: - OutlinerParaObject* mpOldText; - OutlinerParaObject* mpNewText; + OutlinerParaObject* mpOldText; + OutlinerParaObject* mpNewText; rtl::Reference< TextApiObject > mxTextObj; }; @@ -82,8 +82,8 @@ void UndoTextAPIChanged::Undo() { if( !mpNewText ) mpNewText = mxTextObj->CreateText(); - - mxTextObj->SetText( *mpOldText ); + + mxTextObj->SetText( *mpOldText ); } void UndoTextAPIChanged::Redo() @@ -94,32 +94,32 @@ void UndoTextAPIChanged::Redo() } } -struct TextAPIEditSource_Impl +struct TextAPIEditSource_Impl { // needed for "internal" refcounting - SdDrawDocument* mpDoc; - Outliner* mpOutliner; - SvxOutlinerForwarder* mpTextForwarder; - sal_Int32 mnRef; + SdDrawDocument* mpDoc; + Outliner* mpOutliner; + SvxOutlinerForwarder* mpTextForwarder; + sal_Int32 mnRef; }; class TextAPIEditSource : public SvxEditSource { TextAPIEditSource_Impl* pImpl; - virtual SvxEditSource* Clone() const; - virtual SvxTextForwarder* GetTextForwarder(); - virtual void UpdateData(); - explicit TextAPIEditSource( const TextAPIEditSource& rSource ); + virtual SvxEditSource* Clone() const; + virtual SvxTextForwarder* GetTextForwarder(); + virtual void UpdateData(); + explicit TextAPIEditSource( const TextAPIEditSource& rSource ); public: TextAPIEditSource(SdDrawDocument* pDoc); - virtual ~TextAPIEditSource(); + virtual ~TextAPIEditSource(); - void Dispose(); - void SetText( OutlinerParaObject& rText ); + void Dispose(); + void SetText( OutlinerParaObject& rText ); OutlinerParaObject* CreateText(); - String GetText(); + String GetText(); SdDrawDocument* GetDoc() { return pImpl->mpDoc; } }; @@ -131,10 +131,10 @@ const SvxItemPropertySet* ImplGetSdTextPortionPropertyMap() SVX_UNOEDIT_FONT_PROPERTIES, SVX_UNOEDIT_OUTLINER_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, - {MAP_CHAR_LEN("TextField"), EE_FEATURE_FIELD, &::getCppuType((const Reference< XTextField >*)0), PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const Reference< XNameContainer >*)0) , 0, 0}, - {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const Reference< XNameContainer >*)0) , 0, 0}, + {MAP_CHAR_LEN("TextField"), EE_FEATURE_FIELD, &::getCppuType((const Reference< XTextField >*)0), PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const Reference< XNameContainer >*)0) , 0, 0}, + {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const Reference< XNameContainer >*)0) , 0, 0}, {0,0,0,0,0,0} }; static SvxItemPropertySet aSdTextPortionPropertyMap( aSdTextPortionPropertyEntries, SdrObject::GetGlobalDrawObjectItemPool() ); @@ -181,9 +181,9 @@ void TextApiObject::SetText( OutlinerParaObject& rText ) SdrModel* pModel = mpSource->GetDoc(); if( pModel && pModel->IsUndoEnabled() ) pModel->AddUndo( new UndoTextAPIChanged( *pModel, this ) ); - + mpSource->SetText( rText ); - maSelection.nStartPara = 0xffff; + maSelection.nStartPara = 0xffff; } String TextApiObject::GetText() @@ -272,7 +272,7 @@ void TextAPIEditSource::SetText( OutlinerParaObject& rText ) pImpl->mpOutliner = new Outliner( pImpl->mpDoc, OUTLINERMODE_TEXTOBJECT ); pImpl->mpDoc->SetCalcFieldValueHdl( pImpl->mpOutliner ); } - + pImpl->mpOutliner->SetText( rText ); } } diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx index fb5939e21dd3..f812dca6739c 100644 --- a/sd/source/core/typemap.cxx +++ b/sd/source/core/typemap.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -98,30 +98,30 @@ #include <svl/lckbitem.hxx> -#define CharSetItem SfxUInt16Item -#define FontFamilyItem SfxUInt16Item -#define FontPitchItem SfxUInt16Item -#define FontAlignItem SfxUInt16Item -#define FontWeightItem SfxUInt16Item -#define FontUnderlineItem SfxUInt16Item -#define FontStrikeoutItem SfxUInt16Item -#define FontItalicItem SfxUInt16Item -#define SvxDbTypeItem SfxUInt16Item -#define SvxLineSpaceItem SfxUInt16Item -#define SvxInterLineSpaceItem SfxUInt16Item -#define SvxBreakItem SfxUInt16Item -#define BrushStyleItem SfxUInt16Item -#define SvxNumTypeItem SfxUInt16Item -#define SvxShadowLocationItem SfxUInt16Item -#define SvxDbTypeItem SfxUInt16Item -//#define SvxChooseControlEnumItem SfxUInt16Item -#define SvxDrawToolEnumItem SfxUInt16Item -#define SvxChooseControlItem SfxEnumItem -#define SvxDrawToolItem SfxUInt16Item -#define SvxCellHorJustifyEnumItem SfxUInt16Item -#define SvxCellVerJustifyEnumItem SfxUInt16Item -#define SvxCellOrientationEnumItem SfxUInt16Item -#define SvxLanguage SfxUInt16Item +#define CharSetItem SfxUInt16Item +#define FontFamilyItem SfxUInt16Item +#define FontPitchItem SfxUInt16Item +#define FontAlignItem SfxUInt16Item +#define FontWeightItem SfxUInt16Item +#define FontUnderlineItem SfxUInt16Item +#define FontStrikeoutItem SfxUInt16Item +#define FontItalicItem SfxUInt16Item +#define SvxDbTypeItem SfxUInt16Item +#define SvxLineSpaceItem SfxUInt16Item +#define SvxInterLineSpaceItem SfxUInt16Item +#define SvxBreakItem SfxUInt16Item +#define BrushStyleItem SfxUInt16Item +#define SvxNumTypeItem SfxUInt16Item +#define SvxShadowLocationItem SfxUInt16Item +#define SvxDbTypeItem SfxUInt16Item +//#define SvxChooseControlEnumItem SfxUInt16Item +#define SvxDrawToolEnumItem SfxUInt16Item +#define SvxChooseControlItem SfxEnumItem +#define SvxDrawToolItem SfxUInt16Item +#define SvxCellHorJustifyEnumItem SfxUInt16Item +#define SvxCellVerJustifyEnumItem SfxUInt16Item +#define SvxCellOrientationEnumItem SfxUInt16Item +#define SvxLanguage SfxUInt16Item //#define SfxLockBytesItem SfxPoolItem #define OfaStringListItem SfxStringListItem #define avmedia_MediaItem ::avmedia::MediaItem diff --git a/sd/source/core/undo/undofactory.cxx b/sd/source/core/undo/undofactory.cxx index 54a186e80198..f9b2e7b4fd28 100644 --- a/sd/source/core/undo/undofactory.cxx +++ b/sd/source/core/undo/undofactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/core/undo/undomanager.cxx b/sd/source/core/undo/undomanager.cxx index f3fe9b11c2bd..ecb36ef0727c 100644 --- a/sd/source/core/undo/undomanager.cxx +++ b/sd/source/core/undo/undomanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/core/undo/undoobjects.cxx b/sd/source/core/undo/undoobjects.cxx index ef47e7da2bae..64243972773d 100644 --- a/sd/source/core/undo/undoobjects.cxx +++ b/sd/source/core/undo/undoobjects.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -252,10 +252,10 @@ void UndoObjectSetText::Redo() // Undo for SdrObject::SetUserCall() UndoObjectUserCall::UndoObjectUserCall(SdrObject& rObject) -: SdrUndoObj(rObject) -, mpOldUserCall((SdPage*)rObject.GetUserCall()) -, mpNewUserCall(0) -, mxSdrObject( &rObject ) +: SdrUndoObj(rObject) +, mpOldUserCall((SdPage*)rObject.GetUserCall()) +, mpNewUserCall(0) +, mxSdrObject( &rObject ) { } @@ -286,11 +286,11 @@ void UndoObjectUserCall::Redo() // Undo for SdPage::InsertPresObj() and SdPage::RemovePresObj() UndoObjectPresentationKind::UndoObjectPresentationKind(SdrObject& rObject) -: SdrUndoObj(rObject) -, meOldKind(PRESOBJ_NONE) -, meNewKind(PRESOBJ_NONE) -, mxPage( rObject.GetPage() ) -, mxSdrObject( &rObject ) +: SdrUndoObj(rObject) +, meOldKind(PRESOBJ_NONE) +, meNewKind(PRESOBJ_NONE) +, mxPage( rObject.GetPage() ) +, mxSdrObject( &rObject ) { DBG_ASSERT( mxPage.is(), "sd::UndoObjectPresentationKind::UndoObjectPresentationKind(), does not work for shapes without a slide!" ); diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx index 525b1311faba..e6878f8aae84 100644 --- a/sd/source/core/undoanim.cxx +++ b/sd/source/core/undoanim.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ struct UndoAnimationImpl SdPage* mpPage; Reference< XAnimationNode > mxOldNode; Reference< XAnimationNode > mxNewNode; - bool mbNewNodeSet; + bool mbNewNodeSet; }; UndoAnimation::UndoAnimation( SdDrawDocument* pDoc, SdPage* pThePage ) @@ -86,7 +86,7 @@ void UndoAnimation::Undo() if( !mpImpl->mbNewNodeSet ) { if( mpImpl->mpPage->mxAnimationNode.is() ) - mpImpl->mxNewNode.set( ::sd::Clone( mpImpl->mpPage->mxAnimationNode ) ); + mpImpl->mxNewNode.set( ::sd::Clone( mpImpl->mpPage->mxAnimationNode ) ); mpImpl->mbNewNodeSet = true; } @@ -127,7 +127,7 @@ String UndoAnimation::GetComment() const struct UndoAnimationPathImpl { SdPage* mpPage; - sal_Int32 mnEffectOffset; + sal_Int32 mnEffectOffset; ::rtl::OUString msUndoPath; ::rtl::OUString msRedoPath; diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index 7d28e5285f40..6655dc5ad85d 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,16 +44,16 @@ // - Defines - // ----------- -#define CGM_IMPORT_CGM 0x00000001 -#define CGM_IMPORT_IM 0x00000002 +#define CGM_IMPORT_CGM 0x00000001 +#define CGM_IMPORT_IM 0x00000002 -#define CGM_EXPORT_IMPRESS 0x00000100 -#define CGM_EXPORT_META 0x00000200 -#define CGM_EXPORT_COMMENT 0x00000400 +#define CGM_EXPORT_IMPRESS 0x00000100 +#define CGM_EXPORT_META 0x00000200 +#define CGM_EXPORT_COMMENT 0x00000400 -#define CGM_NO_PAD_BYTE 0x00010000 -#define CGM_BIG_ENDIAN 0x00020000 -#define CGM_LITTLE_ENDIAN 0x00040000 +#define CGM_NO_PAD_BYTE 0x00010000 +#define CGM_BIG_ENDIAN 0x00020000 +#define CGM_LITTLE_ENDIAN 0x00040000 // -------------- // - Namespaces - @@ -90,26 +90,26 @@ SdCGMFilter::~SdCGMFilter() sal_Bool SdCGMFilter::Import() { ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); - sal_Bool bRet = sal_False; + sal_Bool bRet = sal_False; if( pLibrary && mxModel.is() ) { - ImportCGM FncImportCGM = reinterpret_cast< ImportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii( "ImportCGM" ) ) ); - ::rtl::OUString aFileURL( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); - UINT32 nRetValue; + ImportCGM FncImportCGM = reinterpret_cast< ImportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii( "ImportCGM" ) ) ); + ::rtl::OUString aFileURL( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); + UINT32 nRetValue; if( mrDocument.GetPageCount() == 0L ) mrDocument.CreateFirstPages(); CreateStatusIndicator(); nRetValue = FncImportCGM( aFileURL, mxModel, CGM_IMPORT_CGM | CGM_BIG_ENDIAN | CGM_EXPORT_IMPRESS, mxStatusIndicator ); - + if( nRetValue ) { bRet = TRUE; - - if( ( nRetValue &~0xff000000 ) != 0xffffff ) // maybe the backgroundcolor is already white - { // so we must not set a master page + + if( ( nRetValue &~0xff000000 ) != 0xffffff ) // maybe the backgroundcolor is already white + { // so we must not set a master page mrDocument.StopWorkStartupDelay(); SdPage* pSdPage = mrDocument.GetMasterSdPage(0, PK_STANDARD); @@ -134,7 +134,7 @@ sal_Bool SdCGMFilter::Import() sal_Bool SdCGMFilter::Export() { ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); - sal_Bool bRet = sal_False; + sal_Bool bRet = sal_False; if( pLibrary && mxModel.is() ) { diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 2a40c8707866..2ed890a3e129 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -78,45 +78,45 @@ #define PPT_TRANSITION_TYPE_SPLIT 13 // effects, new in xp -#define PPT_TRANSITION_TYPE_DIAMOND 17 -#define PPT_TRANSITION_TYPE_PLUS 18 -#define PPT_TRANSITION_TYPE_WEDGE 19 -#define PPT_TRANSITION_TYPE_PUSH 20 -#define PPT_TRANSITION_TYPE_COMB 21 -#define PPT_TRANSITION_TYPE_NEWSFLASH 22 -#define PPT_TRANSITION_TYPE_SMOOTHFADE 23 -#define PPT_TRANSITION_TYPE_WHEEL 26 -#define PPT_TRANSITION_TYPE_CIRCLE 27 +#define PPT_TRANSITION_TYPE_DIAMOND 17 +#define PPT_TRANSITION_TYPE_PLUS 18 +#define PPT_TRANSITION_TYPE_WEDGE 19 +#define PPT_TRANSITION_TYPE_PUSH 20 +#define PPT_TRANSITION_TYPE_COMB 21 +#define PPT_TRANSITION_TYPE_NEWSFLASH 22 +#define PPT_TRANSITION_TYPE_SMOOTHFADE 23 +#define PPT_TRANSITION_TYPE_WHEEL 26 +#define PPT_TRANSITION_TYPE_CIRCLE 27 using namespace com::sun::star; static PHLayout pPHLayout[] = { - { EPP_LAYOUT_TITLESLIDE, { 0x0d, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x10, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, TRUE, TRUE }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, FALSE, FALSE, FALSE }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x14, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x15, 0x0d, 0x0e, TRUE, FALSE, FALSE }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, FALSE, FALSE }, - { EPP_LAYOUT_RIGHTCOLUMN2ROWS, { 0x0d, 0x0e, 0x13, 0x13, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_LEFTCOLUMN2ROWS, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_TOPROW2COLUMN, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_4OBJECTS, { 0x0d, 0x13, 0x13, 0x13, 0x13, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, FALSE, FALSE }, - { EPP_LAYOUT_ONLYTITLE, { 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, FALSE, FALSE }, - { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, FALSE, FALSE, FALSE }, + { EPP_LAYOUT_TITLESLIDE, { 0x0d, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x10, TRUE, TRUE, FALSE }, + { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, TRUE, FALSE }, + { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, TRUE, TRUE }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE }, + { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, FALSE, FALSE, FALSE }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, TRUE, TRUE, FALSE }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x14, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE }, + { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x15, 0x0d, 0x0e, TRUE, FALSE, FALSE }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, TRUE, TRUE, FALSE }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE }, + { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, FALSE, FALSE }, + { EPP_LAYOUT_RIGHTCOLUMN2ROWS, { 0x0d, 0x0e, 0x13, 0x13, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE }, + { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE }, + { EPP_LAYOUT_LEFTCOLUMN2ROWS, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE }, + { EPP_LAYOUT_TOPROW2COLUMN, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE }, + { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE }, + { EPP_LAYOUT_4OBJECTS, { 0x0d, 0x13, 0x13, 0x13, 0x13, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, FALSE, FALSE }, + { EPP_LAYOUT_ONLYTITLE, { 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, FALSE, FALSE }, + { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, FALSE, FALSE, FALSE }, { EPP_LAYOUT_TITLERIGHT2BODIESLEFT, { 0x11, 0x12, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x11, 0x12, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_TITLERIGHTBODYLEFT, { 0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x11, 0x12, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x12, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x12, TRUE, TRUE, FALSE } + { EPP_LAYOUT_TITLERIGHTBODYLEFT, { 0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x11, 0x12, TRUE, TRUE, FALSE }, + { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x12, TRUE, TRUE, FALSE }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x12, TRUE, TRUE, FALSE } }; //============================ PPTWriter ================================== @@ -126,7 +126,7 @@ PPTWriter::PPTWriter( SvStorageRef& rSvStorage, ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > & rXStatInd, SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags ) : mbStatus ( sal_False ), - mbUseNewAnimations ( sal_True ), + mbUseNewAnimations ( sal_True ), mnLatestStatValue ( 0 ), maFraction ( 1, 576 ), maMapModeSrc ( MAP_100TH_MM ), @@ -539,13 +539,13 @@ sal_Bool PPTWriter::ImplCreateDocument() mpPptEscherEx->PtInsert( EPP_Persist_Document, mpStrm->Tell() ); - mpPptEscherEx->OpenContainer( EPP_HeadersFooters, 3 ); //Master footer (default) + mpPptEscherEx->OpenContainer( EPP_HeadersFooters, 3 ); //Master footer (default) mpPptEscherEx->AddAtom( 4, EPP_HeadersFootersAtom ); *mpStrm << (sal_uInt32)0x25000d; if ( ImplGetPageByIndex( 0, MASTER ) ) ImplCreateHeaderFooterStrings( *mpStrm, mXPagePropSet ); mpPptEscherEx->CloseContainer(); - mpPptEscherEx->OpenContainer( EPP_HeadersFooters, 4 ); //NotesMaster footer (default) + mpPptEscherEx->OpenContainer( EPP_HeadersFooters, 4 ); //NotesMaster footer (default) mpPptEscherEx->AddAtom( 4, EPP_HeadersFootersAtom ); *mpStrm << (sal_uInt32)0x3d000d; if ( ImplGetPageByIndex( 0, NOTICE ) ) @@ -558,7 +558,7 @@ sal_Bool PPTWriter::ImplCreateDocument() { mpPptEscherEx->AddAtom( 20, EPP_SlidePersistAtom ); mpPptEscherEx->InsertPersistOffset( EPP_MAINSLIDE_PERSIST_KEY | i, mpStrm->Tell() ); - *mpStrm << (sal_uInt32)0 // psrReference - logical reference to the slide persist object ( EPP_MAINSLIDE_PERSIST_KEY ) + *mpStrm << (sal_uInt32)0 // psrReference - logical reference to the slide persist object ( EPP_MAINSLIDE_PERSIST_KEY ) << (sal_uInt32)4 // flags - only bit 3 used, if set then slide contains shapes other than placeholders << (INT32)0 // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects << (INT32)i + 0x100 // slideId - Unique slide identifier, used for OLE link monikers for example @@ -946,7 +946,7 @@ sal_Bool PPTWriter::ImplCreateMaster( sal_uInt32 nPageNum ) mpPptEscherEx->AddAtom( 24, EPP_SlideAtom, 2 ); *mpStrm << (INT32)EPP_LAYOUT_TITLEANDBODYSLIDE // slide layout -> title and body slide << (sal_uInt8)1 << (sal_uInt8)2 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 // placeholderID - << (sal_uInt32)0 // master ID ( ist gleich null bei einer masterpage ) + << (sal_uInt32)0 // master ID ( ist gleich null bei einer masterpage ) << (sal_uInt32)0 // notes ID ( ist gleich null wenn keine notizen vorhanden ) << (sal_uInt16)0 // Bit 1: Follow master objects, Bit 2: Follow master scheme, Bit 3: Follow master background << (sal_uInt16)0; // padword @@ -1073,14 +1073,14 @@ sal_Bool PPTWriter::ImplCreateMainNotes() mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); mpPptEscherEx->AddShape( ESCHER_ShpInst_Rectangle, 0xc00 ); EscherPropertyContainer aPropOpt; - aPropOpt.AddOpt( ESCHER_Prop_fillColor, 0xffffff ); // stock valued fill color + aPropOpt.AddOpt( ESCHER_Prop_fillColor, 0xffffff ); // stock valued fill color aPropOpt.AddOpt( ESCHER_Prop_fillBackColor, 0 ); aPropOpt.AddOpt( ESCHER_Prop_fillRectRight, 0x68bdde ); aPropOpt.AddOpt( ESCHER_Prop_fillRectBottom, 0x8b9f8e ); aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x120012 ); aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0 ); aPropOpt.AddOpt( ESCHER_Prop_bWMode, ESCHER_wDontShow ); - aPropOpt.AddOpt( ESCHER_Prop_fBackground, 0x10001 ); // if true, this is the background shape + aPropOpt.AddOpt( ESCHER_Prop_fBackground, 0x10001 ); // if true, this is the background shape aPropOpt.Commit( *mpStrm ); mpPptEscherEx->CloseContainer(); // ESCHER_SpContainer @@ -1114,7 +1114,7 @@ static rtl::OUString getInitials( const rtl::OUString& rName ) // take letter if( nLength ) { - sInitials += rtl::OUString( *pStr ); + sInitials += rtl::OUString( *pStr ); nLength--; pStr++; } @@ -1139,7 +1139,7 @@ void ImplExportComments( uno::Reference< drawing::XDrawPage > xPage, SvMemoryStr while( xAnnotationEnumeration->hasMoreElements() ) { - EscherExContainer aComment10( rBinaryTagData10Atom, EPP_Comment10 ); + EscherExContainer aComment10( rBinaryTagData10Atom, EPP_Comment10 ); { uno::Reference< office::XAnnotation > xAnnotation( xAnnotationEnumeration->nextElement() ); @@ -1165,7 +1165,7 @@ void ImplExportComments( uno::Reference< drawing::XDrawPage > xPage, SvMemoryStr rBinaryTagData10Atom << nIndex++ << aDateTime.Year << aDateTime.Month - << aDateTime.Day // todo: day of week + << aDateTime.Day // todo: day of week << aDateTime.Day << aDateTime.Hours << aDateTime.Minutes @@ -1258,8 +1258,8 @@ sal_Bool PPTWriter::ImplCreateSlide( sal_uInt32 nPageNum ) sal_uInt32 nSoundRef = 0; sal_Bool bIsSound = sal_False; - sal_Bool bStopSound = sal_False; - sal_Bool bLoopSound = sal_False; + sal_Bool bStopSound = sal_False; + sal_Bool bLoopSound = sal_False; if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Sound" ) ) ) ) { @@ -1571,7 +1571,7 @@ sal_Bool PPTWriter::ImplCreateSlide( sal_uInt32 nPageNum ) } if ( aBinaryTagData10Atom.Tell() ) { - EscherExContainer aProgTags ( *mpStrm, EPP_ProgTags ); + EscherExContainer aProgTags ( *mpStrm, EPP_ProgTags ); EscherExContainer aProgBinaryTag( *mpStrm, EPP_ProgBinaryTag ); { EscherExAtom aCString( *mpStrm, EPP_CString ); @@ -1595,7 +1595,7 @@ sal_Bool PPTWriter::ImplCreateSlide( sal_uInt32 nPageNum ) sal_uInt32 nmsofbtAnimGroupSize = amsofbtAnimGroup.Tell(); if ( nmsofbtAnimGroupSize ) { - EscherExContainer aProgTags ( *mpStrm, EPP_ProgTags ); + EscherExContainer aProgTags ( *mpStrm, EPP_ProgTags ); EscherExContainer aProgBinaryTag( *mpStrm, EPP_ProgBinaryTag ); { EscherExAtom aCString( *mpStrm, EPP_CString ); @@ -1726,7 +1726,7 @@ void PPTWriter::ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::su nFillColor = mpPptEscherEx->GetColor( *((sal_uInt32*)mAny.getValue()) ); nFillBackColor = nFillColor ^ 0xffffff; } - } // PASSTHROUGH INTENDED + } // PASSTHROUGH INTENDED case ::com::sun::star::drawing::FillStyle_NONE : default: aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x120012 ); @@ -1794,14 +1794,14 @@ void PPTWriter::ImplWriteOLE( sal_uInt32 nCnvrtFlags ) // SJ: #99809# create a dummy content stream, the dummy content is necessary for ppt, but not for // doc files, so we can't share code. SotStorageStreamRef xStm = xCleanStorage->OpenSotStream( aPersistStream, STREAM_STD_READWRITE ); - *xStm << (sal_uInt32)0 // no ClipboardId - << (sal_uInt32)4 // no target device - << (sal_uInt32)1 // aspect ratio - << (sal_Int32)-1 // L-Index - << (sal_uInt32)0 // Advanced Flags - << (sal_uInt32)0 // compression - << (sal_uInt32)0 // Size - << (sal_uInt32)0 // " + *xStm << (sal_uInt32)0 // no ClipboardId + << (sal_uInt32)4 // no target device + << (sal_uInt32)1 // aspect ratio + << (sal_Int32)-1 // L-Index + << (sal_uInt32)0 // Advanced Flags + << (sal_uInt32)0 // compression + << (sal_uInt32)0 // Size + << (sal_uInt32)0 // " << (sal_uInt32)0; pStrm = xCleanStorage->CreateMemoryStream(); } @@ -1827,7 +1827,7 @@ void PPTWriter::ImplWriteOLE( sal_uInt32 nCnvrtFlags ) mpPptEscherEx->BeginAtom(); pStrm->Seek( STREAM_SEEK_TO_END ); sal_uInt32 npStrmSize = pStrm->Tell(); - *mpStrm << npStrmSize; // uncompressed size + *mpStrm << npStrmSize; // uncompressed size #ifdef DBG_EXTRACTOLEOBJECTS SvFileStream aOut( String::CreateFromAscii( "D:\\OUT.OLE" ), STREAM_TRUNC | STREAM_WRITE ); diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index 3d8797beb328..8fadff5b6cfe 100755 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -94,30 +94,30 @@ enum PageType { NORMAL = 0, MASTER = 1, NOTICE = 2, UNDEFINED = 3 }; -#define EPP_MAINMASTER_PERSIST_KEY 0x80010000 -#define EPP_MAINNOTESMASTER_PERSIST_KEY 0x80020000 -#define EPP_MAINSLIDE_PERSIST_KEY 0x80030000 -#define EPP_MAINNOTES_PERSIST_KEY 0x80040000 - -#define EPP_Persist_Document 0x80080000 -#define EPP_Persist_MainMaster 0x80100000 -#define EPP_Persist_MainNotes 0x80200000 -#define EPP_Persist_Slide 0x80400000 -#define EPP_Persist_Notes 0x80800000 -#define EPP_Persist_CurrentPos 0x81000000 -#define EPP_Persist_VBAInfoAtom 0x84000000 -#define EPP_Persist_ExObj 0x88000000 - -#define EPP_TEXTSTYLE_NORMAL 0x00000001 -#define EPP_TEXTSTYLE_TITLE 0x00000010 -#define EPP_TEXTSTYLE_BODY 0x00000100 -#define EPP_TEXTSTYLE_TEXT 0x00001000 +#define EPP_MAINMASTER_PERSIST_KEY 0x80010000 +#define EPP_MAINNOTESMASTER_PERSIST_KEY 0x80020000 +#define EPP_MAINSLIDE_PERSIST_KEY 0x80030000 +#define EPP_MAINNOTES_PERSIST_KEY 0x80040000 + +#define EPP_Persist_Document 0x80080000 +#define EPP_Persist_MainMaster 0x80100000 +#define EPP_Persist_MainNotes 0x80200000 +#define EPP_Persist_Slide 0x80400000 +#define EPP_Persist_Notes 0x80800000 +#define EPP_Persist_CurrentPos 0x81000000 +#define EPP_Persist_VBAInfoAtom 0x84000000 +#define EPP_Persist_ExObj 0x88000000 + +#define EPP_TEXTSTYLE_NORMAL 0x00000001 +#define EPP_TEXTSTYLE_TITLE 0x00000010 +#define EPP_TEXTSTYLE_BODY 0x00000100 +#define EPP_TEXTSTYLE_TEXT 0x00001000 // PLACEMENT_ID #define EPP_LAYOUT_TITLESLIDE 0 /* The slide is a title slide */ #define EPP_LAYOUT_TITLEANDBODYSLIDE 1 /* Title and body slide */ #define EPP_LAYOUT_TITLEMASTERSLIDE 2 /* Title master slide */ -#define EPP_LAYOUT_MASTERSLIDE 3 /* Master slide layout */ +#define EPP_LAYOUT_MASTERSLIDE 3 /* Master slide layout */ #define EPP_LAYOUT_MASTERNOTES 4 /* Master notes layout */ #define EPP_LAYOUT_NOTESTITLEBODY 5 /* Notes title/body layout */ #define EPP_LAYOUT_HANDOUTLAYOUT 6 /* Handout layout, therefore it doesn't have placeholders except header, footer, and date */ @@ -140,42 +140,42 @@ class XStatusIndicatorRef; struct PHLayout { - sal_Int32 nLayout; - sal_uInt8 nPlaceHolder[ 8 ]; + sal_Int32 nLayout; + sal_uInt8 nPlaceHolder[ 8 ]; - sal_uInt8 nUsedObjectPlaceHolder; - sal_uInt8 nTypeOfTitle; - sal_uInt8 nTypeOfOutliner; + sal_uInt8 nUsedObjectPlaceHolder; + sal_uInt8 nTypeOfTitle; + sal_uInt8 nTypeOfOutliner; - BOOL bTitlePossible; - BOOL bOutlinerPossible; - BOOL bSecOutlinerPossible; + BOOL bTitlePossible; + BOOL bOutlinerPossible; + BOOL bSecOutlinerPossible; }; struct SOParagraph { - sal_Bool bExtendedParameters; - sal_uInt32 nParaFlags; - sal_Int16 nBulletFlags; - String sPrefix; - String sSuffix; - String sGraphicUrl; // String auf eine Graphic - Size aBuGraSize; - sal_uInt32 nNumberingType; // in wirlichkeit ist dies ein SvxEnum - sal_uInt32 nHorzAdjust; - sal_uInt32 nBulletColor; - sal_Int32 nBulletOfs; - sal_Int16 nStartWith; // Start der nummerierung - sal_Int16 nTextOfs; - sal_Int16 nBulletRealSize; // GroessenVerhaeltnis in Proz - sal_Int16 nDepth; // aktuelle tiefe - sal_Unicode cBulletId; // wenn Numbering Type == CharSpecial - ::com::sun::star::awt::FontDescriptor aFontDesc; - - sal_Bool bExtendedBulletsUsed; - sal_uInt16 nBulletId; - sal_uInt32 nMappedNumType; - sal_Bool bNumberingIsNumber; + sal_Bool bExtendedParameters; + sal_uInt32 nParaFlags; + sal_Int16 nBulletFlags; + String sPrefix; + String sSuffix; + String sGraphicUrl; // String auf eine Graphic + Size aBuGraSize; + sal_uInt32 nNumberingType; // in wirlichkeit ist dies ein SvxEnum + sal_uInt32 nHorzAdjust; + sal_uInt32 nBulletColor; + sal_Int32 nBulletOfs; + sal_Int16 nStartWith; // Start der nummerierung + sal_Int16 nTextOfs; + sal_Int16 nBulletRealSize; // GroessenVerhaeltnis in Proz + sal_Int16 nDepth; // aktuelle tiefe + sal_Unicode cBulletId; // wenn Numbering Type == CharSpecial + ::com::sun::star::awt::FontDescriptor aFontDesc; + + sal_Bool bExtendedBulletsUsed; + sal_uInt16 nBulletId; + sal_uInt32 nMappedNumType; + sal_Bool bNumberingIsNumber; SOParagraph() { @@ -200,15 +200,15 @@ class PPTExBulletProvider protected : - SvMemoryStream aBuExPictureStream; - SvMemoryStream aBuExOutlineStream; - SvMemoryStream aBuExMasterStream; + SvMemoryStream aBuExPictureStream; + SvMemoryStream aBuExOutlineStream; + SvMemoryStream aBuExMasterStream; - EscherGraphicProvider* pGraphicProv; + EscherGraphicProvider* pGraphicProv; public : - sal_uInt16 GetId( const ByteString& rUniqueId, Size& rGraphicSize ); + sal_uInt16 GetId( const ByteString& rUniqueId, Size& rGraphicSize ); PPTExBulletProvider(); ~PPTExBulletProvider(); @@ -216,20 +216,20 @@ class PPTExBulletProvider struct FontCollectionEntry { - String Name; + String Name; double Scaling; - sal_Int16 Family; - sal_Int16 Pitch; - sal_Int16 CharSet; - + sal_Int16 Family; + sal_Int16 Pitch; + sal_Int16 CharSet; + String Original; sal_Bool bIsConverted; FontCollectionEntry( const String& rName, sal_Int16 nFamily, sal_Int16 nPitch, sal_Int16 nCharSet ) : Scaling ( 1.0 ), - Family ( nFamily ), - Pitch ( nPitch ), - CharSet ( nCharSet ), + Family ( nFamily ), + Pitch ( nPitch ), + CharSet ( nCharSet ), Original( rName ) { ImplInit( rName ); @@ -244,7 +244,7 @@ struct FontCollectionEntry ~FontCollectionEntry(); private : - + FontCollectionEntry() {}; void ImplInit( const String& rName ); @@ -258,16 +258,16 @@ class FontCollection : private List FontCollection(); ~FontCollection(); - short GetScriptDirection( const String& rText ) const; - sal_uInt32 GetId( FontCollectionEntry& rFontDescriptor ); - sal_uInt32 GetCount() const { return List::Count(); }; - const FontCollectionEntry* GetById( sal_uInt32 nId ); - FontCollectionEntry& GetLast() { return *(FontCollectionEntry*)List::Last(); }; + short GetScriptDirection( const String& rText ) const; + sal_uInt32 GetId( FontCollectionEntry& rFontDescriptor ); + sal_uInt32 GetCount() const { return List::Count(); }; + const FontCollectionEntry* GetById( sal_uInt32 nId ); + FontCollectionEntry& GetLast() { return *(FontCollectionEntry*)List::Last(); }; }; // ------------------------------------------------------------------------ -#define PPTEX_STYLESHEETENTRYS 9 +#define PPTEX_STYLESHEETENTRYS 9 enum PPTExTextAttr { @@ -306,64 +306,64 @@ enum PPTExTextAttr struct PPTExCharLevel { - sal_uInt16 mnFlags; - sal_uInt16 mnFont; - sal_uInt16 mnAsianOrComplexFont; - sal_uInt16 mnFontHeight; - sal_uInt16 mnEscapement; - sal_uInt32 mnFontColor; + sal_uInt16 mnFlags; + sal_uInt16 mnFont; + sal_uInt16 mnAsianOrComplexFont; + sal_uInt16 mnFontHeight; + sal_uInt16 mnEscapement; + sal_uInt32 mnFontColor; }; struct PPTExCharSheet { - PPTExCharLevel maCharLevel[ 5 ]; + PPTExCharLevel maCharLevel[ 5 ]; PPTExCharSheet( int nInstance ); - void SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, + void SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, FontCollection& rFontCollection, int nLevel ); - void Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, sal_Bool bFirst, sal_Bool bSimpleText, + void Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, sal_Bool bFirst, sal_Bool bSimpleText, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPagePropSet ); }; struct PPTExParaLevel { - sal_Bool mbIsBullet; - sal_uInt16 mnBulletChar; - sal_uInt16 mnBulletFont; - sal_uInt16 mnBulletHeight; - sal_uInt32 mnBulletColor; - - sal_uInt16 mnAdjust; - sal_uInt16 mnLineFeed; - sal_uInt16 mnUpperDist; - sal_uInt16 mnLowerDist; - sal_uInt16 mnTextOfs; - sal_uInt16 mnBulletOfs; - sal_uInt16 mnDefaultTab; - - sal_Bool mbExtendedBulletsUsed; - sal_uInt16 mnBulletId; - sal_uInt16 mnBulletStart; - sal_uInt32 mnMappedNumType; - sal_uInt32 mnNumberingType; + sal_Bool mbIsBullet; + sal_uInt16 mnBulletChar; + sal_uInt16 mnBulletFont; + sal_uInt16 mnBulletHeight; + sal_uInt32 mnBulletColor; + + sal_uInt16 mnAdjust; + sal_uInt16 mnLineFeed; + sal_uInt16 mnUpperDist; + sal_uInt16 mnLowerDist; + sal_uInt16 mnTextOfs; + sal_uInt16 mnBulletOfs; + sal_uInt16 mnDefaultTab; + + sal_Bool mbExtendedBulletsUsed; + sal_uInt16 mnBulletId; + sal_uInt16 mnBulletStart; + sal_uInt32 mnMappedNumType; + sal_uInt32 mnNumberingType; sal_uInt16 mnAsianSettings; - sal_uInt16 mnBiDi; + sal_uInt16 mnBiDi; }; struct PPTExParaSheet { PPTExBulletProvider& rBuProv; - sal_uInt32 mnInstance; + sal_uInt32 mnInstance; - PPTExParaLevel maParaLevel[ 5 ]; + PPTExParaLevel maParaLevel[ 5 ]; PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBulletProvider& rProv ); - void SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, + void SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, FontCollection& rFontCollection, int nLevel, const PPTExCharLevel& rCharLevel ); - void Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, sal_Bool bFirst, sal_Bool bSimpleText, + void Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, sal_Bool bFirst, sal_Bool bSimpleText, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPagePropSet ); }; @@ -372,8 +372,8 @@ class PPTExStyleSheet public : - PPTExCharSheet* mpCharSheet[ PPTEX_STYLESHEETENTRYS ]; - PPTExParaSheet* mpParaSheet[ PPTEX_STYLESHEETENTRYS ]; + PPTExCharSheet* mpCharSheet[ PPTEX_STYLESHEETENTRYS ]; + PPTExParaSheet* mpParaSheet[ PPTEX_STYLESHEETENTRYS ]; PPTExStyleSheet( sal_uInt16 nDefaultTab, PPTExBulletProvider& rBuProv ); ~PPTExStyleSheet(); @@ -381,51 +381,51 @@ class PPTExStyleSheet PPTExParaSheet& GetParaSheet( int nInstance ) { return *mpParaSheet[ nInstance ]; }; PPTExCharSheet& GetCharSheet( int nInstance ) { return *mpCharSheet[ nInstance ]; }; - void SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, + void SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, FontCollection& rFontCollection, int nInstance, int nLevel ); - sal_Bool IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLevel, PPTExTextAttr eAttr, sal_uInt32 nValue ); + sal_Bool IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLevel, PPTExTextAttr eAttr, sal_uInt32 nValue ); - sal_uInt32 SizeOfTxCFStyleAtom() const; - void WriteTxCFStyleAtom( SvStream& rSt ); + sal_uInt32 SizeOfTxCFStyleAtom() const; + void WriteTxCFStyleAtom( SvStream& rSt ); }; struct EPPTHyperlink { - String aURL; - sal_uInt32 nType; // bit 0-7 : type ( 1: click action to a slide ) - // ( 2: hyperlink url ) + String aURL; + sal_uInt32 nType; // bit 0-7 : type ( 1: click action to a slide ) + // ( 2: hyperlink url ) // bit 8-23: index // bit 31 : hyperlink is attached to a shape EPPTHyperlink( const String rURL, sal_uInt32 nT ) : - aURL ( rURL ), - nType ( nT ){}; + aURL ( rURL ), + nType ( nT ){}; }; enum PPTExOleObjEntryType { - NORMAL_OLE_OBJECT, OCX_CONTROL + NORMAL_OLE_OBJECT, OCX_CONTROL }; struct PPTExOleObjEntry { - PPTExOleObjEntryType eType; - sal_uInt32 nOfsA; // offset to the EPP_ExOleObjAtom in mpExEmbed (set at creation) - sal_uInt32 nOfsB; // offset to the EPP_ExOleObjStg + PPTExOleObjEntryType eType; + sal_uInt32 nOfsA; // offset to the EPP_ExOleObjAtom in mpExEmbed (set at creation) + sal_uInt32 nOfsB; // offset to the EPP_ExOleObjStg - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > xControlModel; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > xControlModel; + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape; PPTExOleObjEntry( PPTExOleObjEntryType eT, sal_uInt32 nOfs ) : - eType ( eT ), - nOfsA ( nOfs ) {}; + eType ( eT ), + nOfsA ( nOfs ) {}; }; struct TextRuleEntry { - int nPageNumber; - SvMemoryStream* pOut; + int nPageNumber; + SvMemoryStream* pOut; TextRuleEntry( int nPg ) : nPageNumber( nPg ), @@ -438,9 +438,9 @@ struct TextRuleEntry struct GroupEntry { - sal_uInt32 mnCurrentPos; - sal_uInt32 mnCount; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > mXIndexAccess; + sal_uInt32 mnCurrentPos; + sal_uInt32 mnCount; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > mXIndexAccess; GroupEntry( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & rIndex ) { mXIndexAccess = rIndex; @@ -461,25 +461,25 @@ class GroupTable { protected: - sal_uInt32 mnIndex; - sal_uInt32 mnCurrentGroupEntry; - sal_uInt32 mnMaxGroupEntry; - sal_uInt32 mnGroupsClosed; - GroupEntry** mpGroupEntry; + sal_uInt32 mnIndex; + sal_uInt32 mnCurrentGroupEntry; + sal_uInt32 mnMaxGroupEntry; + sal_uInt32 mnGroupsClosed; + GroupEntry** mpGroupEntry; - void ImplResizeGroupTable( sal_uInt32 nEntrys ); + void ImplResizeGroupTable( sal_uInt32 nEntrys ); public: - sal_uInt32 GetCurrentGroupIndex() const { return mnIndex; }; - sal_Int32 GetCurrentGroupLevel() const { return mnCurrentGroupEntry - 1; }; + sal_uInt32 GetCurrentGroupIndex() const { return mnIndex; }; + sal_Int32 GetCurrentGroupLevel() const { return mnCurrentGroupEntry - 1; }; ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & GetCurrentGroupAccess() const { return mpGroupEntry[ mnCurrentGroupEntry - 1 ]->mXIndexAccess; }; - sal_uInt32 GetGroupsClosed(); - void ResetGroupTable( sal_uInt32 nCount ); - void ClearGroupTable(); + sal_uInt32 GetGroupsClosed(); + void ResetGroupTable( sal_uInt32 nCount ); + void ClearGroupTable(); sal_Bool EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & rIndex ); - sal_Bool GetNextGroupEntry(); + sal_Bool GetNextGroupEntry(); GroupTable(); ~GroupTable(); }; @@ -488,13 +488,13 @@ class PropValue { protected : - ::com::sun::star::uno::Any mAny; + ::com::sun::star::uno::Any mAny; ::com::sun::star::uno::Reference - < ::com::sun::star::beans::XPropertySet > mXPropSet; + < ::com::sun::star::beans::XPropertySet > mXPropSet; - sal_Bool ImplGetPropertyValue( const String& rString ); - sal_Bool ImplGetPropertyValue( const ::com::sun::star::uno::Reference + sal_Bool ImplGetPropertyValue( const String& rString ); + sal_Bool ImplGetPropertyValue( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &, const String& ); public : @@ -514,11 +514,11 @@ class PropStateValue : public PropValue { protected : - ::com::sun::star::beans::PropertyState ePropState; + ::com::sun::star::beans::PropertyState ePropState; ::com::sun::star::uno::Reference - < ::com::sun::star::beans::XPropertyState > mXPropState; + < ::com::sun::star::beans::XPropertyState > mXPropState; - sal_Bool ImplGetPropertyValue( const String& rString, sal_Bool bGetPropertyState = TRUE ); + sal_Bool ImplGetPropertyValue( const String& rString, sal_Bool bGetPropertyState = TRUE ); }; @@ -532,35 +532,35 @@ class PortionObj : public PropStateValue protected : - void ImplClear(); - void ImplConstruct( const PortionObj& rPortionObj ); - sal_uInt32 ImplGetTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef, + void ImplClear(); + void ImplConstruct( const PortionObj& rPortionObj ); + sal_uInt32 ImplGetTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef, String& rURL ); - sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition ); - void ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue = FALSE ); + sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition ); + void ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue = FALSE ); public : - ::com::sun::star::beans::PropertyState meCharColor; - ::com::sun::star::beans::PropertyState meCharHeight; - ::com::sun::star::beans::PropertyState meFontName; - ::com::sun::star::beans::PropertyState meAsianOrComplexFont; - ::com::sun::star::beans::PropertyState meCharEscapement; - ::com::sun::star::lang::Locale meCharLocale; - sal_uInt16 mnCharAttrHard; + ::com::sun::star::beans::PropertyState meCharColor; + ::com::sun::star::beans::PropertyState meCharHeight; + ::com::sun::star::beans::PropertyState meFontName; + ::com::sun::star::beans::PropertyState meAsianOrComplexFont; + ::com::sun::star::beans::PropertyState meCharEscapement; + ::com::sun::star::lang::Locale meCharLocale; + sal_uInt16 mnCharAttrHard; - sal_uInt32 mnCharColor; - sal_uInt16 mnCharAttr; - sal_uInt16 mnCharHeight; - sal_uInt16 mnFont; - sal_uInt16 mnAsianOrComplexFont; - sal_Int16 mnCharEscapement; + sal_uInt32 mnCharColor; + sal_uInt16 mnCharAttr; + sal_uInt16 mnCharHeight; + sal_uInt16 mnFont; + sal_uInt16 mnAsianOrComplexFont; + sal_Int16 mnCharEscapement; - sal_uInt32 mnTextSize; - sal_Bool mbLastPortion; + sal_uInt32 mnTextSize; + sal_Bool mbLastPortion; - sal_uInt16* mpText; - FieldEntry* mpFieldEntry; + sal_uInt16* mpText; + FieldEntry* mpFieldEntry; PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef, sal_Bool bLast, FontCollection& rFontCollection ); @@ -569,16 +569,16 @@ class PortionObj : public PropStateValue PortionObj( const PortionObj& rPortionObj ); ~PortionObj(); - void Write( SvStream* pStrm, sal_Bool bLast ); - sal_uInt32 Count() const { return mnTextSize; }; + void Write( SvStream* pStrm, sal_Bool bLast ); + sal_uInt32 Count() const { return mnTextSize; }; - PortionObj& operator=( const PortionObj& rPortionObj ); + PortionObj& operator=( const PortionObj& rPortionObj ); }; struct ParaFlags { - sal_Bool bFirstParagraph : 1; - sal_Bool bLastParagraph : 1; + sal_Bool bFirstParagraph : 1; + sal_Bool bLastParagraph : 1; ParaFlags() { bFirstParagraph = TRUE; bLastParagraph = FALSE; }; }; @@ -588,43 +588,43 @@ class ParagraphObj : public List, public PropStateValue, public SOParagraph friend class TextObj; friend struct PPTExParaSheet; - MapMode maMapModeSrc; - MapMode maMapModeDest; + MapMode maMapModeSrc; + MapMode maMapModeDest; protected : - void ImplConstruct( const ParagraphObj& rParagraphObj ); - void ImplClear(); - sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition ); - void ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue = FALSE ); - void ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue = FALSE ); + void ImplConstruct( const ParagraphObj& rParagraphObj ); + void ImplClear(); + sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition ); + void ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue = FALSE ); + void ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue = FALSE ); public : ::com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > maTabStop; - sal_uInt32 mnTextSize; - - sal_Bool mbIsBullet; - sal_Bool mbFirstParagraph; - sal_Bool mbLastParagraph; - - ::com::sun::star::beans::PropertyState meBullet; - ::com::sun::star::beans::PropertyState meTextAdjust; - ::com::sun::star::beans::PropertyState meLineSpacing; - ::com::sun::star::beans::PropertyState meLineSpacingTop; - ::com::sun::star::beans::PropertyState meLineSpacingBottom; - ::com::sun::star::beans::PropertyState meForbiddenRules; - ::com::sun::star::beans::PropertyState meParagraphPunctation; - ::com::sun::star::beans::PropertyState meBiDi; - - sal_uInt16 mnTextAdjust; - sal_Int16 mnLineSpacing; - sal_Int16 mnLineSpacingTop; - sal_Int16 mnLineSpacingBottom; - sal_Bool mbForbiddenRules; - sal_Bool mbParagraphPunctation; - sal_uInt16 mnBiDi; + sal_uInt32 mnTextSize; + + sal_Bool mbIsBullet; + sal_Bool mbFirstParagraph; + sal_Bool mbLastParagraph; + + ::com::sun::star::beans::PropertyState meBullet; + ::com::sun::star::beans::PropertyState meTextAdjust; + ::com::sun::star::beans::PropertyState meLineSpacing; + ::com::sun::star::beans::PropertyState meLineSpacingTop; + ::com::sun::star::beans::PropertyState meLineSpacingBottom; + ::com::sun::star::beans::PropertyState meForbiddenRules; + ::com::sun::star::beans::PropertyState meParagraphPunctation; + ::com::sun::star::beans::PropertyState meBiDi; + + sal_uInt16 mnTextAdjust; + sal_Int16 mnLineSpacing; + sal_Int16 mnLineSpacingTop; + sal_Int16 mnLineSpacingBottom; + sal_Bool mbForbiddenRules; + sal_Bool mbParagraphPunctation; + sal_uInt16 mnBiDi; ParagraphObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & rXTextContentRef, ParaFlags, FontCollection& rFontCollection, @@ -633,23 +633,23 @@ class ParagraphObj : public List, public PropStateValue, public SOParagraph ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef, PPTExBulletProvider& rBuProv ); - void CalculateGraphicBulletSize( sal_uInt16 nFontHeight ); + void CalculateGraphicBulletSize( sal_uInt16 nFontHeight ); ~ParagraphObj(); - void Write( SvStream* pStrm ); - sal_uInt32 Count() const { return mnTextSize; }; + void Write( SvStream* pStrm ); + sal_uInt32 Count() const { return mnTextSize; }; - ParagraphObj& operator=( const ParagraphObj& rParagraphObj ); + ParagraphObj& operator=( const ParagraphObj& rParagraphObj ); }; struct ImplTextObj { - sal_uInt32 mnRefCount; - sal_uInt32 mnTextSize; - int mnInstance; - List* mpList; - sal_Bool mbHasExtendedBullets; - sal_Bool mbFixedCellHeightUsed; + sal_uInt32 mnRefCount; + sal_uInt32 mnTextSize; + int mnInstance; + List* mpList; + sal_Bool mbHasExtendedBullets; + sal_Bool mbFixedCellHeightUsed; ImplTextObj( int nInstance ); ~ImplTextObj(); @@ -657,8 +657,8 @@ struct ImplTextObj class TextObj { - mutable ImplTextObj* mpImplTextObj; - void ImplCalculateTextPositions(); + mutable ImplTextObj* mpImplTextObj; + void ImplCalculateTextPositions(); public : TextObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XSimpleText > & @@ -666,172 +666,172 @@ class TextObj TextObj( const TextObj& rTextObj ); ~TextObj(); - void Write( SvStream* pStrm ); + void Write( SvStream* pStrm ); - ParagraphObj* First(){ return (ParagraphObj*)mpImplTextObj->mpList->First(); }; - ParagraphObj* Next(){ return(ParagraphObj*)mpImplTextObj->mpList->Next(); }; - sal_uInt32 Count() const { return mpImplTextObj->mnTextSize; }; - int GetInstance() const { return mpImplTextObj->mnInstance; }; - sal_Bool HasExtendedBullets(){ return mpImplTextObj->mbHasExtendedBullets; }; - void WriteTextSpecInfo( SvStream* pStrm ); + ParagraphObj* First(){ return (ParagraphObj*)mpImplTextObj->mpList->First(); }; + ParagraphObj* Next(){ return(ParagraphObj*)mpImplTextObj->mpList->Next(); }; + sal_uInt32 Count() const { return mpImplTextObj->mnTextSize; }; + int GetInstance() const { return mpImplTextObj->mnInstance; }; + sal_Bool HasExtendedBullets(){ return mpImplTextObj->mbHasExtendedBullets; }; + void WriteTextSpecInfo( SvStream* pStrm ); - TextObj& operator=( TextObj& rTextObj ); + TextObj& operator=( TextObj& rTextObj ); }; // ------------------------------------------------------------------------ struct CellBorder; class PPTWriter : public GroupTable, public PropValue, public PPTExBulletProvider { - sal_Bool mbStatus; - sal_Bool mbUseNewAnimations; - sal_uInt32 mnStatMaxValue; - sal_uInt32 mnLatestStatValue; - std::vector< PPTExStyleSheet* > maStyleSheetList; - PPTExStyleSheet* mpStyleSheet; - - EscherGraphicProvider* mpGraphicProvider; - Fraction maFraction; - MapMode maMapModeSrc; - MapMode maMapModeDest; - ::com::sun::star::awt::Size maDestPageSize; - ::com::sun::star::awt::Size maNotesPageSize; - PageType meLatestPageType; - List maSlideNameList; - - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mXModel; - ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > mXStatusIndicator; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPagesSupplier > mXDrawPagesSupplier; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XMasterPagesSupplier > mXMasterPagesSupplier; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > mXDrawPages; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > mXDrawPage; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mXPagePropSet; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mXBackgroundPropSet; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mXShapes; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mXShape; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XSimpleText > mXText; // TextRef des globalen Text - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > mXCursor; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > mXCursorText; // TextRef des Teilstuecks des Cursors - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mXCursorPropSet; // die Properties des Teilstueckes - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField > mXTextField; - ::com::sun::star::awt::Size maSize; - ::com::sun::star::awt::Point maPosition; - Rectangle maRect; - ByteString mType; - sal_Bool mbPresObj; - sal_Bool mbEmptyPresObj; - sal_Bool mbStatusIndicator; - sal_Int32 mnAngle; - sal_uInt32 mnTextStyle; - - sal_Bool mbFontIndependentLineSpacing; - sal_uInt32 mnTextSize; - - SvStorageRef mrStg; - SvStorageStream* mpCurUserStrm; - SvStorageStream* mpStrm; - SvStorageStream* mpPicStrm; - PptEscherEx* mpPptEscherEx; - - List maExOleObj; - sal_uInt32 mnVBAOleOfs; - SvMemoryStream* mpVBA; - sal_uInt32 mnExEmbed; - SvMemoryStream* mpExEmbed; - - sal_uInt32 mnPages; // anzahl einzelner Slides ( ohne masterpages & notes & handout ) - sal_uInt32 mnMasterPages; // - sal_uInt32 mnDrawings; // anzahl Slides + masterpages + notes + handout - sal_uInt32 mnPagesWritten; - sal_uInt32 mnUniqueSlideIdentifier; - sal_uInt32 mnTxId; // Identifier determined by the HOST (PP) ???? - sal_uInt32 mnDiaMode; // 0 -> manuell + sal_Bool mbStatus; + sal_Bool mbUseNewAnimations; + sal_uInt32 mnStatMaxValue; + sal_uInt32 mnLatestStatValue; + std::vector< PPTExStyleSheet* > maStyleSheetList; + PPTExStyleSheet* mpStyleSheet; + + EscherGraphicProvider* mpGraphicProvider; + Fraction maFraction; + MapMode maMapModeSrc; + MapMode maMapModeDest; + ::com::sun::star::awt::Size maDestPageSize; + ::com::sun::star::awt::Size maNotesPageSize; + PageType meLatestPageType; + List maSlideNameList; + + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mXModel; + ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > mXStatusIndicator; + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPagesSupplier > mXDrawPagesSupplier; + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XMasterPagesSupplier > mXMasterPagesSupplier; + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > mXDrawPages; + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > mXDrawPage; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mXPagePropSet; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mXBackgroundPropSet; + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mXShapes; + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mXShape; + ::com::sun::star::uno::Reference< ::com::sun::star::text::XSimpleText > mXText; // TextRef des globalen Text + ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > mXCursor; + ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > mXCursorText; // TextRef des Teilstuecks des Cursors + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mXCursorPropSet; // die Properties des Teilstueckes + ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField > mXTextField; + ::com::sun::star::awt::Size maSize; + ::com::sun::star::awt::Point maPosition; + Rectangle maRect; + ByteString mType; + sal_Bool mbPresObj; + sal_Bool mbEmptyPresObj; + sal_Bool mbStatusIndicator; + sal_Int32 mnAngle; + sal_uInt32 mnTextStyle; + + sal_Bool mbFontIndependentLineSpacing; + sal_uInt32 mnTextSize; + + SvStorageRef mrStg; + SvStorageStream* mpCurUserStrm; + SvStorageStream* mpStrm; + SvStorageStream* mpPicStrm; + PptEscherEx* mpPptEscherEx; + + List maExOleObj; + sal_uInt32 mnVBAOleOfs; + SvMemoryStream* mpVBA; + sal_uInt32 mnExEmbed; + SvMemoryStream* mpExEmbed; + + sal_uInt32 mnPages; // anzahl einzelner Slides ( ohne masterpages & notes & handout ) + sal_uInt32 mnMasterPages; // + sal_uInt32 mnDrawings; // anzahl Slides + masterpages + notes + handout + sal_uInt32 mnPagesWritten; + sal_uInt32 mnUniqueSlideIdentifier; + sal_uInt32 mnTxId; // Identifier determined by the HOST (PP) ???? + sal_uInt32 mnDiaMode; // 0 -> manuell // 1 -> halbautomatisch // 2 -> automatisch - sal_uInt32 mnShapeMasterTitle; - sal_uInt32 mnShapeMasterBody; - - List maHyperlink; - - FontCollection maFontCollection; - ppt::ExSoundCollection maSoundCollection; + sal_uInt32 mnShapeMasterTitle; + sal_uInt32 mnShapeMasterBody; - PHLayout& ImplGetLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const; - void ImplWriteExtParaHeader( SvMemoryStream& rSt, sal_uInt32 nRef, sal_uInt32 nInstance, sal_uInt32 nSlideId ); + List maHyperlink; + FontCollection maFontCollection; + ppt::ExSoundCollection maSoundCollection; + + PHLayout& ImplGetLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const; + void ImplWriteExtParaHeader( SvMemoryStream& rSt, sal_uInt32 nRef, sal_uInt32 nInstance, sal_uInt32 nSlideId ); + - sal_uInt32 ImplProgBinaryTag( SvStream* pOutStrm = NULL ); - sal_uInt32 ImplProgBinaryTagContainer( SvStream* pOutStrm = NULL, SvMemoryStream* pBinTag = NULL ); - sal_uInt32 ImplProgTagContainer( SvStream* pOutStrm = NULL, SvMemoryStream* pBinTag = NULL ); - sal_uInt32 ImplOutlineViewInfoContainer( SvStream* pOutStrm = NULL ); - sal_uInt32 ImplSlideViewInfoContainer( sal_uInt32 nInstance, SvStream* pOutStrm = NULL ); - sal_uInt32 ImplVBAInfoContainer( SvStream* pOutStrm = NULL ); - sal_uInt32 ImplDocumentListContainer( SvStream* pOutStrm = NULL ); - sal_uInt32 ImplMasterSlideListContainer( SvStream* pOutStrm = NULL ); + sal_uInt32 ImplProgBinaryTag( SvStream* pOutStrm = NULL ); + sal_uInt32 ImplProgBinaryTagContainer( SvStream* pOutStrm = NULL, SvMemoryStream* pBinTag = NULL ); + sal_uInt32 ImplProgTagContainer( SvStream* pOutStrm = NULL, SvMemoryStream* pBinTag = NULL ); + sal_uInt32 ImplOutlineViewInfoContainer( SvStream* pOutStrm = NULL ); + sal_uInt32 ImplSlideViewInfoContainer( sal_uInt32 nInstance, SvStream* pOutStrm = NULL ); + sal_uInt32 ImplVBAInfoContainer( SvStream* pOutStrm = NULL ); + sal_uInt32 ImplDocumentListContainer( SvStream* pOutStrm = NULL ); + sal_uInt32 ImplMasterSlideListContainer( SvStream* pOutStrm = NULL ); public: - static void WriteCString( SvStream&, const String&, sal_uInt32 nInstance = 0 ); + static void WriteCString( SvStream&, const String&, sal_uInt32 nInstance = 0 ); protected: - sal_Bool ImplCreateDocumentSummaryInformation( sal_uInt32 nCnvrtFlags ); - sal_Bool ImplCreateCurrentUserStream(); - void ImplCreateHeaderFooterStrings( SvStream& rOut, + sal_Bool ImplCreateDocumentSummaryInformation( sal_uInt32 nCnvrtFlags ); + sal_Bool ImplCreateCurrentUserStream(); + void ImplCreateHeaderFooterStrings( SvStream& rOut, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet ); - void ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet ); - sal_Bool ImplCreateDocument(); - sal_Bool ImplCreateHyperBlob( SvMemoryStream& rStream ); - sal_uInt32 ImplInsertBookmarkURL( const String& rBookmark, const sal_uInt32 nType, + void ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet ); + sal_Bool ImplCreateDocument(); + sal_Bool ImplCreateHyperBlob( SvMemoryStream& rStream ); + sal_uInt32 ImplInsertBookmarkURL( const String& rBookmark, const sal_uInt32 nType, const String& rStringVer0, const String& rStringVer1, const String& rStringVer2, const String& rStringVer3 ); - sal_Bool ImplCreateMaster( sal_uInt32 nPageNum ); - sal_Bool ImplCreateMainNotes(); - sal_Bool ImplCreateSlide( sal_uInt32 nPageNum ); - sal_Bool ImplCreateNotes( sal_uInt32 nPageNum ); - void ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXBackgroundPropSet ); - void ImplWriteVBA( SvMemoryStream* pVBA ); - void ImplWriteOLE( sal_uInt32 nCnvrtFlags ); - sal_Bool ImplWriteAtomEnding(); - - sal_Bool ImplInitSOIface(); - sal_Bool ImplSetCurrentStyleSheet( sal_uInt32 nPageNum ); - sal_Bool ImplGetPageByIndex( sal_uInt32 nIndex, PageType ); - sal_Bool ImplGetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup = FALSE ); - sal_uInt32 ImplGetMasterIndex( PageType ePageType ); - void ImplFlipBoundingBox( EscherPropertyContainer& rPropOpt ); - sal_Bool ImplGetText(); - sal_Bool ImplCreatePresentationPlaceholder( const sal_Bool bMaster, const PageType PageType, + sal_Bool ImplCreateMaster( sal_uInt32 nPageNum ); + sal_Bool ImplCreateMainNotes(); + sal_Bool ImplCreateSlide( sal_uInt32 nPageNum ); + sal_Bool ImplCreateNotes( sal_uInt32 nPageNum ); + void ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXBackgroundPropSet ); + void ImplWriteVBA( SvMemoryStream* pVBA ); + void ImplWriteOLE( sal_uInt32 nCnvrtFlags ); + sal_Bool ImplWriteAtomEnding(); + + sal_Bool ImplInitSOIface(); + sal_Bool ImplSetCurrentStyleSheet( sal_uInt32 nPageNum ); + sal_Bool ImplGetPageByIndex( sal_uInt32 nIndex, PageType ); + sal_Bool ImplGetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup = FALSE ); + sal_uInt32 ImplGetMasterIndex( PageType ePageType ); + void ImplFlipBoundingBox( EscherPropertyContainer& rPropOpt ); + sal_Bool ImplGetText(); + sal_Bool ImplCreatePresentationPlaceholder( const sal_Bool bMaster, const PageType PageType, const sal_uInt32 StyleInstance, const sal_uInt8 PlaceHolderId ); - sal_Bool ImplGetEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, + sal_Bool ImplGetEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, ::com::sun::star::presentation::AnimationEffect& eEffect, ::com::sun::star::presentation::AnimationEffect& eTextEffect, - sal_Bool& bHasSound ); - void ImplWriteObjectEffect( SvStream& rSt, + sal_Bool& bHasSound ); + void ImplWriteObjectEffect( SvStream& rSt, ::com::sun::star::presentation::AnimationEffect eEffect, ::com::sun::star::presentation::AnimationEffect eTextEffect, sal_uInt16 nOrder ); - void ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentation::ClickAction eAction, sal_Bool bMediaClickAction ); - sal_Bool ImplGetStyleSheets(); - void ImplWriteParagraphs( SvStream& rOutStrm, TextObj& rTextObj ); - void ImplWritePortions( SvStream& rOutStrm, TextObj& rTextObj ); - void ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_uInt32 nAtomInstance, + void ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentation::ClickAction eAction, sal_Bool bMediaClickAction ); + sal_Bool ImplGetStyleSheets(); + void ImplWriteParagraphs( SvStream& rOutStrm, TextObj& rTextObj ); + void ImplWritePortions( SvStream& rOutStrm, TextObj& rTextObj ); + void ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_uInt32 nAtomInstance, TextRuleEntry* pTextRule, SvStream& rExtBu, EscherPropertyContainer* ); - void ImplAdjustFirstLineLineSpacing( TextObj& rTextObj, EscherPropertyContainer& rPropOpt ); - void ImplCreateShape( sal_uInt32 nType, sal_uInt32 nFlags, EscherSolverContainer& ); - void ImplCreateTextShape( EscherPropertyContainer&, EscherSolverContainer&, sal_Bool bFill ); + void ImplAdjustFirstLineLineSpacing( TextObj& rTextObj, EscherPropertyContainer& rPropOpt ); + void ImplCreateShape( sal_uInt32 nType, sal_uInt32 nFlags, EscherSolverContainer& ); + void ImplCreateTextShape( EscherPropertyContainer&, EscherSolverContainer&, sal_Bool bFill ); - void ImplWritePage( const PHLayout& rLayout, + void ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& rSolver, PageType ePageType, sal_Bool bMaster, int nPageNumber = 0 ); - void ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 ); - void ImplCreateTable( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rXShape, EscherSolverContainer& aSolverContainer, + void ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 ); + void ImplCreateTable( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rXShape, EscherSolverContainer& aSolverContainer, EscherPropertyContainer& aPropOpt ); - ::com::sun::star::awt::Point ImplMapPoint( const ::com::sun::star::awt::Point& ); - ::com::sun::star::awt::Size ImplMapSize( const ::com::sun::star::awt::Size& ); - Rectangle ImplMapRectangle( const ::com::sun::star::awt::Rectangle& ); + ::com::sun::star::awt::Point ImplMapPoint( const ::com::sun::star::awt::Point& ); + ::com::sun::star::awt::Size ImplMapSize( const ::com::sun::star::awt::Size& ); + Rectangle ImplMapRectangle( const ::com::sun::star::awt::Rectangle& ); - sal_Bool ImplCloseDocument(); // die font-, hyper-, Soundliste wird geschrieben .. + sal_Bool ImplCloseDocument(); // die font-, hyper-, Soundliste wird geschrieben .. public: PPTWriter( SvStorageRef& rSvStorage, @@ -841,7 +841,7 @@ class PPTWriter : public GroupTable, public PropValue, public PPTExBulletProvide ~PPTWriter(); - sal_Bool IsValid() const { return mbStatus; }; + sal_Bool IsValid() const { return mbStatus; }; }; diff --git a/sd/source/filter/eppt/epptdef.hxx b/sd/source/filter/eppt/epptdef.hxx index 7d23fee19344..f4f651aef09f 100644 --- a/sd/source/filter/eppt/epptdef.hxx +++ b/sd/source/filter/eppt/epptdef.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include <tools/solar.h> -#define EPP_FLAG_CONTAINER 0x0F // If the version field of a record +#define EPP_FLAG_CONTAINER 0x0F // If the version field of a record // header takes on this value, the // record header marks the start of // a container. @@ -54,7 +54,7 @@ #define EPP_Notes 1008 #define EPP_NotesAtom 1009 #define EPP_Environment 1010 -#define EPP_SlidePersistAtom 1011 //0x03F3 +#define EPP_SlidePersistAtom 1011 //0x03F3 #define EPP_Scheme 1012 #define EPP_SchemeAtom 1013 #define EPP_DocViewInfo 1014 @@ -100,8 +100,8 @@ #define EPP_ColorSchemeAtom 2032 // these atoms first was seen in ppt2000 in a private Tag atom -#define EPP_PST_ExtendedBuGraContainer 2040 // consist of 4041 -#define EPP_PST_ExtendedBuGraAtom 2041 // the instance of this atom indices the current graphic +#define EPP_PST_ExtendedBuGraContainer 2040 // consist of 4041 +#define EPP_PST_ExtendedBuGraAtom 2041 // the instance of this atom indices the current graphic #define EPP_OEShape 3008 #define EPP_ExObjRefAtom 3009 @@ -128,13 +128,13 @@ #define EPP_DefaultRulerAtom 4011 // these atoms first was seen in ppt2000 in a private Tag atom -#define EPP_PST_ExtendedParagraphAtom 4012 -#define EPP_PST_ExtendedParagraphMasterAtom 4013 -#define EPP_PST_ExtendedPresRuleContainer 4014 // consist of 4012, 4015, -#define EPP_PST_ExtendedParagraphHeaderAtom 4015 // the instance of this atom indices the current presobj +#define EPP_PST_ExtendedParagraphAtom 4012 +#define EPP_PST_ExtendedParagraphMasterAtom 4013 +#define EPP_PST_ExtendedPresRuleContainer 4014 // consist of 4012, 4015, +#define EPP_PST_ExtendedParagraphHeaderAtom 4015 // the instance of this atom indices the current presobj // the first UINT32 in this atom indices the current slideId -#define EPP_FontEnityAtom 4023 +#define EPP_FontEnityAtom 4023 #define EPP_FontEmbedData 4024 #define EPP_TypeFace 4025 #define EPP_CString 4026 @@ -176,7 +176,7 @@ #define EPP_ExSubscriptionSection 4077 #define EPP_ExControl 4078 #define EPP_ExControlAtom 4091 -#define EPP_SlideListWithText 4080 // 0x0FF0 +#define EPP_SlideListWithText 4080 // 0x0FF0 #define EPP_AnimationInfoAtom 4081 #define EPP_InteractiveInfo 4082 #define EPP_InteractiveInfoAtom 4083 @@ -211,53 +211,53 @@ #define EPP_GscalingAtom 10001 #define EPP_GrColorAtom 10002 #define EPP_GLPointAtom 10003 -#define EPP_Comment10 12000 -#define EPP_CommentAtom10 12001 +#define EPP_Comment10 12000 +#define EPP_CommentAtom10 12001 -#define EPP_PLACEHOLDER_NONE 0 // 0 None -#define EPP_PLACEHOLDER_MASTERTITLE 1 // 1 Master title -#define EPP_PLACEHOLDER_MASTERBODY 2 // 2 Master body -#define EPP_PLACEHOLDER_MASTERCENTEREDTITLE 3 // 3 Master centered title -#define EPP_PLACEHOLDER_MASTERSUBTITLE 4 // 10 Master subtitle -#define EPP_PLACEHOLDER_MASTERNOTESSLIDEIMAGE 5 // 4 Master notes slide image -#define EPP_PLACEHOLDER_MASTERNOTESBODYIMAGE 6 // 5 Master notes body image -#define EPP_PLACEHOLDER_MASTERDATE 7 // 6 Master date -#define EPP_PLACEHOLDER_MASTERSLIDENUMBER 8 // 7 Master slide number -#define EPP_PLACEHOLDER_MASTERFOOTER 9 // 8 Master footer -#define EPP_PLACEHOLDER_MASTERHEADER 10 // 9 Master header -#define EPP_PLACEHOLDER_GENERICTEXTOBJECT // 11 Generic text object -#define EPP_PLACEHOLDER_TITLE 13 // 12 Title -#define EPP_PLACEHOLDER_BODY 14 // 13 Body -#define EPP_PLACEHOLDER_NOTESBODY 12 // 14 Notes body -#define EPP_PLACEHOLDER_CENTEREDTITLE 15 // 15 Centered title -#define EPP_PLACEHOLDER_SUBTITLE 16 // 16 Subtitle -#define EPP_PLACEHOLDER_VERTICALTEXTTITLE 17 // 17 Vertical text title -#define EPP_PLACEHOLDER_VERTICALTEXTBODY 18 // 18 Vertical text body -#define EPP_PLACEHOLDER_NOTESSLIDEIMAGE 11 // 19 Notes slide image -#define EPP_PLACEHOLDER_OBJECT 19 // 20 Object (no matter the size) -#define EPP_PLACEHOLDER_GRAPH 20 // 21 Graph -#define EPP_PLACEHOLDER_TABLE 21 // 22 Table -#define EPP_PLACEHOLDER_CLIPART 22 // 23 Clip Art -#define EPP_PLACEHOLDER_ORGANISZATIONCHART 23 // 24 Organization Chart -#define EPP_PLACEHOLDER_MEDIACLIP 24 // 25 Media Clip +#define EPP_PLACEHOLDER_NONE 0 // 0 None +#define EPP_PLACEHOLDER_MASTERTITLE 1 // 1 Master title +#define EPP_PLACEHOLDER_MASTERBODY 2 // 2 Master body +#define EPP_PLACEHOLDER_MASTERCENTEREDTITLE 3 // 3 Master centered title +#define EPP_PLACEHOLDER_MASTERSUBTITLE 4 // 10 Master subtitle +#define EPP_PLACEHOLDER_MASTERNOTESSLIDEIMAGE 5 // 4 Master notes slide image +#define EPP_PLACEHOLDER_MASTERNOTESBODYIMAGE 6 // 5 Master notes body image +#define EPP_PLACEHOLDER_MASTERDATE 7 // 6 Master date +#define EPP_PLACEHOLDER_MASTERSLIDENUMBER 8 // 7 Master slide number +#define EPP_PLACEHOLDER_MASTERFOOTER 9 // 8 Master footer +#define EPP_PLACEHOLDER_MASTERHEADER 10 // 9 Master header +#define EPP_PLACEHOLDER_GENERICTEXTOBJECT // 11 Generic text object +#define EPP_PLACEHOLDER_TITLE 13 // 12 Title +#define EPP_PLACEHOLDER_BODY 14 // 13 Body +#define EPP_PLACEHOLDER_NOTESBODY 12 // 14 Notes body +#define EPP_PLACEHOLDER_CENTEREDTITLE 15 // 15 Centered title +#define EPP_PLACEHOLDER_SUBTITLE 16 // 16 Subtitle +#define EPP_PLACEHOLDER_VERTICALTEXTTITLE 17 // 17 Vertical text title +#define EPP_PLACEHOLDER_VERTICALTEXTBODY 18 // 18 Vertical text body +#define EPP_PLACEHOLDER_NOTESSLIDEIMAGE 11 // 19 Notes slide image +#define EPP_PLACEHOLDER_OBJECT 19 // 20 Object (no matter the size) +#define EPP_PLACEHOLDER_GRAPH 20 // 21 Graph +#define EPP_PLACEHOLDER_TABLE 21 // 22 Table +#define EPP_PLACEHOLDER_CLIPART 22 // 23 Clip Art +#define EPP_PLACEHOLDER_ORGANISZATIONCHART 23 // 24 Organization Chart +#define EPP_PLACEHOLDER_MEDIACLIP 24 // 25 Media Clip -#define EPP_TEXTTYPE_Title 0 -#define EPP_TEXTTYPE_Body 1 -#define EPP_TEXTTYPE_Notes 2 -#define EPP_TEXTTYPE_notUsed 3 -#define EPP_TEXTTYPE_Other 4 // ( Text in a shape ) -#define EPP_TEXTTYPE_CenterBody 5 // ( subtitle in title slide ) -#define EPP_TEXTTYPE_CenterTitle 6 // ( title in title slide ) -#define EPP_TEXTTYPE_HalfBody 7 // ( body in two-column slide ) -#define EPP_TEXTTYPE_QuarterBody 8 // ( body in four-body slide ) +#define EPP_TEXTTYPE_Title 0 +#define EPP_TEXTTYPE_Body 1 +#define EPP_TEXTTYPE_Notes 2 +#define EPP_TEXTTYPE_notUsed 3 +#define EPP_TEXTTYPE_Other 4 // ( Text in a shape ) +#define EPP_TEXTTYPE_CenterBody 5 // ( subtitle in title slide ) +#define EPP_TEXTTYPE_CenterTitle 6 // ( title in title slide ) +#define EPP_TEXTTYPE_HalfBody 7 // ( body in two-column slide ) +#define EPP_TEXTTYPE_QuarterBody 8 // ( body in four-body slide ) -#define EPP_SLIDESIZE_TYPEONSCREEN 0 -#define EPP_SLIDESIZE_TYPELETTERSIZERPAPER 1 -#define EPP_SLIDESIZE_TYPEA4PAPER 2 -#define EPP_SLIDESIZE_TYPE35MM 3 -#define EPP_SLIDESIZE_TYPEOVERHEAD 4 -#define EPP_SLIDESIZE_TYPEBANNER 5 -#define EPP_SLIDESIZE_TYPECUSTOM 6 +#define EPP_SLIDESIZE_TYPEONSCREEN 0 +#define EPP_SLIDESIZE_TYPELETTERSIZERPAPER 1 +#define EPP_SLIDESIZE_TYPEA4PAPER 2 +#define EPP_SLIDESIZE_TYPE35MM 3 +#define EPP_SLIDESIZE_TYPEOVERHEAD 4 +#define EPP_SLIDESIZE_TYPEBANNER 5 +#define EPP_SLIDESIZE_TYPECUSTOM 6 #endif diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index f4462da6b8b8..c948353fac98 100755 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -385,8 +385,8 @@ sal_uInt32 FontCollection::GetId( FontCollectionEntry& rEntry ) Font aFont; aFont.SetCharSet( rEntry.CharSet ); aFont.SetName( rEntry.Original ); -// aFont.SetFamily( rEntry.Family ); -// aFont.SetPitch( rEntry.Pitch ); +// aFont.SetFamily( rEntry.Family ); +// aFont.SetPitch( rEntry.Pitch ); aFont.SetHeight( 100 ); if ( !pVDev ) @@ -713,7 +713,7 @@ sal_Bool PPTWriter::ImplCloseDocument() SvMemoryStream aTxMasterStyleAtomStrm( 0x200, 0x200 ); { EscherExAtom aTxMasterStyleAtom( aTxMasterStyleAtomStrm, EPP_TxMasterStyleAtom, EPP_TEXTTYPE_Other ); - aTxMasterStyleAtomStrm << (sal_uInt16)5; // paragraph count + aTxMasterStyleAtomStrm << (sal_uInt16)5; // paragraph count sal_uInt16 nLev; sal_Bool bFirst = sal_True; for ( nLev = 0; nLev < 5; nLev++ ) @@ -732,7 +732,7 @@ sal_Bool PPTWriter::ImplCloseDocument() + 8 // 1 FontCollection Container + 20 // SrKinsoku Container + 18 // 1 TxSiStyleAtom - + aTxMasterStyleAtomStrm.Tell() // 1 TxMasterStyleAtom; + + aTxMasterStyleAtomStrm.Tell() // 1 TxMasterStyleAtom; + mpStyleSheet->SizeOfTxCFStyleAtom(); sal_uInt32 nBytesToInsert = nEnvironment + 8; @@ -1187,7 +1187,7 @@ sal_Bool PPTWriter::ImplGetStyleSheets() { int nInstance, nLevel; sal_Bool bRetValue = sal_False; - sal_uInt32 nPageNum; + sal_uInt32 nPageNum; for ( nPageNum = 0; nPageNum < mnMasterPages; nPageNum++ ) { @@ -1351,7 +1351,7 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj ) fN *= pDesc->Scaling; nNormalSpacing = (sal_Int16)( fN + 0.5 ); } - if ( !mbFontIndependentLineSpacing && bFirstParagraph && ( nLineSpacing > nNormalSpacing ) ) // sj: i28747, no replacement for fixed linespacing + if ( !mbFontIndependentLineSpacing && bFirstParagraph && ( nLineSpacing > nNormalSpacing ) ) // sj: i28747, no replacement for fixed linespacing { nLineSpacing = nNormalSpacing; nPropertyFlags |= 0x00001000; @@ -1485,8 +1485,8 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) { sal_uInt32 nBackgroundColor = 0xffffff; - if ( !nCharColor ) // special threatment for - nCharColor = 0xffffff; // black fontcolor + if ( !nCharColor ) // special threatment for + nCharColor = 0xffffff; // black fontcolor ::com::sun::star::uno::Any aAny; ::com::sun::star::drawing::FillStyle aFS( ::com::sun::star::drawing::FillStyle_NONE ); @@ -1554,7 +1554,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) // not possible to export the 'embossed' flag if ( ( GetCurrentGroupLevel() > 0 ) && ( GetCurrentGroupIndex() >= 1 ) ) { - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > aGroupedShape( GetCurrentGroupAccess()->getByIndex( GetCurrentGroupIndex() - 1 ), uno::UNO_QUERY ); + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > aGroupedShape( GetCurrentGroupAccess()->getByIndex( GetCurrentGroupIndex() - 1 ), uno::UNO_QUERY ); if( aGroupedShape.is() ) { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aPropSetOfNextShape @@ -1701,7 +1701,7 @@ struct FieldEntry sal_uInt32 nFieldType; sal_uInt32 nFieldStartPos; sal_uInt32 nFieldEndPos; - String aRepresentation; + String aRepresentation; String aFieldUrl; FieldEntry( sal_uInt32 nType, sal_uInt32 nStart, sal_uInt32 nEnd ) @@ -1966,7 +1966,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool case com::sun::star::i18n::ScriptType::COMPLEX : { aCharHeightName = String( RTL_CONSTASCII_USTRINGPARAM( "CharHeightComplex" ) ); - aCharWeightName = String( RTL_CONSTASCII_USTRINGPARAM( "CharWeightComplex" ) ); + aCharWeightName = String( RTL_CONSTASCII_USTRINGPARAM( "CharWeightComplex" ) ); aCharLocaleName = String( RTL_CONSTASCII_USTRINGPARAM( "CharLocaleComplex" ) ); aCharPostureName = String( RTL_CONSTASCII_USTRINGPARAM( "CharPostureComplex" ) ); break; @@ -2131,10 +2131,10 @@ sal_uInt32 PortionObj::ImplCalculateTextPositions( sal_uInt32 nCurrentTextPositi // 2 = Time // 3 = SlideNumber // 4 = Url -// 5 = DateTime -// 6 = header -// 7 = footer -// bit24->27 text field sub type (optional) +// 5 = DateTime +// 6 = header +// 7 = footer +// bit24->27 text field sub type (optional) // 23-> PPT Textfield needs a placeholder sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & , @@ -3039,9 +3039,9 @@ void TextObj::WriteTextSpecInfo( SvStream* pStrm ) nCharactersLeft -= nPortionSize; *pStrm << static_cast< sal_uInt32 >( nPortionSize ) << nFlags - << static_cast< sal_Int16 >( 1 ) // spellinfo -> needs rechecking + << static_cast< sal_Int16 >( 1 ) // spellinfo -> needs rechecking << static_cast< sal_Int16 >( MsLangId::convertLocaleToLanguageWithFallback( pPortion->meCharLocale ) ) - << static_cast< sal_Int16 >( 0 ); // alt language + << static_cast< sal_Int16 >( 0 ); // alt language } } if ( nCharactersLeft ) @@ -3160,9 +3160,9 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u case 2 : { rOut << (sal_uInt32)( EPP_DateTimeMCAtom << 16 ) << (sal_uInt32)8 - << (sal_uInt32)( pFieldEntry->nFieldStartPos ) // TxtOffset auf TxtField; - << (sal_uInt8)( pFieldEntry->nFieldType & 0xff ) // Type - << (sal_uInt8)0 << (sal_uInt16)0; // PadBytes + << (sal_uInt32)( pFieldEntry->nFieldStartPos ) // TxtOffset auf TxtField; + << (sal_uInt8)( pFieldEntry->nFieldType & 0xff ) // Type + << (sal_uInt8)0 << (sal_uInt16)0; // PadBytes } break; case 3 : @@ -3204,9 +3204,9 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u rOut << (sal_uInt32)( ( EPP_InteractiveInfo << 16 ) | 0xf ) << (sal_uInt32)24 << (sal_uInt32)( EPP_InteractiveInfoAtom << 16 ) << (sal_uInt32)16 - << (sal_uInt32)0 // soundref - << nHyperId // hyperlink id - << (sal_uInt8)4 // hyperlink action + << (sal_uInt32)0 // soundref + << nHyperId // hyperlink id + << (sal_uInt8)4 // hyperlink action << (sal_uInt8)0 // ole verb << (sal_uInt8)0 // jump << (sal_uInt8)0 // flags @@ -4068,7 +4068,7 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat << nFlags << (sal_uInt32)nHyperLinkType; - if ( nAction == 2 ) // run program Action + if ( nAction == 2 ) // run program Action { sal_uInt16 i, nLen = aFile.Len(); rSt << (sal_uInt32)( ( EPP_CString << 16 ) | 0x20 ) << (sal_uInt32)( nLen * 2 ); @@ -4134,7 +4134,7 @@ sal_Bool PPTWriter::ImplCreatePresentationPlaceholder( const sal_Bool bMasterPag aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, nLineFlags ); SvMemoryStream aExtBu( 0x200, 0x200 ); - SvMemoryStream aClientTextBox( 0x200, 0x200 ); + SvMemoryStream aClientTextBox( 0x200, 0x200 ); ImplWriteTextStyleAtom( aClientTextBox, nStyleInstance, 0, NULL, aExtBu, &aPropOpt ); aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, sal_False, sal_True ); @@ -4145,10 +4145,10 @@ sal_Bool PPTWriter::ImplCreatePresentationPlaceholder( const sal_Bool bMasterPag mpPptEscherEx->OpenContainer( ESCHER_ClientData ); mpPptEscherEx->AddAtom( 8, EPP_OEPlaceholderAtom ); *mpStrm << (sal_uInt32)0 // PlacementID - << (sal_uInt8)nPlaceHolderId // PlaceHolderID - << (sal_uInt8)0 // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER ) + << (sal_uInt8)nPlaceHolderId // PlaceHolderID + << (sal_uInt8)0 // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER ) << (sal_uInt16)0; // padword - mpPptEscherEx->CloseContainer(); // ESCHER_ClientData + mpPptEscherEx->CloseContainer(); // ESCHER_ClientData /* if ( aExtBu.Tell() ) { @@ -4325,7 +4325,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a rtl::OUString sCustomShapeType; MSO_SPT eShapeType = aPropOpt.GetCustomShapeType( mXShape, nMirrorFlags, sCustomShapeType ); if ( sCustomShapeType.equalsAscii( "col-502ad400" ) || sCustomShapeType.equalsAscii( "col-60da8460" ) ) - { // sj: creating metafile for customshapes that can't be saved to ms format properly + { // sj: creating metafile for customshapes that can't be saved to ms format properly ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer ); if ( aPropOpt.CreateGraphicProperties( mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "MetaFile" ) ), sal_False ) ) { @@ -4827,8 +4827,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a aPropertyOptions.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x50001 ); aPropertyOptions.AddOpt( ESCHER_Prop_lTxid, mnTxId += 0x60 ); aPropertyOptions.AddOpt( ESCHER_Prop_AnchorText, ESCHER_AnchorMiddle ); -// aPropertyOptions.AddOpt( ESCHER_Prop_fillColor, nFillColor ); -// aPropertyOptions.AddOpt( ESCHER_Prop_fillBackColor, nFillBackColor ); +// aPropertyOptions.AddOpt( ESCHER_Prop_fillColor, nFillColor ); +// aPropertyOptions.AddOpt( ESCHER_Prop_fillBackColor, nFillBackColor ); aPropertyOptions.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x110001 ); aPropertyOptions.AddOpt( ESCHER_Prop_lineColor, 0x8000001 ); aPropertyOptions.AddOpt( ESCHER_Prop_shadowColor, 0x8000002 ); @@ -4920,8 +4920,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a EscherPropertyContainer aPropOpt2; aPropOpt2.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x50001 ); aPropOpt2.AddOpt( ESCHER_Prop_lTxid, mnTxId += 0x60 ); -// aPropOpt2.AddOpt( ESCHER_Prop_fillColor, nFillColor ); -// aPropOpt2.AddOpt( ESCHER_Prop_fillBackColor, nFillBackColor ); +// aPropOpt2.AddOpt( ESCHER_Prop_fillColor, nFillColor ); +// aPropOpt2.AddOpt( ESCHER_Prop_fillBackColor, nFillBackColor ); aPropOpt2.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x110001 ); aPropOpt2.AddOpt( ESCHER_Prop_lineColor, 0x8000001 ); aPropOpt2.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x90001 ); @@ -5061,14 +5061,14 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a *mpExEmbed << (sal_uInt32)( 1 | ( EPP_ExOleObjAtom << 16 ) ) << (sal_uInt32)24 - << (sal_uInt32)nAspect // Aspect + << (sal_uInt32)nAspect // Aspect << (sal_uInt32)0 << (sal_uInt32)mnExEmbed // index to the persist table << (sal_uInt32)0 // subtype << (sal_uInt32)0 << (sal_uInt32)0x0012b600; -// PPTWriter::WriteCString( *mpExEmbed, "Photo Editor Photo", 1 ); +// PPTWriter::WriteCString( *mpExEmbed, "Photo Editor Photo", 1 ); // PPTWriter::WriteCString( *mpExEmbed, "MSPhotoEd.3", 2 ); // PPTWriter::WriteCString( *mpExEmbed, "Microsoft Photo Editor 3.0 Photo", 3 ); @@ -5160,7 +5160,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a sal_uInt32 nRefId = ++mnExEmbed; *mpExEmbed << (sal_uInt16)0xf - << (sal_uInt16)EPP_ExMCIMovie // PPT_PST_ExAviMovie + << (sal_uInt16)EPP_ExMCIMovie // PPT_PST_ExAviMovie << (sal_uInt32)0; sal_uInt32 nSize, nStart = mpExEmbed->Tell(); *mpExEmbed << (sal_uInt16)0 @@ -5171,7 +5171,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a << (sal_uInt16)EPP_ExVideo << (sal_uInt32)0; - *mpExEmbed << (sal_uInt16)0 + *mpExEmbed << (sal_uInt16)0 << (sal_uInt16)EPP_ExMediaAtom << (sal_uInt32)8 << nRefId @@ -5188,10 +5188,10 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a } nSize = mpExEmbed->Tell() - nStart; mpExEmbed->SeekRel( - ( (sal_Int32)nSize + 4 ) ); - *mpExEmbed << nSize; // size of PPT_PST_ExMCIMovie + *mpExEmbed << nSize; // size of PPT_PST_ExMCIMovie mpExEmbed->SeekRel( 0x10 ); nSize -= 20; - *mpExEmbed << nSize; // PPT_PST_ExMediaAtom + *mpExEmbed << nSize; // PPT_PST_ExMediaAtom mpExEmbed->SeekRel( nSize ); if ( !pClientData ) @@ -5321,7 +5321,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { sal_uInt32 nTextType = EPP_TEXTTYPE_Body; if ( mnTextStyle == EPP_TEXTSTYLE_BODY ) - { + { if ( bSecOutl ) nTextType = EPP_TEXTTYPE_HalfBody; else if ( mType == "presentation.Subtitle" ) @@ -5516,9 +5516,9 @@ Rectangle PPTWriter::ImplMapRectangle( const ::com::sun::star::awt::Rectangle& r struct CellBorder { - sal_Int32 mnPos; // specifies the distance to the top/left position of the table - sal_Int32 mnLength; - table::BorderLine maCellBorder; + sal_Int32 mnPos; // specifies the distance to the top/left position of the table + sal_Int32 mnLength; + table::BorderLine maCellBorder; CellBorder() : mnPos ( 0 ), mnLength( 0 ){}; }; @@ -5538,16 +5538,16 @@ void PPTWriter::ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 n aPropOptSp.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0xa0008 ); aPropOptSp.AddOpt( ESCHER_Prop_fshadowObscured, 0x20000 ); - sal_uInt32 nBorderColor = pCellBorder->maCellBorder.Color & 0xff00; // green - nBorderColor |= static_cast< sal_uInt8 >( pCellBorder->maCellBorder.Color ) << 16; // red - nBorderColor |= static_cast< sal_uInt8 >( pCellBorder->maCellBorder.Color >> 16 ); // blue + sal_uInt32 nBorderColor = pCellBorder->maCellBorder.Color & 0xff00; // green + nBorderColor |= static_cast< sal_uInt8 >( pCellBorder->maCellBorder.Color ) << 16; // red + nBorderColor |= static_cast< sal_uInt8 >( pCellBorder->maCellBorder.Color >> 16 ); // blue aPropOptSp.AddOpt( ESCHER_Prop_lineColor, nBorderColor ); aPropOptSp.AddOpt( ESCHER_Prop_lineWidth, nLineWidth * 360 ); aPropOptSp.AddOpt( ESCHER_Prop_fc3DLightFace, 0x80000 ); aPropOptSp.Commit( *mpStrm ); mpPptEscherEx->AddAtom( 16, ESCHER_ChildAnchor ); - *mpStrm << nX1 + *mpStrm << nX1 << nY1 << nX2 << nY2; @@ -5573,18 +5573,18 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc mpPptEscherEx->OpenContainer( ESCHER_SpgrContainer ); mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); mpPptEscherEx->AddAtom( 16, ESCHER_Spgr, 1 ); - *mpStrm << (INT32)maRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden + *mpStrm << (INT32)maRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden << (INT32)maRect.Top() << (INT32)maRect.Right() << (INT32)maRect.Bottom(); sal_uInt32 nShapeId = mpPptEscherEx->GenerateShapeId(); - mpPptEscherEx->AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId ); // Flags: Group | Patriarch + mpPptEscherEx->AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId ); // Flags: Group | Patriarch aSolverContainer.AddShape( rXShape, nShapeId ); EscherPropertyContainer aPropOpt2; try { - static const rtl::OUString sModel( RTL_CONSTASCII_USTRINGPARAM ( "Model" ) ); + static const rtl::OUString sModel( RTL_CONSTASCII_USTRINGPARAM ( "Model" ) ); static const rtl::OUString sWidth( RTL_CONSTASCII_USTRINGPARAM ( "Width" ) ); static const rtl::OUString sHeight( RTL_CONSTASCII_USTRINGPARAM ( "Height" ) ); @@ -5703,7 +5703,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc aPropOptSp.Commit( *mpStrm ); mpPptEscherEx->AddAtom( 16, ESCHER_ChildAnchor ); - *mpStrm << nLeft + *mpStrm << nLeft << nTop << nRight << nBottom; @@ -5720,9 +5720,9 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc static const rtl::OUString sTopBorder( String( RTL_CONSTASCII_USTRINGPARAM( "TopBorder" ) ) ); static const rtl::OUString sBottomBorder( String( RTL_CONSTASCII_USTRINGPARAM( "BottomBorder" ) ) ); static const rtl::OUString sLeftBorder( String( RTL_CONSTASCII_USTRINGPARAM( "LeftBorder" ) ) ); - static const rtl::OUString sRightBorder( String( RTL_CONSTASCII_USTRINGPARAM( "RightBorder" ) ) ); - static const rtl::OUString sDiagonalTLBR( RTL_CONSTASCII_USTRINGPARAM ( "DiagonalTLBR" ) ); - static const rtl::OUString sDiagonalBLTR( RTL_CONSTASCII_USTRINGPARAM ( "DiagonalBLTR" ) ); + static const rtl::OUString sRightBorder( String( RTL_CONSTASCII_USTRINGPARAM( "RightBorder" ) ) ); + static const rtl::OUString sDiagonalTLBR( RTL_CONSTASCII_USTRINGPARAM ( "DiagonalTLBR" ) ); + static const rtl::OUString sDiagonalBLTR( RTL_CONSTASCII_USTRINGPARAM ( "DiagonalBLTR" ) ); // creating horz lines sal_Int32 nYPos = ImplMapPoint( rXShape->getPosition() ).Y; @@ -5741,7 +5741,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc aCellBorder.mnPos = nXPos; aCellBorder.mnLength = aM.Width; if ( nLine < xRows->getCount() ) - { // top border + { // top border uno::Reference< table::XMergeableCell > xCell( xCellRange->getCellByPosition( nColumn, nLine ), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropSet2( xCell, uno::UNO_QUERY_THROW ); table::BorderLine aBorderLine; @@ -5749,7 +5749,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc aCellBorder.maCellBorder = aBorderLine; } if ( nLine ) - { // bottom border + { // bottom border uno::Reference< table::XMergeableCell > xCell( xCellRange->getCellByPosition( nColumn, nLine - 1 ), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropSet2( xCell, uno::UNO_QUERY_THROW ); table::BorderLine aBorderLine; @@ -5793,7 +5793,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc aCellBorder.mnPos = nYPos; aCellBorder.mnLength = aM.Height; if ( nLine < xColumns->getCount() ) - { // left border + { // left border uno::Reference< table::XMergeableCell > xCell( xCellRange->getCellByPosition( nLine, nRow ), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xCellSet( xCell, uno::UNO_QUERY_THROW ); table::BorderLine aBorderLine; @@ -5801,7 +5801,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc aCellBorder.maCellBorder = aBorderLine; } if ( nLine ) - { // right border + { // right border uno::Reference< table::XMergeableCell > xCell( xCellRange->getCellByPosition( nLine - 1, nRow ), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xCellSet( xCell, uno::UNO_QUERY_THROW ); table::BorderLine aBorderLine; diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx index fbb94de67ae7..fbbf178c0a5f 100644 --- a/sd/source/filter/eppt/escherex.cxx +++ b/sd/source/filter/eppt/escherex.cxx @@ -40,7 +40,7 @@ PptEscherEx::PptEscherEx( SvStream& rOutStrm ) : EscherEx( EscherExGlobalRef( new EscherExGlobal ), rOutStrm ) { - mnCurrentDg = 0; + mnCurrentDg = 0; } // --------------------------------------------------------------------------------------------- @@ -53,7 +53,7 @@ sal_uInt32 PptEscherEx::DrawingGroupContainerSize() void PptEscherEx::WriteDrawingGroupContainer( SvStream& rSt ) { UINT32 nSize = DrawingGroupContainerSize(); - rSt << (sal_uInt32)( 0xf | ( 1035 << 16 ) ) // EPP_PPDrawingGroup + rSt << (sal_uInt32)( 0xf | ( 1035 << 16 ) ) // EPP_PPDrawingGroup << (sal_uInt32)( nSize - 8 ); ImplWriteDggContainer( rSt ); @@ -108,18 +108,18 @@ void PptEscherEx::ImplWriteOptAtom( SvStream& rSt ) { rSt << (sal_uInt32)( ( ESCHER_OPT << 16 ) | ( ESCHER_OPT_COUNT << 4 ) | 0x3 ) << (sal_uInt32)( nSize - 8 ) - << (sal_uInt16)ESCHER_Prop_fillColor << (sal_uInt32)0xffb800 - << (sal_uInt16)ESCHER_Prop_fillBackColor << (sal_uInt32)0 - << (sal_uInt16)ESCHER_Prop_fNoFillHitTest << (sal_uInt32)0x00100010 - << (sal_uInt16)ESCHER_Prop_lineColor << (sal_uInt32)0x8000001 - << (sal_uInt16)ESCHER_Prop_fNoLineDrawDash << (sal_uInt32)0x00080008 - << (sal_uInt16)ESCHER_Prop_shadowColor << (sal_uInt32)0x8000002; + << (sal_uInt16)ESCHER_Prop_fillColor << (sal_uInt32)0xffb800 + << (sal_uInt16)ESCHER_Prop_fillBackColor << (sal_uInt32)0 + << (sal_uInt16)ESCHER_Prop_fNoFillHitTest << (sal_uInt32)0x00100010 + << (sal_uInt16)ESCHER_Prop_lineColor << (sal_uInt32)0x8000001 + << (sal_uInt16)ESCHER_Prop_fNoLineDrawDash << (sal_uInt32)0x00080008 + << (sal_uInt16)ESCHER_Prop_shadowColor << (sal_uInt32)0x8000002; } } // --------------------------------------------------------------------------------------------- -#define ESCHER_SPLIT_MENU_COLORS_COUNT 4 +#define ESCHER_SPLIT_MENU_COLORS_COUNT 4 sal_uInt32 PptEscherEx::ImplSplitMenuColorsAtomSize() { @@ -168,8 +168,8 @@ void PptEscherEx::OpenContainer( UINT16 n_EscherContainer, int nRecInstance ) mnCurrentDg = mxGlobal->GenerateDrawingId(); AddAtom( 8, ESCHER_Dg, 0, mnCurrentDg ); PtReplaceOrInsert( ESCHER_Persist_Dg | mnCurrentDg, mpOutStrm->Tell() ); - *mpOutStrm << (UINT32)0 // The number of shapes in this drawing - << (UINT32)0; // The last MSOSPID given to an SP in this DG + *mpOutStrm << (UINT32)0 // The number of shapes in this drawing + << (UINT32)0; // The last MSOSPID given to an SP in this DG } } break; @@ -259,17 +259,17 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie OpenContainer( ESCHER_SpContainer ); AddAtom( 16, ESCHER_Spgr, 1 ); PtReplaceOrInsert( ESCHER_Persist_Grouping_Snap | mnGroupLevel, mpOutStrm->Tell() ); - *mpOutStrm << (INT32)aRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden + *mpOutStrm << (INT32)aRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden << (INT32)aRect.Top() << (INT32)aRect.Right() << (INT32)aRect.Bottom(); nShapeId = GenerateShapeId(); if ( !mnGroupLevel ) - AddShape( ESCHER_ShpInst_Min, 5, nShapeId ); // Flags: Group | Patriarch + AddShape( ESCHER_ShpInst_Min, 5, nShapeId ); // Flags: Group | Patriarch else { - AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId ); // Flags: Group | HaveAnchor + AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId ); // Flags: Group | HaveAnchor AddAtom( 8, ESCHER_ClientAnchor ); PtReplaceOrInsert( ESCHER_Persist_Grouping_Logic | mnGroupLevel, mpOutStrm->Tell() ); *mpOutStrm << (INT16)aRect.Top() << (INT16)aRect.Left() << (INT16)aRect.Right() << (INT16)aRect.Bottom(); @@ -285,7 +285,7 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie mpOutStrm->Write( pClientData->GetData(), nSize ); } } - CloseContainer(); // ESCHER_SpContainer + CloseContainer(); // ESCHER_SpContainer } mnGroupLevel++; return nShapeId; diff --git a/sd/source/filter/eppt/escherex.hxx b/sd/source/filter/eppt/escherex.hxx index 739ef6300d1c..1e2222d7a017 100644 --- a/sd/source/filter/eppt/escherex.hxx +++ b/sd/source/filter/eppt/escherex.hxx @@ -48,27 +48,27 @@ enum PPT_TextHeader class PptEscherEx : public EscherEx { - sal_uInt32 ImplDggContainerSize(); - void ImplWriteDggContainer( SvStream& rSt ); + sal_uInt32 ImplDggContainerSize(); + void ImplWriteDggContainer( SvStream& rSt ); - sal_uInt32 ImplOptAtomSize(); - void ImplWriteOptAtom( SvStream& rSt ); + sal_uInt32 ImplOptAtomSize(); + void ImplWriteOptAtom( SvStream& rSt ); - sal_uInt32 ImplSplitMenuColorsAtomSize(); - void ImplWriteSplitMenuColorsAtom( SvStream& rSt ); + sal_uInt32 ImplSplitMenuColorsAtomSize(); + void ImplWriteSplitMenuColorsAtom( SvStream& rSt ); public: PptEscherEx( SvStream& rOut ); ~PptEscherEx(); - void OpenContainer( UINT16 n_EscherContainer, int nRecInstance = 0 ); - void CloseContainer(); + void OpenContainer( UINT16 n_EscherContainer, int nRecInstance = 0 ); + void CloseContainer(); sal_uInt32 EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClientData ); - UINT32 DrawingGroupContainerSize(); - void WriteDrawingGroupContainer( SvStream& rSt ); + UINT32 DrawingGroupContainerSize(); + void WriteDrawingGroupContainer( SvStream& rSt ); using EscherEx::EnterGroup; }; diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index 4e4b50007443..cceeed929c3e 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -163,8 +163,8 @@ void ImplTranslateAttribute( rtl::OUString& rString, const TranslateMode eTransl sal_uInt32 ImplTranslatePresetSubType( const sal_uInt32 nPresetClass, const sal_uInt32 nPresetId, const rtl::OUString& rPresetSubType ) { - sal_uInt32 nPresetSubType = 0; - sal_Bool bTranslated = sal_False; + sal_uInt32 nPresetSubType = 0; + sal_Bool bTranslated = sal_False; if ( ( nPresetClass == (sal_uInt32)EffectPresetClass::ENTRANCE ) || ( nPresetClass == (sal_uInt32)EffectPresetClass::EXIT ) ) { @@ -244,7 +244,7 @@ sal_uInt32 ImplTranslatePresetSubType( const sal_uInt32 nPresetClass, const sal_ const sal_Char* transition::find( const sal_Int16 nType, const sal_Int16 nSubType, const sal_Bool bDirection ) { const sal_Char* pRet = NULL; - int nFit = 0; + int nFit = 0; const transition* p = gTransitions; while( p->mpName ) @@ -261,7 +261,7 @@ const sal_Char* transition::find( const sal_Int16 nType, const sal_Int16 nSubTyp pRet = p->mpName; nFit = nF; } - if ( nFit == 7 ) // maximum + if ( nFit == 7 ) // maximum break; p++; } @@ -283,7 +283,7 @@ SvStream& operator<<(SvStream& rOut, AnimationNode& rNode ) } AnimationExporter::AnimationExporter( const EscherSolverContainer& rSolverContainer, ppt::ExSoundCollection& rExSoundCollection ) : - mrSolverContainer ( rSolverContainer ), + mrSolverContainer ( rSolverContainer ), mrExSoundCollection ( rExSoundCollection ), mnCurrentGroup(0) { @@ -508,7 +508,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > sal_Int16 nFillDefault = GetFillMode( xNode, nFDef ); bool bSkipChildren = false; - + Reference< XAnimationNode > xAudioNode; static sal_uInt32 nAudioGroup; @@ -676,7 +676,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > } break; - case AnimationNodeType::AUDIO : // #i58428# + case AnimationNodeType::AUDIO : // #i58428# { exportAnimNode( rStrm, xNode, pParent, nGroupLevel, nFillDefault ); exportAnimPropertySet( rStrm, xNode ); @@ -791,8 +791,8 @@ Reference< XAnimationNode > AnimationExporter::createAfterEffectNodeClone( const void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnimationNode >& xNode, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >*, const sal_Int32, const sal_Int16 nFillDefault ) { - EscherExAtom aAnimNodeExAtom( rStrm, DFF_msofbtAnimNode ); - AnimationNode aAnim; + EscherExAtom aAnimNodeExAtom( rStrm, DFF_msofbtAnimNode ); + AnimationNode aAnim; rtl_zeroMemory( &aAnim, sizeof( aAnim ) ); // attribute Restart @@ -806,7 +806,7 @@ void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnima } // attribute Fill -// aAnim.mnFill = GetFillMode( xNode, pParent ); +// aAnim.mnFill = GetFillMode( xNode, pParent ); switch( nFillDefault ) { default: @@ -836,7 +836,7 @@ void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnima aAnim.mnGroupType = mso_Anim_GroupType_SEQ; switch( xNode->getType() ) { - case AnimationNodeType::PAR : // PASSTROUGH!!! (as it was intended) + case AnimationNodeType::PAR : // PASSTROUGH!!! (as it was intended) aAnim.mnGroupType = mso_Anim_GroupType_PAR; case AnimationNodeType::SEQ : { @@ -847,7 +847,7 @@ void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnima const NamedValue* p = aUserData.getConstArray(); sal_Int32 nLength = aUserData.getLength(); while( nLength-- ) - { + { if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "node-type" ) ) ) { sal_Int16 nType = 0; @@ -924,7 +924,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer const NamedValue* p = aUserData.getConstArray(); sal_Int32 nLength = aUserData.getLength(); while( nLength-- ) - { + { if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "node-type" ) ) ) { pAny[ DFF_ANIM_NODE_TYPE ] = &(p->Value); @@ -978,7 +978,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer sal_uInt32 nPPTNodeType = DFF_ANIM_NODE_TYPE_ON_CLICK; switch( nNodeType ) { - case ::com::sun::star::presentation::EffectNodeType::ON_CLICK : nPPTNodeType = DFF_ANIM_NODE_TYPE_ON_CLICK; break; + case ::com::sun::star::presentation::EffectNodeType::ON_CLICK : nPPTNodeType = DFF_ANIM_NODE_TYPE_ON_CLICK; break; case ::com::sun::star::presentation::EffectNodeType::WITH_PREVIOUS : nPPTNodeType = DFF_ANIM_NODE_TYPE_WITH_PREVIOUS; break; case ::com::sun::star::presentation::EffectNodeType::AFTER_PREVIOUS : nPPTNodeType = DFF_ANIM_NODE_TYPE_AFTER_PREVIOUS; break; case ::com::sun::star::presentation::EffectNodeType::MAIN_SEQUENCE : nPPTNodeType = DFF_ANIM_NODE_TYPE_MAIN_SEQUENCE; break; @@ -1089,9 +1089,9 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer Reference< XAnimateColor > xColor( xNode, UNO_QUERY ); if( xColor.is() ) { -// sal_uInt32 nColorSpace = xColor->getColorSpace() == AnimationColorSpace::RGB ? 0 : 1; -// exportAnimPropertyuInt32( rStrm, DFF_ANIM_COLORSPACE, nColorSpace, TRANSLATE_NONE ); - +// sal_uInt32 nColorSpace = xColor->getColorSpace() == AnimationColorSpace::RGB ? 0 : 1; +// exportAnimPropertyuInt32( rStrm, DFF_ANIM_COLORSPACE, nColorSpace, TRANSLATE_NONE ); + sal_Bool bDirection = !xColor->getDirection(); exportAnimPropertyuInt32( rStrm, DFF_ANIM_DIRECTION, bDirection, TRANSLATE_NONE ); } @@ -1127,11 +1127,11 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer } if ( pAny[ DFF_ANIM_EVENT_FILTER ] ) { - // TODO DFF_ANIM_EVENT_FILTER + // TODO DFF_ANIM_EVENT_FILTER } if ( pAny[ DFF_ANIM_VOLUME ] ) { - // TODO DFF_ANIM_VOLUME + // TODO DFF_ANIM_VOLUME } return nNodeType; } @@ -1289,7 +1289,7 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim switch( i ) { - case 0 : + case 0 : case 1 : { Any aAny; @@ -1304,7 +1304,7 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim Reference< XEnumeration > xE( xEA->createEnumeration(), UNO_QUERY_THROW ); if ( xE.is() && xE->hasMoreElements() ) { -// while( xE->hasMoreElements() ) +// while( xE->hasMoreElements() ) { Reference< XAnimationNode > xClickNode( xE->nextElement(), UNO_QUERY ); aAny = xClickNode->getBegin(); @@ -1318,7 +1318,7 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim else { aAny = xNode->getBegin(); - if ( nFlags & 0x10 ) // replace ON_NEXT with IDEFINITE + if ( nFlags & 0x10 ) // replace ON_NEXT with IDEFINITE { if ( ( aAny >>= aEvent ) && ( aEvent.Trigger == EventTrigger::ON_NEXT ) ) { @@ -1429,7 +1429,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl:: aDest += aStr; } } - else if ( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Rotate" ) ) // "r" or "style.rotation" ? + else if ( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Rotate" ) ) // "r" or "style.rotation" ? || rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SkewX" ) ) || rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Opacity" ) ) || rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CharHeight" ) ) @@ -1440,7 +1440,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl:: aDest += rtl::OUString::valueOf( fNumber ); } else if ( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Color" ) ) - || rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FillColor" ) ) // "Fillcolor" or "FillColor" ? + || rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FillColor" ) ) // "Fillcolor" or "FillColor" ? || rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "LineColor" ) ) || rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CharColor" ) ) ) @@ -1475,7 +1475,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl:: if ( rSourceValue >>= eFillStyle ) { if ( eFillStyle == ::com::sun::star::drawing::FillStyle_NONE ) - aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "none" ) ); // ? + aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "none" ) ); // ? else aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "solid" ) ); } @@ -1521,7 +1521,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl:: if ( eFontSlant == com::sun::star::awt::FontSlant_ITALIC ) aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "italic" ) ); else - aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "normal" ) ); // ? + aDest += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "normal" ) ); // ? } } else if ( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Visibility" ) ) ) @@ -1551,8 +1551,8 @@ void AnimationExporter::exportAnimateSet( SvStream& rStrm, const Reference< XAni EscherExContainer aAnimateSet( rStrm, DFF_msofbtAnimateSet, 0 ); { EscherExAtom aAnimateSetData( rStrm, DFF_msofbtAnimateSetData ); - sal_uInt32 nId1 = 1; // ?? - sal_uInt32 nId2 = 1; // ?? + sal_uInt32 nId1 = 1; // ?? + sal_uInt32 nId2 = 1; // ?? rStrm << nId1 << nId2; } Any aConvertedValue( convertAnimateValue( xSet->getTo(), xSet->getAttributeName() ) ); @@ -1575,7 +1575,7 @@ sal_uInt32 GetValueTypeForAttributeName( const rtl::OUString& rAttributeName ) struct Entry { const sal_Char* pName; - sal_uInt8 nType; + sal_uInt8 nType; }; static const Entry lcl_attributeMap[] = { @@ -1630,7 +1630,7 @@ void AnimationExporter::exportAnimate( SvStream& rStrm, const Reference< XAnimat EscherExContainer aContainer( rStrm, DFF_msofbtAnimate, 0 ); { - EscherExAtom aAnimateData( rStrm, DFF_msofbtAnimateData ); + EscherExAtom aAnimateData( rStrm, DFF_msofbtAnimateData ); sal_uInt32 nBits = 0x38; sal_Int16 nTmp = xAnimate->getCalcMode(); sal_uInt32 nCalcMode = /* (nTmp == AnimationCalcMode::FORMULA) ? 2 : */ (nTmp == AnimationCalcMode::LINEAR) ? 1 : 0; @@ -1679,7 +1679,7 @@ void AnimationExporter::exportAnimateTarget( SvStream& rStrm, const Reference< X if ( xAnimate.is() ) { if ( xAnimate->getAttributeName().getLength() ) - nBits |= 4; // what is attributeName ?, maybe this is set if a DFF_msofbtAnimateAttributeNames is written + nBits |= 4; // what is attributeName ?, maybe this is set if a DFF_msofbtAnimateAttributeNames is written sal_Int16 nAdditiveMode = xAnimate->getAdditive(); if ( nAdditiveMode != AnimationAdditiveMode::BASE ) { @@ -1741,7 +1741,7 @@ void AnimationExporter::exportAnimateTargetElement( SvStream& rStrm, const Any a { Reference< XShape > xShape; aAny >>= xShape; - sal_uInt32 nRefMode = 0; // nRefMode == 2 -> Paragraph + sal_uInt32 nRefMode = 0; // nRefMode == 2 -> Paragraph sal_Int32 begin = -1; sal_Int32 end = -1; @@ -1792,7 +1792,7 @@ void AnimationExporter::exportAnimateTargetElement( SvStream& rStrm, const Any a { EscherExAtom aAnimReference( rStrm, DFF_msofbtAnimReference ); - sal_uInt32 nRefType = 1; // TODO: nRefType == 2 -> Sound; + sal_uInt32 nRefType = 1; // TODO: nRefType == 2 -> Sound; sal_uInt32 nRefId = ((EscherSolverContainer&)mrSolverContainer).GetShapeId( xShape ); rStrm << nRefMode @@ -1804,7 +1804,7 @@ void AnimationExporter::exportAnimateTargetElement( SvStream& rStrm, const Any a if ( bCreate2b01Atom ) { EscherExAtom a2b01Atom( rStrm, 0x2b01 ); - rStrm << (sal_uInt32)1; // ? + rStrm << (sal_uInt32)1; // ? } } } @@ -1912,7 +1912,7 @@ void AnimationExporter::exportTransitionFilter( SvStream& rStrm, const Reference EscherExContainer aAnimateFilter( rStrm, DFF_msofbtAnimateFilter ); { EscherExAtom aAnimateFilterData( rStrm, DFF_msofbtAnimateFilterData ); - sal_uInt32 nBits = 3; // bit 0 -> use AnimAttributeValue + sal_uInt32 nBits = 3; // bit 0 -> use AnimAttributeValue // bit 1 -> use nTransition sal_uInt32 nTransition = xFilter->getMode() ? 0 : 1; @@ -1936,11 +1936,11 @@ void AnimationExporter::exportAnimateMotion( SvStream& rStrm, const Reference< X { EscherExContainer aAnimateMotion( rStrm, DFF_msofbtAnimateMotion ); { - { //SJ: Ignored from import filter - EscherExAtom aAnimateMotionData( rStrm, DFF_msofbtAnimateMotionData ); + { //SJ: Ignored from import filter + EscherExAtom aAnimateMotionData( rStrm, DFF_msofbtAnimateMotionData ); sal_uInt32 nBits = 0x98; sal_uInt32 nOrigin = 0x2; - float fByX = 100.0; // nBits&1 + float fByX = 100.0; // nBits&1 float fByY = 100.0; // nBits&1 float fFromX = 0.0; // nBits&2 float fFromY = 0.0; // nBits&2 @@ -1948,7 +1948,7 @@ void AnimationExporter::exportAnimateMotion( SvStream& rStrm, const Reference< X float fToY = 100.0; // nBits&4 rStrm << nBits << fByX << fByY << fFromX << fFromY << fToX << fToY << nOrigin; } -/* ? +/* ? { EscherExAtom aF137( rStrm, 0xf137 ); } @@ -2015,7 +2015,7 @@ void AnimationExporter::exportAnimateTransform( SvStream& rStrm, const Reference // TODO: ZoomContents: //if( nBits & 8 ) - //( fprintf( mpFile, " zoomContents=\"%s\"", nZoomContents ? "true" : "false" ); + //( fprintf( mpFile, " zoomContents=\"%s\"", nZoomContents ? "true" : "false" ); rStrm << nBits << fByX << fByY << fFromX << fFromY << fToX << fToY << nZoomContents; } @@ -2065,13 +2065,13 @@ sal_Bool AnimationExporter::getColorAny( const Any& rAny, const sal_Int16 nColor sal_Int32 nColor = 0; Sequence< double > aHSL( 3 ); - if ( rAny >>= nColor ) // RGB color + if ( rAny >>= nColor ) // RGB color { rA = (sal_uInt8)( nColor >> 24 ); rB = (sal_uInt8)( nColor >> 8 ); rC = (sal_uInt8)( nColor ); } - else if ( rAny >>= aHSL ) // HSL + else if ( rAny >>= aHSL ) // HSL { rA = (sal_Int32) ( aHSL[ 0 ] * 255.0 / 360.0 ); rB = (sal_Int32) ( aHSL[ 1 ] * 255.0 ); @@ -2137,11 +2137,11 @@ void AnimationExporter::exportIterate( SvStream& rStrm, const Reference< XAnimat { EscherExAtom aAnimIteration( rStrm, DFF_msofbtAnimIteration ); - float fInterval = 10.0; - sal_Int32 nTextUnitEffect = 0; - sal_Int32 nU1 = 1; - sal_Int32 nU2 = 1; - sal_Int32 nU3 = 0xe; + float fInterval = 10.0; + sal_Int32 nTextUnitEffect = 0; + sal_Int32 nU1 = 1; + sal_Int32 nU2 = 1; + sal_Int32 nU3 = 0xe; sal_Int16 nIterateType = xIterate->getIterateType(); switch( nIterateType ) diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx index b0f38519366d..88baf6cb357a 100644 --- a/sd/source/filter/eppt/pptexanimations.hxx +++ b/sd/source/filter/eppt/pptexanimations.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ class SdPage; class SvStream; namespace ppt -{ +{ struct AfterEffectNode { @@ -67,11 +67,11 @@ namespace ppt typedef boost::shared_ptr< AfterEffectNode > AfterEffectNodePtr; typedef sal_uInt32 TranslateMode; -#define TRANSLATE_NONE 0 -#define TRANSLATE_VALUE 1 -#define TRANSLATE_ATTRIBUTE 2 -#define TRANSLATE_MEASURE 4 -#define TRANSLATE_NUMBER_TO_STRING 8 +#define TRANSLATE_NONE 0 +#define TRANSLATE_VALUE 1 +#define TRANSLATE_ATTRIBUTE 2 +#define TRANSLATE_MEASURE 4 +#define TRANSLATE_NUMBER_TO_STRING 8 const int AFTEREFFECT_NONE = 0; const int AFTEREFFECT_COLOR = 1; @@ -89,7 +89,7 @@ class AnimationExporter void exportAnimPropertyFloat( SvStream& rStrm, const sal_uInt16 nPropertyId, const double& rVal, const TranslateMode eTranslateMode ); void exportAnimPropertyuInt32( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt32 nVal, const TranslateMode eTranslateMode ); void exportAnimPropertyByte( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt8 nVal, const TranslateMode eTranslateMode ); - + // if available exportAnimPropertySet returns the ::com::sun::star::presentation::EffectNodeType sal_Int16 exportAnimPropertySet( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); void exportAnimNode( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx index 9510da8757e3..a1102c968062 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.cxx +++ b/sd/source/filter/eppt/pptexsoundcollection.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,8 +45,8 @@ namespace ppt { ExSoundEntry::ExSoundEntry( const String& rString ) -: nFileSize( 0 ) -, aSoundURL( rString ) +: nFileSize( 0 ) +, aSoundURL( rString ) { try { diff --git a/sd/source/filter/eppt/pptexsoundcollection.hxx b/sd/source/filter/eppt/pptexsoundcollection.hxx index 88965abe71ef..6e7061576cd9 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.hxx +++ b/sd/source/filter/eppt/pptexsoundcollection.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,42 +40,42 @@ #include <list> namespace ppt -{ +{ class ExSoundEntry { - sal_uInt32 nFileSize; - String aSoundURL; + sal_uInt32 nFileSize; + String aSoundURL; - String ImplGetName() const; - String ImplGetExtension() const; + String ImplGetName() const; + String ImplGetExtension() const; public : - - sal_Bool IsSameURL( const String& rURL ) const; - sal_uInt32 GetFileSize( ) const { return nFileSize; }; + + sal_Bool IsSameURL( const String& rURL ) const; + sal_uInt32 GetFileSize( ) const { return nFileSize; }; ExSoundEntry( const String& rSoundURL ); // returns the size of a complete SoundContainer - sal_uInt32 GetSize( sal_uInt32 nId ) const; - void Write( SvStream& rSt, sal_uInt32 nId ); + sal_uInt32 GetSize( sal_uInt32 nId ) const; + void Write( SvStream& rSt, sal_uInt32 nId ); }; class ExSoundCollection : private List { - const ExSoundEntry* ImplGetByIndex( sal_uInt32 nId ) const; + const ExSoundEntry* ImplGetByIndex( sal_uInt32 nId ) const; public: ExSoundCollection() {} ~ExSoundCollection(); - sal_uInt32 GetId( const String& ); + sal_uInt32 GetId( const String& ); // returns the size of a complete SoundCollectionContainer - sal_uInt32 GetSize() const; - void Write( SvStream& rSt ); + sal_uInt32 GetSize() const; + void Write( SvStream& rSt ); }; } // namespace ppt diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index 0d91df41500f..4ddb30612f40 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -120,7 +120,7 @@ class SdGRFFilter_ImplInteractionHdl : public ::cppu::WeakImplHelper1< com::sun: USHORT GetErrorCode() const { return nFilterError; }; - virtual void SAL_CALL handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& ) + virtual void SAL_CALL handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& ) throw( com::sun::star::uno::RuntimeException ); }; @@ -209,13 +209,13 @@ sal_Bool SdGRFFilter::Import() const String aFileName( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter(); const USHORT nFilter = pGraphicFilter->GetImportFormatNumberForTypeName( mrMedium.GetFilter()->GetTypeName() ); - sal_Bool bRet = sal_False; + sal_Bool bRet = sal_False; // ggf. Filterdialog ausfuehren if ( !pGraphicFilter->HasImportDialog( nFilter ) || pGraphicFilter->DoImportDialog( NULL, nFilter ) ) { - SvStream* pIStm = mrMedium.GetInStream(); - USHORT nReturn = pIStm ? pGraphicFilter->ImportGraphic( aGraphic, aFileName, *pIStm, nFilter ) : 1; + SvStream* pIStm = mrMedium.GetInStream(); + USHORT nReturn = pIStm ? pGraphicFilter->ImportGraphic( aGraphic, aFileName, *pIStm, nFilter ) : 1; if( nReturn ) HandleGraphicFilterError( nReturn, pGraphicFilter->GetLastError().nStreamError ); @@ -224,10 +224,10 @@ sal_Bool SdGRFFilter::Import() if( mrDocument.GetPageCount() == 0L ) mrDocument.CreateFirstPages(); - SdPage* pPage = mrDocument.GetSdPage( 0, PK_STANDARD ); - Point aPos; - Size aPagSize( pPage->GetSize() ); - Size aGrfSize( OutputDevice::LogicToLogic( aGraphic.GetPrefSize(), + SdPage* pPage = mrDocument.GetSdPage( 0, PK_STANDARD ); + Point aPos; + Size aPagSize( pPage->GetSize() ); + Size aGrfSize( OutputDevice::LogicToLogic( aGraphic.GetPrefSize(), aGraphic.GetPrefMapMode(), MAP_100TH_MM ) ); aPagSize.Width() -= pPage->GetLftBorder() + pPage->GetRgtBorder(); @@ -237,8 +237,8 @@ sal_Bool SdGRFFilter::Import() if ( ( ( aGrfSize.Height() > aPagSize.Height() ) || ( aGrfSize.Width() > aPagSize.Width() ) ) && aGrfSize.Height() && aPagSize.Height() ) { - double fGrfWH = (double) aGrfSize.Width() / aGrfSize.Height(); - double fWinWH = (double) aPagSize.Width() / aPagSize.Height(); + double fGrfWH = (double) aGrfSize.Width() / aGrfSize.Height(); + double fWinWH = (double) aPagSize.Width() / aPagSize.Height(); // Grafik an Pagesize anpassen (skaliert) if( fGrfWH < fWinWH ) @@ -285,8 +285,8 @@ sal_Bool SdGRFFilter::Export() ( xComponent, uno::UNO_QUERY ); if ( xExporter.is() && xFilter.is() ) { - SdPage* pPage = NULL; - sd::DrawViewShell* pDrawViewShell = static_cast< ::sd::DrawViewShell* > + SdPage* pPage = NULL; + sd::DrawViewShell* pDrawViewShell = static_cast< ::sd::DrawViewShell* > ( ( ( mrDocShell.GetViewShell() && mrDocShell.GetViewShell()->ISA(::sd::DrawViewShell ) ) ? mrDocShell.GetViewShell() : NULL ) ); PageKind ePageKind = PK_STANDARD; @@ -325,8 +325,8 @@ sal_Bool SdGRFFilter::Export() rtl::OUString sFilterName( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) ); rtl::OUString sShortName( pGraphicFilter->GetExportFormatShortName( nFilter ) ); - sal_Bool bFilterNameFound = sal_False; - sal_Int32 i, nCount; + sal_Bool bFilterNameFound = sal_False; + sal_Int32 i, nCount; for ( i = 0, nCount = aArgs.getLength(); i < nCount; i++ ) { rtl::OUString& rStr = aArgs[ i ].Name; @@ -454,7 +454,7 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su } } // Fallthrough! -// case ::com::sun::star::graphic::GraphicType::EMPTY: +// case ::com::sun::star::graphic::GraphicType::EMPTY: default: aMimeType = OUString::createFromAscii( "image/png" ); break; diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx index 14bd3e46c581..377907682928 100644 --- a/sd/source/filter/html/HtmlOptionsDialog.cxx +++ b/sd/source/filter/html/HtmlOptionsDialog.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -143,8 +143,8 @@ Sequence< ::rtl::OUString > SAL_CALL SdHtmlOptionsDialog_getSupportedServiceName // ----------------------------------------------------------------------------- SdHtmlOptionsDialog::SdHtmlOptionsDialog( const Reference< XMultiServiceFactory > & xMgr ) : - mrxMgr ( xMgr ), - meDocType ( DOCUMENT_TYPE_DRAW ) + mrxMgr ( xMgr ), + meDocType ( DOCUMENT_TYPE_DRAW ) { } diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx index be6da8ddb74b..0cb5032eb1ea 100644 --- a/sd/source/filter/html/buttonset.cxx +++ b/sd/source/filter/html/buttonset.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/filter/html/buttonset.hxx b/sd/source/filter/html/buttonset.hxx index 6027ad4dbf01..6cd867bc6dea 100644 --- a/sd/source/filter/html/buttonset.hxx +++ b/sd/source/filter/html/buttonset.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ public: ~ButtonSet(); int getCount() const; - + bool getPreview( int nSet, const std::vector< rtl::OUString >& rButtons, Image& rImage ); bool exportButton( int nSet, const rtl::OUString& rPath, const rtl::OUString& rName ); diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx index 4bcb73535ba1..57c984a37ba0 100755 --- a/sd/source/filter/html/htmlattr.cxx +++ b/sd/source/filter/html/htmlattr.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/filter/html/htmlattr.hxx b/sd/source/filter/html/htmlattr.hxx index 1caa16822ab1..a93da62b83d1 100755 --- a/sd/source/filter/html/htmlattr.hxx +++ b/sd/source/filter/html/htmlattr.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,16 +35,16 @@ class SdHtmlAttrPreview : public Control { protected: - Color m_aBackColor, m_aTextColor, m_aLinkColor; + Color m_aBackColor, m_aTextColor, m_aLinkColor; Color m_aVLinkColor, m_aALinkColor; public: SdHtmlAttrPreview( Window* pParent, const ResId& rResId ); ~SdHtmlAttrPreview(); - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ); - void SetColors( Color& aBack, Color& aText, Color& aLink, + void SetColors( Color& aBack, Color& aText, Color& aLink, Color& aVLink, Color& aALink ); }; diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 9de46771e14c..33136ba20734 100755 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -105,7 +105,7 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::document; -#define KEY_QUALITY "JPG-EXPORT-QUALITY" +#define KEY_QUALITY "JPG-EXPORT-QUALITY" // Parameter aus Itemset abfragen @@ -129,21 +129,21 @@ const char *pButtonNames[NUM_BUTTONS] = "collapse.png", }; -#define BTN_FIRST_0 0 -#define BTN_FIRST_1 1 -#define BTN_PREV_0 2 -#define BTN_PREV_1 3 -#define BTN_NEXT_0 4 -#define BTN_NEXT_1 5 -#define BTN_LAST_0 6 -#define BTN_LAST_1 7 -#define BTN_INDEX 8 -#define BTN_TEXT 9 -#define BTN_MORE 10 -#define BTN_LESS 11 +#define BTN_FIRST_0 0 +#define BTN_FIRST_1 1 +#define BTN_PREV_0 2 +#define BTN_PREV_1 3 +#define BTN_NEXT_0 4 +#define BTN_NEXT_1 5 +#define BTN_LAST_0 6 +#define BTN_LAST_1 7 +#define BTN_INDEX 8 +#define BTN_TEXT 9 +#define BTN_MORE 10 +#define BTN_LESS 11 // Fuer Detectfilter -#define CALC_OPTIONS "9,34,SYSTEM" +#define CALC_OPTIONS "9,34,SYSTEM" // ********************************************************************* // Hilfsklasse fuer das simple erzeugen von Dateien lokal/remote @@ -151,9 +151,9 @@ const char *pButtonNames[NUM_BUTTONS] = class EasyFile { private: - SvStream* pOStm; - SfxMedium* pMedium; - bool bOpen; + SvStream* pOStm; + SfxMedium* pMedium; + bool bOpen; public: @@ -381,7 +381,7 @@ HtmlExport::HtmlExport( const Sequence< PropertyValue >& rParams, SdDrawDocument* pExpDoc, ::sd::DrawDocShell* pDocShell ) - : maPath( aPath ), + : maPath( aPath ), mpDoc(pExpDoc), mpDocSh( pDocShell ), meEC(NULL), @@ -678,7 +678,7 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams INetURLObject aINetURLObj( maPath ); DBG_ASSERT( aINetURLObj.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); - maExportPath = aINetURLObj.GetPartBeforeLastName(); // with trailing '/' + maExportPath = aINetURLObj.GetPartBeforeLastName(); // with trailing '/' maIndex = aINetURLObj.GetLastName(); mnSdPageCount = mpDoc->GetSdPageCount( PK_STANDARD ); @@ -1061,9 +1061,9 @@ bool HtmlExport::CreateImagesForPresPages() // ===================================================================== SdrTextObj* HtmlExport::GetLayoutTextObject(SdrPage* pPage) { - ULONG nObjectCount = pPage->GetObjCount(); - SdrObject* pObject = NULL; - SdrTextObj* pResult = NULL; + ULONG nObjectCount = pPage->GetObjCount(); + SdrObject* pObject = NULL; + SdrTextObj* pResult = NULL; for (ULONG nObject = 0; nObject < nObjectCount; nObject++) { @@ -1108,7 +1108,7 @@ bool HtmlExport::CreateHtmlTextForPresPages() if( mbDocColors ) { SetDocColors( pPage ); -// maBackColor = pPage->GetPageBackgroundColor(); +// maBackColor = pPage->GetPageBackgroundColor(); } // HTML Kopf @@ -1641,12 +1641,12 @@ bool HtmlExport::CreateHtmlForPresPages() for (ULONG nObject = 0; nObject < nClickableObjectCount; nObject++) { SdrObject* pObject = (SdrObject*)aClickableObjects.GetObject(nObject); - SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo(pObject); - SdIMapInfo* pIMapInfo = mpDoc->GetIMapInfo(pObject); + SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo(pObject); + SdIMapInfo* pIMapInfo = mpDoc->GetIMapInfo(pObject); Rectangle aRect(pObject->GetCurrentBoundRect()); - Point aLogPos(aRect.TopLeft()); - bool bIsSquare = aRect.GetWidth() == aRect.GetHeight(); + Point aLogPos(aRect.TopLeft()); + bool bIsSquare = aRect.GetWidth() == aRect.GetHeight(); ULONG nPageWidth = pPage->GetSize().Width() - pPage->GetLftBorder() - pPage->GetRgtBorder(); @@ -1692,7 +1692,7 @@ bool HtmlExport::CreateHtmlForPresPages() } if (nPgNum != SDRPAGE_NOTFOUND) { - nPgNum = (nPgNum - 1) / 2; // SdrPageNum --> SdPageNum + nPgNum = (nPgNum - 1) / 2; // SdrPageNum --> SdPageNum aURL = CreatePageURL(nPgNum); } @@ -1757,14 +1757,14 @@ bool HtmlExport::CreateHtmlForPresPages() \************************************************************/ if( pInfo ) { - String aHRef; + String aHRef; presentation::ClickAction eClickAction = pInfo->meClickAction; switch( eClickAction ) { case presentation::ClickAction_BOOKMARK: { - BOOL bIsMasterPage; + BOOL bIsMasterPage; USHORT nPgNum = mpDoc->GetPageByName( pInfo->GetBookmark(), bIsMasterPage ); SdrObject* pObj = NULL; @@ -2107,7 +2107,7 @@ void HtmlExport::CreateFileNames() mpPageNames = new String*[mnSdPageCount]; mpTextFiles = new String*[mnSdPageCount]; - mbHeader = false; // Ueberschrift auf Uebersichtsseite? + mbHeader = false; // Ueberschrift auf Uebersichtsseite? for (USHORT nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++) { @@ -2502,7 +2502,7 @@ bool HtmlExport::CreateNavBarFrames() if(mnButtonThema != -1) aButton = CreateImage(GetButtonName(BTN_TEXT), aButton); - String aText0( RTL_CONSTASCII_USTRINGPARAM("text0")); + String aText0( RTL_CONSTASCII_USTRINGPARAM("text0")); aText0 += maHTMLExtension; aStr += CreateLink( aText0, aButton, String(RTL_CONSTASCII_USTRINGPARAM("_top"))); aStr.AppendAscii( "\r\n" ); @@ -2635,7 +2635,7 @@ String HtmlExport::CreateNavBar( USHORT nSdPage, bool bIsText ) const // to Previous page if(nSdPage > 0) aStr += CreateLink( bIsText?*mpTextFiles[nSdPage-1]: - *mpHTMLFiles[nSdPage-1], aStrNavPrev); + *mpHTMLFiles[nSdPage-1], aStrNavPrev); else aStr += aStrNavPrev; aStr.Append(sal_Unicode(' ')); @@ -2836,7 +2836,7 @@ String HtmlExport::CreateHTMLCircleArea( ULONG nRadius, String HtmlExport::CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPolyPolygon, Size aShift, double fFactor, const String& rHRef ) const { - String aStr; + String aStr; const sal_uInt32 nNoOfPolygons(rPolyPolygon.count()); for ( sal_uInt32 nXPoly = 0L; nXPoly < nNoOfPolygons; nXPoly++ ) @@ -2924,16 +2924,16 @@ String HtmlExport::CreatePageURL( USHORT nPgNum ) bool HtmlExport::CopyScript( const String& rPath, const String& rSource, const String& rDest, bool bUnix /* = false */ ) { - INetURLObject aURL( SvtPathOptions().GetConfigPath() ); - String aScript; + INetURLObject aURL( SvtPathOptions().GetConfigPath() ); + String aScript; aURL.Append( String( RTL_CONSTASCII_USTRINGPARAM("webcast") ) ); aURL.Append( rSource ); meEC.SetContext( STR_HTMLEXP_ERROR_OPEN_FILE, rSource ); - ULONG nErr = 0; - SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ ); + ULONG nErr = 0; + SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ ); if( pIStm ) { @@ -3099,8 +3099,8 @@ String HtmlExport::InsertSound( const String& rSoundFile ) if( rSoundFile.Len() == 0 ) return rSoundFile; - String aStr( RTL_CONSTASCII_USTRINGPARAM("<embed src=\"") ); - INetURLObject aURL( rSoundFile ); + String aStr( RTL_CONSTASCII_USTRINGPARAM("<embed src=\"") ); + INetURLObject aURL( rSoundFile ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index 43bc12419f84..b3488e1f91d9 100755 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,12 +52,12 @@ #define NUM_BUTTONS 12 -#define PUB_LOWRES_WIDTH 640 -#define PUB_LOWRES_HEIGHT 480 -#define PUB_MEDRES_WIDTH 800 -#define PUB_MEDRES_HEIGHT 600 -#define PUB_HIGHRES_WIDTH 1024 -#define PUB_HIGHRES_HEIGHT 768 +#define PUB_LOWRES_WIDTH 640 +#define PUB_LOWRES_HEIGHT 480 +#define PUB_MEDRES_WIDTH 800 +#define PUB_MEDRES_HEIGHT 600 +#define PUB_HIGHRES_WIDTH 1024 +#define PUB_HIGHRES_HEIGHT 768 #define HtmlButtonThemaStr = "private://gallery/hidden/HtmlExportButtons"; @@ -78,18 +78,18 @@ class View; class HtmlErrorContext : public ErrorContext { private: - USHORT mnResId; - String maURL1; - String maURL2; + USHORT mnResId; + String maURL1; + String maURL2; public: HtmlErrorContext(Window *pWin=0); ~HtmlErrorContext() {}; - virtual BOOL GetString( ULONG nErrId, String& rCtxStr ); + virtual BOOL GetString( ULONG nErrId, String& rCtxStr ); - void SetContext( USHORT nResId, const String& rURL ); - void SetContext( USHORT nResId, const String& rURL1, const String& rURL2 ); + void SetContext( USHORT nResId, const String& rURL ); + void SetContext( USHORT nResId, const String& rURL1, const String& rURL2 ); }; // ===================================================================== @@ -133,13 +133,13 @@ class HtmlExport bool mbDownload; bool mbAutoSlide; - UINT32 mnSlideDuration; + UINT32 mnSlideDuration; bool mbSlideSound; bool mbHiddenSlides; bool mbEndless; - bool mbUserAttr; // die folgenden Farben werden fuer das <body> - Color maTextColor; // tag genutzt, wenn mbUserAttr true ist + bool mbUserAttr; // die folgenden Farben werden fuer das <body> + Color maTextColor; // tag genutzt, wenn mbUserAttr true ist Color maBackColor; Color maLinkColor; Color maVLinkColor; @@ -147,13 +147,13 @@ class HtmlExport Color maFirstPageColor; bool mbDocColors; - String maHTMLExtension; + String maHTMLExtension; String** mpHTMLFiles; String** mpImageFiles; String** mpPageNames; String** mpTextFiles; - String maExportPath; // Das Ausgabeverzeichnes bzw. die URL + String maExportPath; // Das Ausgabeverzeichnes bzw. die URL String maIndexUrl; String maURLPath; String maCGIPath; @@ -167,49 +167,49 @@ class HtmlExport void SetDocColors( SdPage* pPage = NULL ); - bool CreateImagesForPresPages(); - bool CreateHtmlTextForPresPages(); - bool CreateHtmlForPresPages(); - bool CreateContentPage(); - void CreateFileNames(); - bool CreateBitmaps(); - bool CreateOutlinePages(); - bool CreateFrames(); - bool CreateNotesPages(); - bool CreateNavBarFrames(); - - bool CreateASPScripts(); - bool CreatePERLScripts(); - bool CreateImageFileList(); - bool CreateImageNumberFile(); - - bool checkForExistingFiles(); - bool checkFileExists( ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess >& xFileAccess, String const & aFileName ); + bool CreateImagesForPresPages(); + bool CreateHtmlTextForPresPages(); + bool CreateHtmlForPresPages(); + bool CreateContentPage(); + void CreateFileNames(); + bool CreateBitmaps(); + bool CreateOutlinePages(); + bool CreateFrames(); + bool CreateNotesPages(); + bool CreateNavBarFrames(); + + bool CreateASPScripts(); + bool CreatePERLScripts(); + bool CreateImageFileList(); + bool CreateImageNumberFile(); + + bool checkForExistingFiles(); + bool checkFileExists( ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess >& xFileAccess, String const & aFileName ); String getDocumentTitle(); - bool SavePresentation(); + bool SavePresentation(); - String CreateLink( const String& aLink, const String& aText, + String CreateLink( const String& aLink, const String& aText, const String& aTarget = String()) const; - String CreateImage( const String& aImage, const String& aAltText, INT16 nWidth = -1, INT16 nHeight = -1 ) const; - String CreateNavBar( USHORT nSdPage, bool bIsText ) const; - String CreateBodyTag() const; + String CreateImage( const String& aImage, const String& aAltText, INT16 nWidth = -1, INT16 nHeight = -1 ) const; + String CreateNavBar( USHORT nSdPage, bool bIsText ) const; + String CreateBodyTag() const; - String ParagraphToHTMLString( SdrOutliner* pOutliner, ULONG nPara, const Color& rBackgroundColor ); - String TextAttribToHTMLString( SfxItemSet* pSet, HtmlState* pState, const Color& rBackgroundColor ); + String ParagraphToHTMLString( SdrOutliner* pOutliner, ULONG nPara, const Color& rBackgroundColor ); + String TextAttribToHTMLString( SfxItemSet* pSet, HtmlState* pState, const Color& rBackgroundColor ); - String CreateTextForTitle( SdrOutliner* pOutliner, SdPage* pPage, const Color& rBackgroundColor ); - String CreateTextForPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor ); - String CreateTextForNotesPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor ); + String CreateTextForTitle( SdrOutliner* pOutliner, SdPage* pPage, const Color& rBackgroundColor ); + String CreateTextForPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor ); + String CreateTextForNotesPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor ); - String CreateHTMLCircleArea( ULONG nRadius, ULONG nCenterX, + String CreateHTMLCircleArea( ULONG nRadius, ULONG nCenterX, ULONG nCenterY, const String& rHRef ) const; - String CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPolyPoly, Size aShift, double fFactor, const String& rHRef ) const; - String CreateHTMLRectArea( const Rectangle& rRect, + String CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPolyPoly, Size aShift, double fFactor, const String& rHRef ) const; + String CreateHTMLRectArea( const Rectangle& rRect, const String& rHRef ) const; - String CreatePageURL( USHORT nPgNum ); - + String CreatePageURL( USHORT nPgNum ); + String InsertSound( const String& rSoundFile ); bool CopyFile( const String& rSourceFile, const String& rDestPath ); bool CopyScript( const String& rPath, const String& rSource, const String& rDest, bool bUnix = false ); @@ -231,9 +231,9 @@ class HtmlExport HtmlExport( rtl::OUString aPath, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rParams, SdDrawDocument* pExpDoc, ::sd::DrawDocShell* pDocShell ); virtual ~HtmlExport(); - static String ColorToHTMLString( Color aColor ); - static String StringToHTMLString( const String& rString ); - static String StringToURL( const String& rURL ); + static String ColorToHTMLString( Color aColor ); + static String StringToHTMLString( const String& rString ); + static String StringToURL( const String& rURL ); }; #endif // _SD_HTMLEX_HXX diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 8079238bc1dc..7ed8deb37c4b 100755 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ extern void InterpolateFixedBitmap( FixedBitmap * pBitmap ); const UINT16 nMagic = (UINT16)0x1977; // Key fuer die soffice.ini -#define KEY_QUALITY "JPG-EXPORT-QUALITY" +#define KEY_QUALITY "JPG-EXPORT-QUALITY" // Die Help Ids der einzelnen Seiten ULONG aPageHelpIds[NOOFPAGES] = @@ -98,49 +98,49 @@ ULONG aPageHelpIds[NOOFPAGES] = class SdPublishingDesign { public: - String m_aDesignName; + String m_aDesignName; - HtmlPublishMode m_eMode; + HtmlPublishMode m_eMode; // special WebCast options PublishingScript m_eScript; - String m_aCGI; - String m_aURL; + String m_aCGI; + String m_aURL; // special Kiosk options - BOOL m_bAutoSlide; - UINT32 m_nSlideDuration; - BOOL m_bEndless; + BOOL m_bAutoSlide; + UINT32 m_nSlideDuration; + BOOL m_bEndless; // special HTML options - BOOL m_bContentPage; - BOOL m_bNotes; + BOOL m_bContentPage; + BOOL m_bNotes; // misc options - UINT16 m_nResolution; - String m_aCompression; + UINT16 m_nResolution; + String m_aCompression; PublishingFormat m_eFormat; - BOOL m_bSlideSound; + BOOL m_bSlideSound; BOOL m_bHiddenSlides; // titel page information - String m_aAuthor; - String m_aEMail; - String m_aWWW; - String m_aMisc; - BOOL m_bDownload; - BOOL m_bCreated; // not used + String m_aAuthor; + String m_aEMail; + String m_aWWW; + String m_aMisc; + BOOL m_bDownload; + BOOL m_bCreated; // not used // buttons and colorscheme - INT16 m_nButtonThema; - BOOL m_bUserAttr; - Color m_aBackColor; - Color m_aTextColor; + INT16 m_nButtonThema; + BOOL m_bUserAttr; + Color m_aBackColor; + Color m_aTextColor; Color m_aLinkColor; - Color m_aVLinkColor; - Color m_aALinkColor; - BOOL m_bUseAttribs; - BOOL m_bUseColor; + Color m_aVLinkColor; + Color m_aALinkColor; + BOOL m_bUseAttribs; + BOOL m_bUseColor; SdPublishingDesign(); @@ -160,7 +160,7 @@ SdPublishingDesign::SdPublishingDesign() m_eFormat = FORMAT_PNG; - String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/JPG" ) ); + String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/JPG" ) ); FilterConfigItem aFilterConfigItem( aFilterConfigPath ); sal_Int32 nCompression = aFilterConfigItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( KEY_QUALITY ) ), 75 ); m_aCompression = UniString::CreateFromInt32( nCompression ); @@ -168,33 +168,33 @@ SdPublishingDesign::SdPublishingDesign() SvtUserOptions aUserOptions; - m_nResolution = PUB_LOWRES_WIDTH; + m_nResolution = PUB_LOWRES_WIDTH; m_aAuthor = aUserOptions.GetFirstName(); if( m_aAuthor.Len() && aUserOptions.GetLastName().getLength() ) - m_aAuthor += sal_Unicode(' '); + m_aAuthor += sal_Unicode(' '); m_aAuthor += (String)aUserOptions.GetLastName(); m_aEMail = aUserOptions.GetEmail(); - m_bDownload = FALSE; -//-/ m_bCreated = TRUE; - m_nButtonThema = -1; + m_bDownload = FALSE; +//-/ m_bCreated = TRUE; + m_nButtonThema = -1; - m_bUserAttr = FALSE; - m_bUseAttribs = TRUE; - m_bUseColor = TRUE; + m_bUserAttr = FALSE; + m_bUseAttribs = TRUE; + m_bUseColor = TRUE; m_aBackColor = COL_WHITE; m_aTextColor = COL_BLACK; m_aLinkColor = COL_BLUE; - m_aVLinkColor = COL_LIGHTBLUE; - m_aALinkColor = COL_GRAY; + m_aVLinkColor = COL_LIGHTBLUE; + m_aALinkColor = COL_GRAY; - m_eScript = SCRIPT_ASP; + m_eScript = SCRIPT_ASP; - m_bAutoSlide = TRUE; + m_bAutoSlide = TRUE; m_nSlideDuration = 15; - m_bEndless = TRUE; + m_bEndless = TRUE; - m_bSlideSound = TRUE; + m_bSlideSound = TRUE; m_bHiddenSlides = FALSE; } @@ -205,22 +205,22 @@ int SdPublishingDesign::operator ==(const SdPublishingDesign & rDesign) const { return ( - m_eMode == rDesign.m_eMode && + m_eMode == rDesign.m_eMode && m_nResolution == rDesign.m_nResolution && m_aCompression == rDesign.m_aCompression && - m_eFormat == rDesign.m_eFormat && + m_eFormat == rDesign.m_eFormat && m_bHiddenSlides == rDesign.m_bHiddenSlides && ( // compare html options (m_eMode != PUBLISH_HTML && m_eMode != PUBLISH_FRAMES) || ( m_bContentPage == rDesign.m_bContentPage && - m_bNotes == rDesign.m_bNotes && - m_aAuthor == rDesign.m_aAuthor && - m_aEMail == rDesign.m_aEMail && - m_aWWW == rDesign.m_aWWW && - m_aMisc == rDesign.m_aMisc && + m_bNotes == rDesign.m_bNotes && + m_aAuthor == rDesign.m_aAuthor && + m_aEMail == rDesign.m_aEMail && + m_aWWW == rDesign.m_aWWW && + m_aMisc == rDesign.m_aMisc && m_bDownload == rDesign.m_bDownload && -//-/ m_bCreated == rDesign.m_bCreated && +//-/ m_bCreated == rDesign.m_bCreated && m_nButtonThema == rDesign.m_nButtonThema && m_bUserAttr == rDesign.m_bUserAttr && m_aBackColor == rDesign.m_aBackColor && @@ -233,7 +233,7 @@ int SdPublishingDesign::operator ==(const SdPublishingDesign & rDesign) const m_bUseColor == rDesign.m_bUseColor ) ) && - ( // compare kiosk options + ( // compare kiosk options (m_eMode != PUBLISH_KIOSK) || ( m_bAutoSlide == rDesign.m_bAutoSlide && @@ -247,7 +247,7 @@ int SdPublishingDesign::operator ==(const SdPublishingDesign & rDesign) const ) ) ) && - ( // compare WebCast options + ( // compare WebCast options (m_eMode != PUBLISH_WEBCAST) || ( m_eScript == rDesign.m_eScript && @@ -286,7 +286,7 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign) rIn.ReadByteString( rDesign.m_aWWW, RTL_TEXTENCODING_UTF8 ); rIn.ReadByteString( rDesign.m_aMisc, RTL_TEXTENCODING_UTF8 ); rIn >> rDesign.m_bDownload; - rIn >> rDesign.m_bCreated; // not used + rIn >> rDesign.m_bCreated; // not used rIn >> rDesign.m_nButtonThema; rIn >> rDesign.m_bUserAttr; rIn >> rDesign.m_aBackColor; @@ -333,7 +333,7 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign) rOut.WriteByteString( rDesign.m_aWWW, RTL_TEXTENCODING_UTF8 ); rOut.WriteByteString( rDesign.m_aMisc, RTL_TEXTENCODING_UTF8 ); rOut << rDesign.m_bDownload; - rOut << rDesign.m_bCreated; // not used + rOut << rDesign.m_bCreated; // not used rOut << rDesign.m_nButtonThema; rOut << rDesign.m_bUserAttr; rOut << rDesign.m_aBackColor; @@ -363,9 +363,9 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign) class SdDesignNameDlg : public ModalDialog { private: - Edit m_aEdit; - OKButton m_aBtnOK; - CancelButton m_aBtnCancel; + Edit m_aEdit; + OKButton m_aBtnOK; + CancelButton m_aBtnCancel; public: SdDesignNameDlg(Window* pWindow, const String& aName ); @@ -382,18 +382,18 @@ public: // Konstruktor des Dialogs // ===================================================================== SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType) -: ModalDialog(pWindow, SdResId( DLG_PUBLISHING )) -, mpButtonSet( new ButtonSet() ) -, aBottomLine( this, SdResId( BOTTOM_LINE ) ) -, aHelpButton(this,SdResId(BUT_HELP)) -, aCancelButton(this,SdResId(BUT_CANCEL)) -, aLastPageButton(this,SdResId(BUT_LAST)) -, aNextPageButton(this,SdResId(BUT_NEXT)) -, aFinishButton(this,SdResId(BUT_FINISH)) -, aAssistentFunc(NOOFPAGES) -, m_bButtonsDirty(TRUE) -, m_bDesignListDirty(FALSE) -, m_pDesign(NULL) +: ModalDialog(pWindow, SdResId( DLG_PUBLISHING )) +, mpButtonSet( new ButtonSet() ) +, aBottomLine( this, SdResId( BOTTOM_LINE ) ) +, aHelpButton(this,SdResId(BUT_HELP)) +, aCancelButton(this,SdResId(BUT_CANCEL)) +, aLastPageButton(this,SdResId(BUT_LAST)) +, aNextPageButton(this,SdResId(BUT_NEXT)) +, aFinishButton(this,SdResId(BUT_FINISH)) +, aAssistentFunc(NOOFPAGES) +, m_bButtonsDirty(TRUE) +, m_bDesignListDirty(FALSE) +, m_pDesign(NULL) { m_bImpress = eDocType == DOCUMENT_TYPE_IMPRESS; @@ -427,7 +427,7 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType) pPage2_ASP->SetClickHdl(LINK(this,SdPublishingDlg,WebServerHdl)); pPage2_PERL->SetClickHdl(LINK(this,SdPublishingDlg,WebServerHdl)); - String aText( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("index")) ); + String aText( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("index")) ); aText += String(SdResId(STR_HTMLEXP_DEFAULT_EXTENSION)); pPage2_Index->SetText(aText); pPage2_CGI->SetText( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "/cgi-bin/" ) ) ); @@ -491,7 +491,7 @@ SdPublishingDlg::~SdPublishingDlg() { if( m_pDesignList ) { - for( UINT16 nIndex = 0; nIndex < m_pDesignList->Count(); nIndex++ ) + for( UINT16 nIndex = 0; nIndex < m_pDesignList->Count(); nIndex++ ) delete (SdPublishingDesign*)m_pDesignList->GetObject(nIndex); } @@ -640,8 +640,8 @@ void SdPublishingDlg::CreatePages() if(m_bImpress) aAssistentFunc.InsertControl(4, pPage4_Download = new CheckBox(this,SdResId(PAGE4_DOWNLOAD))); -//-/ aAssistentFunc.InsertControl(4, -//-/ pPage4_Created = new CheckBox(this,SdResId(PAGE4_CREATED))); +//-/ aAssistentFunc.InsertControl(4, +//-/ pPage4_Created = new CheckBox(this,SdResId(PAGE4_CREATED))); // Seite 5 aAssistentFunc.InsertControl(5, @@ -767,7 +767,7 @@ void SdPublishingDlg::RemovePages() delete pPage4_Misc; if(m_bImpress) delete pPage4_Download; -//-/ delete pPage4_Created; +//-/ delete pPage4_Created; delete pPage5_Bmp; delete pPage5_Titel; @@ -907,7 +907,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) // #92433# try to guess protocol for user's homepage INetURLObject aHomeURL( pPage4_WWW->GetText(), - INET_PROT_HTTP, // default proto is HTTP + INET_PROT_HTTP, // default proto is HTTP INetURLObject::ENCODE_ALL ); aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "HomepageURL" ) ); @@ -965,7 +965,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) } // Seite 6 -// aSet.Put(SfxBoolItem(ATTR_PUBLISH_SLIDESOUND,pPage6_Sound->IsChecked())); +// aSet.Put(SfxBoolItem(ATTR_PUBLISH_SLIDESOUND,pPage6_Sound->IsChecked())); rParams.realloc( aProps.size() ); @@ -1002,7 +1002,7 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, RadioButton *, pButton ) if(pPage1_Designs->GetSelectEntryCount() == 0) pPage1_Designs->SelectEntryPos(0); - USHORT nPos = pPage1_Designs->GetSelectEntryPos(); + USHORT nPos = pPage1_Designs->GetSelectEntryPos(); m_pDesign = (SdPublishingDesign*)m_pDesignList->GetObject(nPos); DBG_ASSERT(m_pDesign, "Kein Design? Das darf nicht sein! (CL)"); @@ -1517,7 +1517,7 @@ void SdPublishingDlg::SetDesign( SdPublishingDesign* pDesign ) pPage4_Misc->SetText(pDesign->m_aMisc); if(m_bImpress) pPage4_Download->Check(pDesign->m_bDownload); -//-/ pPage4_Created->Check(pDesign->m_bCreated); +//-/ pPage4_Created->Check(pDesign->m_bCreated); pPage5_TextOnly->Check(pDesign->m_nButtonThema == -1); if(pDesign->m_nButtonThema != -1) @@ -1553,7 +1553,7 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign ) if(!pDesign) return; - pDesign->m_eMode = pPage2_Standard->IsChecked()?PUBLISH_HTML: + pDesign->m_eMode = pPage2_Standard->IsChecked()?PUBLISH_HTML: pPage2_Frames->IsChecked()?PUBLISH_FRAMES: pPage2_Kiosk->IsChecked()?PUBLISH_KIOSK: PUBLISH_WEBCAST; @@ -1582,7 +1582,7 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign ) pDesign->m_aWWW = pPage4_WWW->GetText(); pDesign->m_aMisc = pPage4_Misc->GetText(); pDesign->m_bDownload = m_bImpress?pPage4_Download->IsChecked():FALSE; -//-/ pDesign->m_bCreated = pPage4_Created->IsChecked(); +//-/ pDesign->m_bCreated = pPage4_Created->IsChecked(); if(pPage5_TextOnly->IsChecked()) pDesign->m_nButtonThema = -1; @@ -1724,7 +1724,7 @@ BOOL SdPublishingDlg::Save() // ===================================================================== SdDesignNameDlg::SdDesignNameDlg(Window* pWindow, const String& aName): ModalDialog (pWindow, SdResId( DLG_DESIGNNAME )), - m_aEdit (this, SdResId(EDT_NAME)), + m_aEdit (this, SdResId(EDT_NAME)), m_aBtnOK (this, SdResId(BTN_SAVE)), m_aBtnCancel (this, SdResId(BTN_NOSAVE)) { diff --git a/sd/source/filter/html/pubdlg.src b/sd/source/filter/html/pubdlg.src index 00e9b4af75e4..cc57ab31b4af 100644 --- a/sd/source/filter/html/pubdlg.src +++ b/sd/source/filter/html/pubdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -386,7 +386,7 @@ ModalDialog DLG_PUBLISHING Size = MAP_APPFONT( 116, 10 ); Text [ en-US ] = "~PNG"; }; - + RadioButton PAGE3_GIF { Pos = MAP_APPFONT( 12, 63 ); diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx index f447e2039c70..d263c620cd0b 100644 --- a/sd/source/filter/html/sdhtmlfilter.cxx +++ b/sd/source/filter/html/sdhtmlfilter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index 25ac858ca319..3cd9f533cc00 100755 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -229,7 +229,7 @@ void Ppt97Animation::SetAnimateAssociatedShape( bool bAnimate ) DBG_WARNING("you tried to deselect the animation of the form for random animation-> this has been refused"); return; } - + } if(bAnimate) @@ -289,7 +289,7 @@ void Ppt97Animation::UpdateCacheData() const return; ClearCacheData(); - + if( !HasEffect() ) { m_bDirtyCache = false; @@ -299,19 +299,19 @@ void Ppt97Animation::UpdateCacheData() const switch( m_aAtom.nFlyMethod ) { case 0x0: - //eRetval = ::com::sun::star::presentation::AnimationEffect_APPEAR; + //eRetval = ::com::sun::star::presentation::AnimationEffect_APPEAR; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-appear"); // --- appear --- break; case 0x01: - //eRetval = ::com::sun::star::presentation::AnimationEffect_RANDOM; + //eRetval = ::com::sun::star::presentation::AnimationEffect_RANDOM; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-random"); // --- random --- break; - case 0x02: // --- blinds effect --- + case 0x02: // --- blinds effect --- { switch ( m_aAtom.nFlyDirection ) { case 0x0: - //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_STRIPES; + //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_STRIPES; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-venetian-blinds"); m_aSubType = ::rtl::OUString::createFromAscii("horizontal"); // horizontal break; @@ -323,7 +323,7 @@ void Ppt97Animation::UpdateCacheData() const } } break; - case 0x03: // --- (hor/ver) shifted appear --- + case 0x03: // --- (hor/ver) shifted appear --- { switch ( m_aAtom.nFlyDirection ) { @@ -341,10 +341,10 @@ void Ppt97Animation::UpdateCacheData() const } break; case 0x05: - //eRetval = ::com::sun::star::presentation::AnimationEffect_DISSOLVE; // --- dissolve ---- + //eRetval = ::com::sun::star::presentation::AnimationEffect_DISSOLVE; // --- dissolve ---- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-dissolve-in"); break; - case 0x08: // --- (hor/ver) lines --- + case 0x08: // --- (hor/ver) lines --- { switch ( m_aAtom.nFlyDirection ) { @@ -354,56 +354,56 @@ void Ppt97Animation::UpdateCacheData() const m_aSubType = ::rtl::OUString::createFromAscii("vertical"); // horizontal ??? break; case 0x1: - //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_LINES; + //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_LINES; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-random-bars"); m_aSubType = rtl::OUString::createFromAscii("horizontal"); // vertical ??? break; } } break; - case 0x09: // --- diagonal --- + case 0x09: // --- diagonal --- { switch ( m_aAtom.nFlyDirection ) { case 0x4: - //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LOWERRIGHT; + //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LOWERRIGHT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares"); m_aSubType = rtl::OUString::createFromAscii("left-to-top"); // to left top break; case 0x5: - //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LOWERLEFT; + //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LOWERLEFT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares"); m_aSubType = rtl::OUString::createFromAscii("right-to-top"); // to right top break; case 0x6: - //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_UPPERRIGHT; + //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_UPPERRIGHT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares"); m_aSubType = rtl::OUString::createFromAscii("left-to-bottom"); // to left bottom break; case 0x7: - //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_UPPERLEFT; + //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_UPPERLEFT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares"); m_aSubType = rtl::OUString::createFromAscii("right-to-bottom"); // to right bottom break; } } break; - case 0x0a: // --- roll/wipe --- + case 0x0a: // --- roll/wipe --- { switch ( m_aAtom.nFlyDirection ) { case 0x0: - //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_RIGHT; + //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_RIGHT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-wipe"); m_aSubType = rtl::OUString::createFromAscii("from-right"); // from right break; case 0x1: - //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_BOTTOM; + //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_BOTTOM; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-wipe"); m_aSubType = rtl::OUString::createFromAscii("from-bottom"); // from bottom break; case 0x2: - //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LEFT; + //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LEFT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-wipe"); m_aSubType = rtl::OUString::createFromAscii("from-left"); // from left break; @@ -415,7 +415,7 @@ void Ppt97Animation::UpdateCacheData() const } } break; - case 0x0b: //--- fade in --- + case 0x0b: //--- fade in --- { switch ( m_aAtom.nFlyDirection ) { @@ -432,7 +432,7 @@ void Ppt97Animation::UpdateCacheData() const } } break; - case 0x0c: // --- text effects --- + case 0x0c: // --- text effects --- { switch ( m_aAtom.nFlyDirection ) { @@ -440,7 +440,7 @@ void Ppt97Animation::UpdateCacheData() const //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_LEFT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in"); m_aSubType = rtl::OUString::createFromAscii("from-left"); - + break; case 0x1: //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_TOP; @@ -480,7 +480,7 @@ void Ppt97Animation::UpdateCacheData() const case 0x8: // -- short text effects -- //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_SHORT_FROM_LEFT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-peek-in"); - m_aSubType = rtl::OUString::createFromAscii("from-left"); + m_aSubType = rtl::OUString::createFromAscii("from-left"); break; case 0x9: //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_SHORT_FROM_BOTTOM; @@ -596,12 +596,12 @@ void Ppt97Animation::UpdateCacheData() const } } break; - case 0x0d: // --- open/close --- + case 0x0d: // --- open/close --- { switch ( m_aAtom.nFlyDirection ) { case 0x0: - //eRetval = ::com::sun::star::presentation::AnimationEffect_OPEN_VERTICAL ; // ??? + //eRetval = ::com::sun::star::presentation::AnimationEffect_OPEN_VERTICAL ; // ??? m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-split"); m_aSubType = rtl::OUString::createFromAscii("horizontal-out"); //horizontal open break; @@ -623,7 +623,7 @@ void Ppt97Animation::UpdateCacheData() const } } break; - case 0x0e: // --- blink --- + case 0x0e: // --- blink --- { m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-flash-once"); switch ( m_aAtom.nFlyDirection ) @@ -705,7 +705,7 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) // some effects need a different duration than that of the mapped preset effect double fDurationInSeconds = 1.0;//in secunden if( this->GetSpecialDuration( fDurationInSeconds ) ) - pEffect->setDuration( fDurationInSeconds ); + pEffect->setDuration( fDurationInSeconds ); // set after effect if( this->HasAfterEffect() ) @@ -723,11 +723,11 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) // text iteration pEffect->setIterateType( this->GetTextAnimationType() ); - + // some effects need a different delay between text iteration than that of the mapped preset effect double fTextIterationDelay = 1.0; if( this->GetSpecialTextIterationDelay( fTextIterationDelay ) ) - pEffect->setIterateInterval( fTextIterationDelay ); + pEffect->setIterateInterval( fTextIterationDelay ); // is the effect started on click or after the last effect (Another possible value is EffectNodeType::WITH_PREVIOUS ) pEffect->setNodeType( this->GetEffectNodeType() ); @@ -754,16 +754,16 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) double fDelaySeconds = this->GetDelayTimeInSeconds(); sal_Bool bAnimateAssociatedShape = this->HasAnimateAssociatedShape();//or only text sal_Bool bTextReverse = this->HasReverseOrder(); - + // now create effects for each paragraph - ::sd::CustomAnimationTextGroupPtr pGroup = pMainSequence-> + ::sd::CustomAnimationTextGroupPtr pGroup = pMainSequence-> createTextGroup( pEffect, nParagraphLevel, fDelaySeconds, bAnimateAssociatedShape, bTextReverse ); - + if( pGroup ) { const ::sd::EffectSequence& rEffects = pGroup->getEffects(); ::sd::EffectSequence::const_iterator aIter = rEffects.begin(); - + ::sd::CustomAnimationEffectPtr pLastEffect; sal_Int32 nIndex = 0; for( ; aIter != rEffects.end(); aIter++ ) diff --git a/sd/source/filter/ppt/ppt97animations.hxx b/sd/source/filter/ppt/ppt97animations.hxx index c68ba9a19382..3bc9fe73ba45 100755 --- a/sd/source/filter/ppt/ppt97animations.hxx +++ b/sd/source/filter/ppt/ppt97animations.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,22 +40,22 @@ class Ppt97AnimationInfoAtom friend class Ppt97Animation; //-- member - UINT32 nDimColor; - UINT32 nFlags; // 0x0004: time instead of click - UINT32 nSoundRef; - INT32 nDelayTime; // 1/1000 sec - UINT16 nOrderID; - UINT16 nSlideCount; - UINT8 nBuildType; - UINT8 nFlyMethod; - UINT8 nFlyDirection; - UINT8 nAfterEffect; //nAfterEffect: 0: none; 1: change color; 2: dim on next effect; 3: dim after effect; - UINT8 nSubEffect; - UINT8 nOLEVerb; + UINT32 nDimColor; + UINT32 nFlags; // 0x0004: time instead of click + UINT32 nSoundRef; + INT32 nDelayTime; // 1/1000 sec + UINT16 nOrderID; + UINT16 nSlideCount; + UINT8 nBuildType; + UINT8 nFlyMethod; + UINT8 nFlyDirection; + UINT8 nAfterEffect; //nAfterEffect: 0: none; 1: change color; 2: dim on next effect; 3: dim after effect; + UINT8 nSubEffect; + UINT8 nOLEVerb; // unknown, because whole size needs to be 28 - UINT8 nUnknown1; - UINT8 nUnknown2; + UINT8 nUnknown1; + UINT8 nUnknown2; //-- methods void ReadStream( SvStream& rIn ); @@ -68,7 +68,7 @@ class Ppt97AnimationInfoAtom 1088 0x00000440 10001000000 stop previous sound and mouseclick 1044 0x00000414 10000010100 play sound automatic 1041 0x00000411 10000010001 - | | | | | | + | | | | | | | | | | | reverse order | | | | after previous | | | sound diff --git a/sd/source/filter/ppt/pptanimations.hxx b/sd/source/filter/ppt/pptanimations.hxx index 7f227476e872..e66353b6e893 100644 --- a/sd/source/filter/ppt/pptanimations.hxx +++ b/sd/source/filter/ppt/pptanimations.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,10 +39,10 @@ class SvStream; namespace ppt -{ +{ // old transition types -#define PPT_TRANSITION_TYPE_NONE 0 +#define PPT_TRANSITION_TYPE_NONE 0 #define PPT_TRANSITION_TYPE_RANDOM 1 #define PPT_TRANSITION_TYPE_BLINDS 2 #define PPT_TRANSITION_TYPE_CHECKER 3 @@ -57,119 +57,119 @@ namespace ppt #define PPT_TRANSITION_TYPE_SPLIT 13 // effects, new in xp -#define PPT_TRANSITION_TYPE_DIAMOND 17 -#define PPT_TRANSITION_TYPE_PLUS 18 -#define PPT_TRANSITION_TYPE_WEDGE 19 -#define PPT_TRANSITION_TYPE_PUSH 20 -#define PPT_TRANSITION_TYPE_COMB 21 -#define PPT_TRANSITION_TYPE_NEWSFLASH 22 -#define PPT_TRANSITION_TYPE_SMOOTHFADE 23 -#define PPT_TRANSITION_TYPE_WHEEL 26 -#define PPT_TRANSITION_TYPE_CIRCLE 27 - - - -// atoms -#define DFF_msofbtAnimEvent 0xf125 -#define DFF_msofbtAnimNode 0xf127 -#define DFF_msofbtAnimTrigger 0xf128 -#define DFF_msofbtAnimValue 0xf129 -#define DFF_msofbtAnimateTarget 0xf12a -#define DFF_msofbtAnimate 0xf12b -#define DFF_msofbtAnimateColor 0xf12c -#define DFF_msofbtAnimateFilter 0xf12d -#define DFF_msofbtAnimateMotion 0xf12e -#define DFF_msofbtAnimateRotation 0xf12f -#define DFF_msofbtAnimateScale 0xf130 -#define DFF_msofbtAnimateSet 0xf131 -#define DFF_msofbtAnimCommand 0xf132 -#define DFF_msofbtAnimateTargetSettings 0xf133 -#define DFF_msofbtAnimateData 0xf134 -#define DFF_msofbtAnimateColorData 0xf135 -#define DFF_msofbtAnimateFilterData 0xf136 -#define DFF_msofbtAnimateMotionData 0xf137 -#define DFF_msofbtAnimateScaleData 0xf139 -#define DFF_msofbtAnimateSetData 0xf13a -#define DFF_msofbtCommandData 0xf13b -#define DFF_msofbtAnimateTargetElement 0xf13c -#define DFF_msofbtAnimPropertySet 0xf13d -#define DFF_msofbtAnimateAttributeNames 0xf13e -#define DFF_msofbtAnimKeyPoints 0xf13f -#define DFF_msofbtAnimIteration 0xf140 -#define DFF_msofbtAnimAction 0xf141 // correct name?? -#define DFF_msofbtAnimAttributeValue 0xf142 -#define DFF_msofbtAnimKeyTime 0xf143 -#define DFF_msofbtAnimGroup 0xf144 -#define DFF_msofbtAnimSubGoup 0xf145 -#define DFF_msofbtAnimateRotationData 0xf138 -#define DFF_msofbtAnimReference 0x2afb +#define PPT_TRANSITION_TYPE_DIAMOND 17 +#define PPT_TRANSITION_TYPE_PLUS 18 +#define PPT_TRANSITION_TYPE_WEDGE 19 +#define PPT_TRANSITION_TYPE_PUSH 20 +#define PPT_TRANSITION_TYPE_COMB 21 +#define PPT_TRANSITION_TYPE_NEWSFLASH 22 +#define PPT_TRANSITION_TYPE_SMOOTHFADE 23 +#define PPT_TRANSITION_TYPE_WHEEL 26 +#define PPT_TRANSITION_TYPE_CIRCLE 27 + + + +// atoms +#define DFF_msofbtAnimEvent 0xf125 +#define DFF_msofbtAnimNode 0xf127 +#define DFF_msofbtAnimTrigger 0xf128 +#define DFF_msofbtAnimValue 0xf129 +#define DFF_msofbtAnimateTarget 0xf12a +#define DFF_msofbtAnimate 0xf12b +#define DFF_msofbtAnimateColor 0xf12c +#define DFF_msofbtAnimateFilter 0xf12d +#define DFF_msofbtAnimateMotion 0xf12e +#define DFF_msofbtAnimateRotation 0xf12f +#define DFF_msofbtAnimateScale 0xf130 +#define DFF_msofbtAnimateSet 0xf131 +#define DFF_msofbtAnimCommand 0xf132 +#define DFF_msofbtAnimateTargetSettings 0xf133 +#define DFF_msofbtAnimateData 0xf134 +#define DFF_msofbtAnimateColorData 0xf135 +#define DFF_msofbtAnimateFilterData 0xf136 +#define DFF_msofbtAnimateMotionData 0xf137 +#define DFF_msofbtAnimateScaleData 0xf139 +#define DFF_msofbtAnimateSetData 0xf13a +#define DFF_msofbtCommandData 0xf13b +#define DFF_msofbtAnimateTargetElement 0xf13c +#define DFF_msofbtAnimPropertySet 0xf13d +#define DFF_msofbtAnimateAttributeNames 0xf13e +#define DFF_msofbtAnimKeyPoints 0xf13f +#define DFF_msofbtAnimIteration 0xf140 +#define DFF_msofbtAnimAction 0xf141 // correct name?? +#define DFF_msofbtAnimAttributeValue 0xf142 +#define DFF_msofbtAnimKeyTime 0xf143 +#define DFF_msofbtAnimGroup 0xf144 +#define DFF_msofbtAnimSubGoup 0xf145 +#define DFF_msofbtAnimateRotationData 0xf138 +#define DFF_msofbtAnimReference 0x2afb // property ids -#define DFF_ANIM_ID 1 -#define DFF_ANIM_RUNTIMECONTEXT 2 -#define DFF_ANIM_PATH_EDIT_MODE 3 -#define DFF_ANIM_COLORSPACE 4 -#define DFF_ANIM_DIRECTION 5 // TODO: Conflict? -#define DFF_ANIM_MASTERREL 5 // TODO: Conflict? -#define DFF_ANIM_OVERRIDE 6 -#define DFF_ANIM_PRESET_ID 9 -#define DFF_ANIM_PRESET_SUB_TYPE 10 -#define DFF_ANIM_PRESET_CLASS 11 -#define DFF_ANIM_AFTEREFFECT 13 -#define DFF_ANIM_ENDAFTERSLIDE 15 -#define DFF_ANIM_TIMEFILTER 16 -#define DFF_ANIM_EVENT_FILTER 17 -#define DFF_ANIM_GROUP_ID 19 -#define DFF_ANIM_NODE_TYPE 20 -#define DFF_ANIM_VOLUME 22 -#define DFF_ANIM_PROPERTY_ID_COUNT DFF_ANIM_VOLUME +#define DFF_ANIM_ID 1 +#define DFF_ANIM_RUNTIMECONTEXT 2 +#define DFF_ANIM_PATH_EDIT_MODE 3 +#define DFF_ANIM_COLORSPACE 4 +#define DFF_ANIM_DIRECTION 5 // TODO: Conflict? +#define DFF_ANIM_MASTERREL 5 // TODO: Conflict? +#define DFF_ANIM_OVERRIDE 6 +#define DFF_ANIM_PRESET_ID 9 +#define DFF_ANIM_PRESET_SUB_TYPE 10 +#define DFF_ANIM_PRESET_CLASS 11 +#define DFF_ANIM_AFTEREFFECT 13 +#define DFF_ANIM_ENDAFTERSLIDE 15 +#define DFF_ANIM_TIMEFILTER 16 +#define DFF_ANIM_EVENT_FILTER 17 +#define DFF_ANIM_GROUP_ID 19 +#define DFF_ANIM_NODE_TYPE 20 +#define DFF_ANIM_VOLUME 22 +#define DFF_ANIM_PROPERTY_ID_COUNT DFF_ANIM_VOLUME // property types -#define DFF_ANIM_PROP_TYPE_BYTE 0 -#define DFF_ANIM_PROP_TYPE_INT32 1 -#define DFF_ANIM_PROP_TYPE_FLOAT 2 -#define DFF_ANIM_PROP_TYPE_UNISTRING 3 - -#define DFF_ANIM_PATH_EDIT_MODE_FIXED 0 -#define DFF_ANIM_PATH_EDIT_MODE_RELATIVE 1 - -#define DFF_ANIM_PRESS_CLASS_USER_DEFINED 0 -#define DFF_ANIM_PRESS_CLASS_ENTRANCE 1 -#define DFF_ANIM_PRESS_CLASS_EXIT 2 -#define DFF_ANIM_PRESS_CLASS_EMPHASIS 3 -#define DFF_ANIM_PRESS_CLASS_MOTIONPATH 4 -#define DFF_ANIM_PRESS_CLASS_OLE_ACTION 5 -#define DFF_ANIM_PRESS_CLASS_MEDIACALL 6 - -#define DFF_ANIM_NODE_TYPE_ON_CLICK 1 -#define DFF_ANIM_NODE_TYPE_WITH_PREVIOUS 2 -#define DFF_ANIM_NODE_TYPE_AFTER_PREVIOUS 3 -#define DFF_ANIM_NODE_TYPE_MAIN_SEQUENCE 4 -#define DFF_ANIM_NODE_TYPE_INTERACTIVE_SEQ 5 -#define DFF_ANIM_NODE_TYPE_TIMING_ROOT 9 - -#define DFF_ANIM_PROPERTY_AFTEREFFECT 20 +#define DFF_ANIM_PROP_TYPE_BYTE 0 +#define DFF_ANIM_PROP_TYPE_INT32 1 +#define DFF_ANIM_PROP_TYPE_FLOAT 2 +#define DFF_ANIM_PROP_TYPE_UNISTRING 3 + +#define DFF_ANIM_PATH_EDIT_MODE_FIXED 0 +#define DFF_ANIM_PATH_EDIT_MODE_RELATIVE 1 + +#define DFF_ANIM_PRESS_CLASS_USER_DEFINED 0 +#define DFF_ANIM_PRESS_CLASS_ENTRANCE 1 +#define DFF_ANIM_PRESS_CLASS_EXIT 2 +#define DFF_ANIM_PRESS_CLASS_EMPHASIS 3 +#define DFF_ANIM_PRESS_CLASS_MOTIONPATH 4 +#define DFF_ANIM_PRESS_CLASS_OLE_ACTION 5 +#define DFF_ANIM_PRESS_CLASS_MEDIACALL 6 + +#define DFF_ANIM_NODE_TYPE_ON_CLICK 1 +#define DFF_ANIM_NODE_TYPE_WITH_PREVIOUS 2 +#define DFF_ANIM_NODE_TYPE_AFTER_PREVIOUS 3 +#define DFF_ANIM_NODE_TYPE_MAIN_SEQUENCE 4 +#define DFF_ANIM_NODE_TYPE_INTERACTIVE_SEQ 5 +#define DFF_ANIM_NODE_TYPE_TIMING_ROOT 9 + +#define DFF_ANIM_PROPERTY_AFTEREFFECT 20 /* constants for fill entry in AnimationNode */ -const sal_Int32 mso_Anim_GroupType_PAR = 0; -const sal_Int32 mso_Anim_GroupType_SEQ = 1; -const sal_Int32 mso_Anim_GroupType_NODE = 3; -const sal_Int32 mso_Anim_GroupType_MEDIA = 4; +const sal_Int32 mso_Anim_GroupType_PAR = 0; +const sal_Int32 mso_Anim_GroupType_SEQ = 1; +const sal_Int32 mso_Anim_GroupType_NODE = 3; +const sal_Int32 mso_Anim_GroupType_MEDIA = 4; /* constants for fill entry in AnimationNode */ -const sal_Int32 mso_Anim_Fill_ALWAYS = 1; -const sal_Int32 mso_Anim_Fill_WHENOFF = 2; -const sal_Int32 mso_Anim_Fill_NEVER = 3; +const sal_Int32 mso_Anim_Fill_ALWAYS = 1; +const sal_Int32 mso_Anim_Fill_WHENOFF = 2; +const sal_Int32 mso_Anim_Fill_NEVER = 3; /* constants for fill entry in AnimationNode */ -const sal_Int32 mso_Anim_Fill_REMOVE = 1; -const sal_Int32 mso_Anim_Fill_FREEZE = 2; -const sal_Int32 mso_Anim_Fill_HOLD = 3; +const sal_Int32 mso_Anim_Fill_REMOVE = 1; +const sal_Int32 mso_Anim_Fill_FREEZE = 2; +const sal_Int32 mso_Anim_Fill_HOLD = 3; /* constants for behaviour entry in PPtAnimationNode */ -const sal_Int32 mso_Anim_Behaviour_FILTER = 24; +const sal_Int32 mso_Anim_Behaviour_FILTER = 24; const sal_Int32 mso_Anim_Behaviour_ANIMATION= 25; typedef ::std::map< sal_Int32, ::com::sun::star::uno::Any > PropertySetMap_t; @@ -194,7 +194,7 @@ enum MS_AttributeNames struct ImplAttributeNameConversion { - MS_AttributeNames meAttribute; + MS_AttributeNames meAttribute; const char* mpMSName; const char* mpAPIName; }; @@ -208,16 +208,16 @@ public: /** see mso_Anim_Restart_? */ sal_Int32 mnRestart; - + /** see mso_Anim_Fill_? */ sal_Int32 mnFill; - + /** see mso_Anim_Behaviour_? */ sal_Int32 mnNodeType; /** duration of this group in 1000th seconds */ sal_Int32 mnDuration; - + sal_Int32 mnU1, mnU3, mnU4; public: @@ -226,29 +226,29 @@ public: friend SvStream& operator<<(SvStream& rOut, AnimationNode& rAtom); }; -static const ImplAttributeNameConversion gImplConversionList[] = +static const ImplAttributeNameConversion gImplConversionList[] = { - { MS_PPT_X, "ppt_x", "X" }, - { MS_PPT_Y, "ppt_y", "Y" }, - { MS_PPT_W, "ppt_w", "Width" }, - { MS_PPT_H, "ppt_h", "Height" }, - { MS_PPT_C, "ppt_c", "DimColor" }, - { MS_R, "r", "Rotate" }, - { MS_XSHEAR, "xshear", "SkewX" }, - { MS_FILLCOLOR, "fillColor", "FillColor" }, - { MS_FILLCOLOR, "fillcolor", "FillColor" }, - { MS_FILLTYPE, "fill.type", "FillStyle" }, - { MS_STROKECOLOR, "stroke.color", "LineColor" }, - { MS_STROKEON, "stroke.on", "LineStyle" }, - { MS_STYLECOLOR, "style.color", "CharColor" }, - { MS_STYLEROTATION, "style.rotation", "Rotate" }, - { MS_FONTWEIGHT, "style.fontWeight", "CharWeight" }, - { MS_STYLEUNDERLINE, "style.textDecorationUnderline","CharUnderline" }, - { MS_STYLEFONTFAMILY, "style.fontFamily", "CharFontName" }, - { MS_STYLEFONTSIZE, "style.fontSize", "CharHeight" }, - { MS_STYLEFONTSTYLE, "style.fontStyle", "CharPosture" }, - { MS_STYLEVISIBILITY, "style.visibility", "Visibility" }, - { MS_STYLEOPACITY, "style.opacity", "Opacity" }, + { MS_PPT_X, "ppt_x", "X" }, + { MS_PPT_Y, "ppt_y", "Y" }, + { MS_PPT_W, "ppt_w", "Width" }, + { MS_PPT_H, "ppt_h", "Height" }, + { MS_PPT_C, "ppt_c", "DimColor" }, + { MS_R, "r", "Rotate" }, + { MS_XSHEAR, "xshear", "SkewX" }, + { MS_FILLCOLOR, "fillColor", "FillColor" }, + { MS_FILLCOLOR, "fillcolor", "FillColor" }, + { MS_FILLTYPE, "fill.type", "FillStyle" }, + { MS_STROKECOLOR, "stroke.color", "LineColor" }, + { MS_STROKEON, "stroke.on", "LineStyle" }, + { MS_STYLECOLOR, "style.color", "CharColor" }, + { MS_STYLEROTATION, "style.rotation", "Rotate" }, + { MS_FONTWEIGHT, "style.fontWeight", "CharWeight" }, + { MS_STYLEUNDERLINE, "style.textDecorationUnderline","CharUnderline" }, + { MS_STYLEFONTFAMILY, "style.fontFamily", "CharFontName" }, + { MS_STYLEFONTSIZE, "style.fontSize", "CharHeight" }, + { MS_STYLEFONTSTYLE, "style.fontStyle", "CharPosture" }, + { MS_STYLEVISIBILITY, "style.visibility", "Visibility" }, + { MS_STYLEOPACITY, "style.opacity", "Opacity" }, { MS_UNKNOWN, NULL, NULL } }; @@ -300,7 +300,7 @@ static const transition gTransitions[] = { "slide(fromTop)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMTOP, sal_True }, { "slide(fromRight)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMRIGHT, sal_True }, { "slide(fromLeft)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMLEFT, sal_True }, -{ "slide(fromBottom)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMBOTTOM, sal_True }, +{ "slide(fromBottom)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMBOTTOM, sal_True }, { "dissolve", ::com::sun::star::animations::TransitionType::DISSOLVE, ::com::sun::star::animations::TransitionSubType::DEFAULT, sal_True }, { "image", ::com::sun::star::animations::TransitionType::DISSOLVE, ::com::sun::star::animations::TransitionSubType::DEFAULT, sal_True }, // TODO { NULL, 0, 0, sal_False } @@ -339,216 +339,216 @@ static const convert_subtype gConvertArray[] = struct preset_maping { - sal_Int32 mnPresetClass; - sal_Int32 mnPresetId; - const sal_Char* mpStrPresetId; + sal_Int32 mnPresetClass; + sal_Int32 mnPresetId; + const sal_Char* mpStrPresetId; }; static const preset_maping gPresetMaping[] = { - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 1 ,"ooo-entrance-appear" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 2 ,"ooo-entrance-fly-in" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 3 ,"ooo-entrance-venetian-blinds" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 4 ,"ooo-entrance-box" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 5 ,"ooo-entrance-checkerboard" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 6 ,"ooo-entrance-circle" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 7 ,"ooo-entrance-fly-in-slow" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 8 ,"ooo-entrance-diamond" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 9 ,"ooo-entrance-dissolve-in" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 10 ,"ooo-entrance-fade-in" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 11 ,"ooo-entrance-flash-once" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 12 ,"ooo-entrance-peek-in" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 13 ,"ooo-entrance-plus" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 14 ,"ooo-entrance-random-bars" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 15 ,"ooo-entrance-spiral-in" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 16 ,"ooo-entrance-split" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 17 ,"ooo-entrance-stretchy" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 18 ,"ooo-entrance-diagonal-squares" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 19 ,"ooo-entrance-swivel" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 20 ,"ooo-entrance-wedge" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 21 ,"ooo-entrance-wheel" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 22 ,"ooo-entrance-wipe" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 23 ,"ooo-entrance-zoom" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 24 ,"ooo-entrance-random" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 25 ,"ooo-entrance-boomerang" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 26 ,"ooo-entrance-bounce" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 27 ,"ooo-entrance-colored-lettering" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 28 ,"ooo-entrance-movie-credits" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 29 ,"ooo-entrance-ease-in" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 30 ,"ooo-entrance-float" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 31 ,"ooo-entrance-turn-and-grow" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 34 ,"ooo-entrance-breaks" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 35 ,"ooo-entrance-pinwheel" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 37 ,"ooo-entrance-rise-up" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 38 ,"ooo-entrance-falling-in" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 39 ,"ooo-entrance-thread" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 40 ,"ooo-entrance-unfold" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 41 ,"ooo-entrance-whip" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 42 ,"ooo-entrance-ascend" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 43 ,"ooo-entrance-center-revolve" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 45 ,"ooo-entrance-fade-in-and-swivel" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 47 ,"ooo-entrance-descend" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 48 ,"ooo-entrance-sling" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 49 ,"ooo-entrance-spin-in" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 50 ,"ooo-entrance-compress" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 51 ,"ooo-entrance-magnify" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 52 ,"ooo-entrance-curve-up" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 53 ,"ooo-entrance-fade-in-and-zoom" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 54 ,"ooo-entrance-glide" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 55 ,"ooo-entrance-expand" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 56 ,"ooo-entrance-flip" }, - { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 58 ,"ooo-entrance-fold" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 1 ,"ooo-emphasis-fill-color" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 2 ,"ooo-emphasis-font" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 3 ,"ooo-emphasis-font-color" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 4 ,"ooo-emphasis-font-size" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 5 ,"ooo-emphasis-font-style" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 6 ,"ooo-emphasis-grow-and-shrink" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 7 ,"ooo-emphasis-line-color" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 8 ,"ooo-emphasis-spin" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 9 ,"ooo-emphasis-transparency" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 10 ,"ooo-emphasis-bold-flash" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 14 ,"ooo-emphasis-blast" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 15 ,"ooo-emphasis-bold-reveal" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 16 ,"ooo-emphasis-color-over-by-word" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 18 ,"ooo-emphasis-reveal-underline" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 19 ,"ooo-emphasis-color-blend" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 20 ,"ooo-emphasis-color-over-by-letter" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 21 ,"ooo-emphasis-complementary-color" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 22 ,"ooo-emphasis-complementary-color-2" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 23 ,"ooo-emphasis-contrasting-color" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 24 ,"ooo-emphasis-darken" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 25 ,"ooo-emphasis-desaturate" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 26 ,"ooo-emphasis-flash-bulb" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 27 ,"ooo-emphasis-flicker" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 28 ,"ooo-emphasis-grow-with-color" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 30 ,"ooo-emphasis-lighten" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 31 ,"ooo-emphasis-style-emphasis" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 32 ,"ooo-emphasis-teeter" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 33 ,"ooo-emphasis-vertical-highlight" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 34 ,"ooo-emphasis-wave" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 35 ,"ooo-emphasis-blink" }, - { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 36 ,"ooo-emphasis-shimmer" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 1 ,"ooo-exit-disappear" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 2 ,"ooo-exit-fly-out" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 3 ,"ooo-exit-venetian-blinds" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 4 ,"ooo-exit-box" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 5 ,"ooo-exit-checkerboard" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 6 ,"ooo-exit-circle" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 7 ,"ooo-exit-crawl-out" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 8 ,"ooo-exit-diamond" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 9 ,"ooo-exit-dissolve" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 10 ,"ooo-exit-fade-out" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 11 ,"ooo-exit-flash-once" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 12 ,"ooo-exit-peek-out" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 13 ,"ooo-exit-plus" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 14 ,"ooo-exit-random-bars" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 15 ,"ooo-exit-spiral-out" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 16 ,"ooo-exit-split" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 17 ,"ooo-exit-collapse" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 18 ,"ooo-exit-diagonal-squares" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 19 ,"ooo-exit-swivel" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 20 ,"ooo-exit-wedge" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 21 ,"ooo-exit-wheel" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 22 ,"ooo-exit-wipe" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 23 ,"ooo-exit-zoom" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 24 ,"ooo-exit-random" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 25 ,"ooo-exit-boomerang" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 26 ,"ooo-exit-bounce" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 27 ,"ooo-exit-colored-lettering" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 28 ,"ooo-exit-movie-credits" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 29 ,"ooo-exit-ease-out" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 30 ,"ooo-exit-float" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 31 ,"ooo-exit-turn-and-grow" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 34 ,"ooo-exit-breaks" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 35 ,"ooo-exit-pinwheel" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 37 ,"ooo-exit-sink-down" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 38 ,"ooo-exit-swish" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 39 ,"ooo-exit-thread" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 40 ,"ooo-exit-unfold" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 41 ,"ooo-exit-whip" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 42 ,"ooo-exit-descend" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 43 ,"ooo-exit-center-revolve" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 45 ,"ooo-exit-fade-out-and-swivel" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 47 ,"ooo-exit-ascend" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 48 ,"ooo-exit-sling" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 53 ,"ooo-exit-fade-out-and-zoom" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 55 ,"ooo-exit-contract" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 49 ,"ooo-exit-spin-out" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 50 ,"ooo-exit-stretchy" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 51 ,"ooo-exit-magnify" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 52 ,"ooo-exit-curve-down" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 54 ,"ooo-exit-glide" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 56 ,"ooo-exit-flip" }, - { ::com::sun::star::presentation::EffectPresetClass::EXIT, 58 ,"ooo-exit-fold" }, - - - - - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 16 ,"ooo-motionpath-4-point-star" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 5 ,"ooo-motionpath-5-point-star" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 11 ,"ooo-motionpath-6-point-star" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 17 ,"ooo-motionpath-8-point-star" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 1 ,"ooo-motionpath-circle" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 6 ,"ooo-motionpath-crescent-moon" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 3 ,"ooo-motionpath-diamond" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 13 ,"ooo-motionpath-equal-triangle" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 12 ,"ooo-motionpath-oval" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 9 ,"ooo-motionpath-heart" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 4 ,"ooo-motionpath-hexagon" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 10 ,"ooo-motionpath-octagon" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 14 ,"ooo-motionpath-parallelogram" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 15 ,"ooo-motionpath-pentagon" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 2 ,"ooo-motionpath-right-triangle" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 7 ,"ooo-motionpath-square" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 18 ,"ooo-motionpath-teardrop" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 8 ,"ooo-motionpath-trapezoid" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 37 ,"ooo-motionpath-arc-down" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 51 ,"ooo-motionpath-arc-left" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 58 ,"ooo-motionpath-arc-right" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 44 ,"ooo-motionpath-arc-up" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 41 ,"ooo-motionpath-bounce-left" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 54 ,"ooo-motionpath-bounce-right" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 48 ,"ooo-motionpath-curvy-left" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 61 ,"ooo-motionpath-curvy-right" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 60 ,"ooo-motionpath-decaying-wave" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 49 ,"ooo-motionpath-diagonal-down-right" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 56 ,"ooo-motionpath-diagonal-up-right" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 42 ,"ooo-motionpath-down" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 52 ,"ooo-motionpath-funnel" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 53 ,"ooo-motionpath-spring" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 62 ,"ooo-motionpath-stairs-down" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 50 ,"ooo-motionpath-turn-down" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 36 ,"ooo-motionpath-turn-down-right" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 43 ,"ooo-motionpath-turn-up" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 57 ,"ooo-motionpath-turn-up-right" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 64 ,"ooo-motionpath-up" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 47 ,"ooo-motionpath-wave" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 38 ,"ooo-motionpath-zigzag" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 31 ,"ooo-motionpath-bean" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 25 ,"ooo-motionpath-buzz-saw" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 20 ,"ooo-motionpath-curved-square" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 21 ,"ooo-motionpath-curved-x" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 23 ,"ooo-motionpath-curvy-star" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 28 ,"ooo-motionpath-figure-8-four" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 26 ,"ooo-motionpath-horizontal-figure-8" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 34 ,"ooo-motionpath-inverted-square" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 33 ,"ooo-motionpath-inverted-triangle" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 24 ,"ooo-motionpath-loop-de-loop" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 29 ,"ooo-motionpath-neutron" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 27 ,"ooo-motionpath-peanut" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 32 ,"ooo-motionpath-clover" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 19 ,"ooo-motionpath-pointy-star" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 30 ,"ooo-motionpath-swoosh" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 22 ,"ooo-motionpath-vertical-figure-8" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 35 ,"ooo-motionpath-left" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 63 ,"ooo-motionpath-right" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 55 ,"ooo-motionpath-spiral-left" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 46 ,"ooo-motionpath-spiral-right" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 40 ,"ooo-motionpath-sine-wave" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 59 ,"ooo-motionpath-s-curve-1" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 39 ,"ooo-motionpath-s-curve-2" }, - { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 45 ,"ooo-motionpath-heartbeat" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 1 ,"ooo-entrance-appear" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 2 ,"ooo-entrance-fly-in" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 3 ,"ooo-entrance-venetian-blinds" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 4 ,"ooo-entrance-box" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 5 ,"ooo-entrance-checkerboard" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 6 ,"ooo-entrance-circle" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 7 ,"ooo-entrance-fly-in-slow" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 8 ,"ooo-entrance-diamond" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 9 ,"ooo-entrance-dissolve-in" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 10 ,"ooo-entrance-fade-in" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 11 ,"ooo-entrance-flash-once" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 12 ,"ooo-entrance-peek-in" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 13 ,"ooo-entrance-plus" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 14 ,"ooo-entrance-random-bars" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 15 ,"ooo-entrance-spiral-in" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 16 ,"ooo-entrance-split" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 17 ,"ooo-entrance-stretchy" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 18 ,"ooo-entrance-diagonal-squares" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 19 ,"ooo-entrance-swivel" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 20 ,"ooo-entrance-wedge" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 21 ,"ooo-entrance-wheel" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 22 ,"ooo-entrance-wipe" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 23 ,"ooo-entrance-zoom" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 24 ,"ooo-entrance-random" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 25 ,"ooo-entrance-boomerang" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 26 ,"ooo-entrance-bounce" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 27 ,"ooo-entrance-colored-lettering" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 28 ,"ooo-entrance-movie-credits" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 29 ,"ooo-entrance-ease-in" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 30 ,"ooo-entrance-float" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 31 ,"ooo-entrance-turn-and-grow" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 34 ,"ooo-entrance-breaks" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 35 ,"ooo-entrance-pinwheel" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 37 ,"ooo-entrance-rise-up" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 38 ,"ooo-entrance-falling-in" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 39 ,"ooo-entrance-thread" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 40 ,"ooo-entrance-unfold" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 41 ,"ooo-entrance-whip" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 42 ,"ooo-entrance-ascend" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 43 ,"ooo-entrance-center-revolve" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 45 ,"ooo-entrance-fade-in-and-swivel" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 47 ,"ooo-entrance-descend" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 48 ,"ooo-entrance-sling" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 49 ,"ooo-entrance-spin-in" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 50 ,"ooo-entrance-compress" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 51 ,"ooo-entrance-magnify" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 52 ,"ooo-entrance-curve-up" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 53 ,"ooo-entrance-fade-in-and-zoom" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 54 ,"ooo-entrance-glide" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 55 ,"ooo-entrance-expand" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 56 ,"ooo-entrance-flip" }, + { ::com::sun::star::presentation::EffectPresetClass::ENTRANCE, 58 ,"ooo-entrance-fold" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 1 ,"ooo-emphasis-fill-color" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 2 ,"ooo-emphasis-font" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 3 ,"ooo-emphasis-font-color" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 4 ,"ooo-emphasis-font-size" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 5 ,"ooo-emphasis-font-style" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 6 ,"ooo-emphasis-grow-and-shrink" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 7 ,"ooo-emphasis-line-color" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 8 ,"ooo-emphasis-spin" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 9 ,"ooo-emphasis-transparency" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 10 ,"ooo-emphasis-bold-flash" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 14 ,"ooo-emphasis-blast" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 15 ,"ooo-emphasis-bold-reveal" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 16 ,"ooo-emphasis-color-over-by-word" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 18 ,"ooo-emphasis-reveal-underline" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 19 ,"ooo-emphasis-color-blend" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 20 ,"ooo-emphasis-color-over-by-letter" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 21 ,"ooo-emphasis-complementary-color" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 22 ,"ooo-emphasis-complementary-color-2" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 23 ,"ooo-emphasis-contrasting-color" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 24 ,"ooo-emphasis-darken" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 25 ,"ooo-emphasis-desaturate" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 26 ,"ooo-emphasis-flash-bulb" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 27 ,"ooo-emphasis-flicker" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 28 ,"ooo-emphasis-grow-with-color" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 30 ,"ooo-emphasis-lighten" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 31 ,"ooo-emphasis-style-emphasis" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 32 ,"ooo-emphasis-teeter" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 33 ,"ooo-emphasis-vertical-highlight" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 34 ,"ooo-emphasis-wave" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 35 ,"ooo-emphasis-blink" }, + { ::com::sun::star::presentation::EffectPresetClass::EMPHASIS, 36 ,"ooo-emphasis-shimmer" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 1 ,"ooo-exit-disappear" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 2 ,"ooo-exit-fly-out" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 3 ,"ooo-exit-venetian-blinds" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 4 ,"ooo-exit-box" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 5 ,"ooo-exit-checkerboard" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 6 ,"ooo-exit-circle" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 7 ,"ooo-exit-crawl-out" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 8 ,"ooo-exit-diamond" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 9 ,"ooo-exit-dissolve" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 10 ,"ooo-exit-fade-out" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 11 ,"ooo-exit-flash-once" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 12 ,"ooo-exit-peek-out" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 13 ,"ooo-exit-plus" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 14 ,"ooo-exit-random-bars" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 15 ,"ooo-exit-spiral-out" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 16 ,"ooo-exit-split" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 17 ,"ooo-exit-collapse" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 18 ,"ooo-exit-diagonal-squares" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 19 ,"ooo-exit-swivel" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 20 ,"ooo-exit-wedge" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 21 ,"ooo-exit-wheel" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 22 ,"ooo-exit-wipe" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 23 ,"ooo-exit-zoom" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 24 ,"ooo-exit-random" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 25 ,"ooo-exit-boomerang" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 26 ,"ooo-exit-bounce" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 27 ,"ooo-exit-colored-lettering" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 28 ,"ooo-exit-movie-credits" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 29 ,"ooo-exit-ease-out" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 30 ,"ooo-exit-float" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 31 ,"ooo-exit-turn-and-grow" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 34 ,"ooo-exit-breaks" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 35 ,"ooo-exit-pinwheel" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 37 ,"ooo-exit-sink-down" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 38 ,"ooo-exit-swish" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 39 ,"ooo-exit-thread" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 40 ,"ooo-exit-unfold" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 41 ,"ooo-exit-whip" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 42 ,"ooo-exit-descend" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 43 ,"ooo-exit-center-revolve" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 45 ,"ooo-exit-fade-out-and-swivel" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 47 ,"ooo-exit-ascend" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 48 ,"ooo-exit-sling" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 53 ,"ooo-exit-fade-out-and-zoom" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 55 ,"ooo-exit-contract" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 49 ,"ooo-exit-spin-out" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 50 ,"ooo-exit-stretchy" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 51 ,"ooo-exit-magnify" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 52 ,"ooo-exit-curve-down" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 54 ,"ooo-exit-glide" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 56 ,"ooo-exit-flip" }, + { ::com::sun::star::presentation::EffectPresetClass::EXIT, 58 ,"ooo-exit-fold" }, + + + + + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 16 ,"ooo-motionpath-4-point-star" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 5 ,"ooo-motionpath-5-point-star" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 11 ,"ooo-motionpath-6-point-star" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 17 ,"ooo-motionpath-8-point-star" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 1 ,"ooo-motionpath-circle" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 6 ,"ooo-motionpath-crescent-moon" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 3 ,"ooo-motionpath-diamond" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 13 ,"ooo-motionpath-equal-triangle" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 12 ,"ooo-motionpath-oval" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 9 ,"ooo-motionpath-heart" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 4 ,"ooo-motionpath-hexagon" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 10 ,"ooo-motionpath-octagon" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 14 ,"ooo-motionpath-parallelogram" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 15 ,"ooo-motionpath-pentagon" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 2 ,"ooo-motionpath-right-triangle" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 7 ,"ooo-motionpath-square" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 18 ,"ooo-motionpath-teardrop" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 8 ,"ooo-motionpath-trapezoid" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 37 ,"ooo-motionpath-arc-down" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 51 ,"ooo-motionpath-arc-left" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 58 ,"ooo-motionpath-arc-right" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 44 ,"ooo-motionpath-arc-up" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 41 ,"ooo-motionpath-bounce-left" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 54 ,"ooo-motionpath-bounce-right" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 48 ,"ooo-motionpath-curvy-left" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 61 ,"ooo-motionpath-curvy-right" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 60 ,"ooo-motionpath-decaying-wave" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 49 ,"ooo-motionpath-diagonal-down-right" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 56 ,"ooo-motionpath-diagonal-up-right" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 42 ,"ooo-motionpath-down" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 52 ,"ooo-motionpath-funnel" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 53 ,"ooo-motionpath-spring" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 62 ,"ooo-motionpath-stairs-down" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 50 ,"ooo-motionpath-turn-down" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 36 ,"ooo-motionpath-turn-down-right" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 43 ,"ooo-motionpath-turn-up" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 57 ,"ooo-motionpath-turn-up-right" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 64 ,"ooo-motionpath-up" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 47 ,"ooo-motionpath-wave" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 38 ,"ooo-motionpath-zigzag" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 31 ,"ooo-motionpath-bean" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 25 ,"ooo-motionpath-buzz-saw" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 20 ,"ooo-motionpath-curved-square" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 21 ,"ooo-motionpath-curved-x" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 23 ,"ooo-motionpath-curvy-star" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 28 ,"ooo-motionpath-figure-8-four" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 26 ,"ooo-motionpath-horizontal-figure-8" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 34 ,"ooo-motionpath-inverted-square" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 33 ,"ooo-motionpath-inverted-triangle" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 24 ,"ooo-motionpath-loop-de-loop" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 29 ,"ooo-motionpath-neutron" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 27 ,"ooo-motionpath-peanut" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 32 ,"ooo-motionpath-clover" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 19 ,"ooo-motionpath-pointy-star" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 30 ,"ooo-motionpath-swoosh" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 22 ,"ooo-motionpath-vertical-figure-8" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 35 ,"ooo-motionpath-left" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 63 ,"ooo-motionpath-right" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 55 ,"ooo-motionpath-spiral-left" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 46 ,"ooo-motionpath-spiral-right" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 40 ,"ooo-motionpath-sine-wave" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 59 ,"ooo-motionpath-s-curve-1" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 39 ,"ooo-motionpath-s-curve-2" }, + { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 45 ,"ooo-motionpath-heartbeat" }, { 0,0,0 } diff --git a/sd/source/filter/ppt/pptatom.cpp b/sd/source/filter/ppt/pptatom.cpp index 0bd31c2119d5..84341dce192d 100755 --- a/sd/source/filter/ppt/pptatom.cpp +++ b/sd/source/filter/ppt/pptatom.cpp @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,13 +49,13 @@ Atom::Atom( const DffRecordHeader& rRecordHeader, SvStream& rStream ) Atom* pLastAtom = NULL; - // retrieve file size (to allow sanity checks) + // retrieve file size (to allow sanity checks) const sal_Size nStreamPos = mrStream.Tell(); mrStream.Seek( STREAM_SEEK_TO_END ); const sal_Size nStreamSize = mrStream.Tell(); mrStream.Seek( nStreamPos ); - while( (mrStream.GetError() == 0 ) + while( (mrStream.GetError() == 0 ) && ( mrStream.Tell() < nStreamSize ) && ( mrStream.Tell() < maRecordHeader.GetRecEndFilePos() ) ) { diff --git a/sd/source/filter/ppt/pptatom.hxx b/sd/source/filter/ppt/pptatom.hxx index d430b7bffb7a..21fbcc7840ee 100755 --- a/sd/source/filter/ppt/pptatom.hxx +++ b/sd/source/filter/ppt/pptatom.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 6a5ce08bc912..9d0fcc57378e 100755 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,7 +91,7 @@ #include <editeng/editstat.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/docfac.hxx> -#define MAX_USER_MOVE 2 +#define MAX_USER_MOVE 2 #include "pptinanimations.hxx" #include "ppt97animations.hxx" @@ -174,16 +174,16 @@ SdPPTImport::~SdPPTImport() } ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SvStorage& rStorage_, SfxMedium& rMedium, PowerPointImportParam& rParam ) -: SdrPowerPointImport ( rParam, rMedium.GetBaseURL() ) -, mrMed ( rMedium ) -, mrStorage ( rStorage_ ) -, mbDocumentFound ( FALSE ) -, mnFilterOptions ( 0 ) +: SdrPowerPointImport ( rParam, rMedium.GetBaseURL() ) +, mrMed ( rMedium ) +, mrStorage ( rStorage_ ) +, mbDocumentFound ( FALSE ) +, mnFilterOptions ( 0 ) { mpDoc = pDocument; if ( bOk ) { - mbDocumentFound = SeekToDocument( &maDocHd ); // maDocHd = the latest DocumentHeader + mbDocumentFound = SeekToDocument( &maDocHd ); // maDocHd = the latest DocumentHeader while ( SeekToRec( rStCtrl, PPT_PST_Document, nStreamLen, &maDocHd ) ) mbDocumentFound = TRUE; @@ -298,10 +298,10 @@ sal_Bool ImplSdPPTImport::Import() aPropItem >> nSlideCount; if ( nSlideCount && pSection->GetProperty( PID_HEADINGPAIR, aPropItem ) ) { - UINT32 nSlideTitleIndex = 0, nSlideTitleCount = 0; - UINT32 nFontIndex, nFontCount = 0; - UINT32 nDesignTemplateIndex, nDesignTemplateCount = 0; - UINT32 i, nTemp, nEntryCount = 0; + UINT32 nSlideTitleIndex = 0, nSlideTitleCount = 0; + UINT32 nFontIndex, nFontCount = 0; + UINT32 nDesignTemplateIndex, nDesignTemplateCount = 0; + UINT32 i, nTemp, nEntryCount = 0; String aUString; @@ -404,7 +404,7 @@ sal_Bool ImplSdPPTImport::Import() { UINT32 i; - nPropCount /= 6; // 6 propertys a hyperlink + nPropCount /= 6; // 6 propertys a hyperlink SdHyperlinkEntry* pHyperlink = 0; for ( i = 0; i < nPropCount; i++ ) @@ -552,8 +552,8 @@ sal_Bool ImplSdPPTImport::Import() Size aVisAreaSize; switch ( aUserEditAtom.eLastViewType ) { - case 5 : // notes master - case 3 : // notes + case 5 : // notes master + case 3 : // notes aVisAreaSize = aDocAtom.GetNotesPageSize(); break; default : @@ -570,7 +570,7 @@ sal_Bool ImplSdPPTImport::Import() UINT32 nImportedPages = 0; { - UINT16 nMasterAnz = GetPageCount( PPT_MASTERPAGE ); + UINT16 nMasterAnz = GetPageCount( PPT_MASTERPAGE ); for ( USHORT nMasterNum = 0; nMasterNum < nMasterAnz; nMasterNum++ ) { @@ -632,7 +632,7 @@ sal_Bool ImplSdPPTImport::Import() aLayoutName += String::CreateFromInt32( (sal_Int32)( ( nMasterNum + 1 ) / 2 - 1 ) ); ( (SdStyleSheetPool*)mpDoc->GetStyleSheetPool() )->CreateLayoutStyleSheets( aLayoutName ); } - else // Notizseite: Praesentationslayout von der Standardseite verwenden + else // Notizseite: Praesentationslayout von der Standardseite verwenden aLayoutName = ( (SdPage*)mpDoc->GetMasterPage( nMasterNum - 1 ) )->GetName(); } pPage->SetName( aLayoutName ); @@ -647,12 +647,12 @@ sal_Bool ImplSdPPTImport::Import() { UINT32 nTitleInstance = TSS_TYPE_PAGETITLE; UINT32 nOutlinerInstance = TSS_TYPE_BODY; -// BOOL bSwapStyleSheet = pSlideLayout->eLayout == PPT_LAYOUT_TITLEMASTERSLIDE; -// if ( bSwapStyleSheet ) -// { -// nTitleInstance = TSS_TYPE_TITLE; -// nOutlinerInstance = TSS_TYPE_SUBTITLE; -// } +// BOOL bSwapStyleSheet = pSlideLayout->eLayout == PPT_LAYOUT_TITLEMASTERSLIDE; +// if ( bSwapStyleSheet ) +// { +// nTitleInstance = TSS_TYPE_TITLE; +// nOutlinerInstance = TSS_TYPE_SUBTITLE; +// } ///////////////////// // titelstylesheet // ///////////////////// @@ -731,7 +731,7 @@ sal_Bool ImplSdPPTImport::Import() { SetPageNum( i, PPT_MASTERPAGE ); ///////////////////////////////////////////// - // importing master page objects // + // importing master page objects // ///////////////////////////////////////////// PptSlidePersistList* pList = GetPageList( eAktPageKind ); PptSlidePersistEntry* pPersist = ( pList && ( nAktPageNum < pList->Count() ) ) @@ -761,7 +761,7 @@ sal_Bool ImplSdPPTImport::Import() else pE = (*pList)[ nNextMaster ]; } - SdrObject* pObj = ImportPageBackgroundObject( *pMPage, pE->nBackgroundOffset, TRUE ); // import background + SdrObject* pObj = ImportPageBackgroundObject( *pMPage, pE->nBackgroundOffset, TRUE ); // import background if ( pObj ) pMPage->NbcInsertObject( pObj ); @@ -801,7 +801,7 @@ sal_Bool ImplSdPPTImport::Import() rStCtrl >> aHd2; if ( ( aHd2.nRecType == DFF_msofbtSpContainer ) || ( aHd2.nRecType == DFF_msofbtSpgrContainer ) ) { - if ( nObjCount++ ) // skipping the first object + if ( nObjCount++ ) // skipping the first object { Rectangle aEmpty; aHd2.SeekToBegOfRecord( rStCtrl ); @@ -878,7 +878,7 @@ sal_Bool ImplSdPPTImport::Import() } else { - // without StyleSheet, set attributes directly. This + // without StyleSheet, set attributes directly. This // should not be done at all and is an error (will be asserted by SdrPage) pMPage->getSdrPageProperties().ClearItem(); pMPage->getSdrPageProperties().PutItemSet(pObj->GetMergedItemSet()); @@ -894,12 +894,12 @@ sal_Bool ImplSdPPTImport::Import() pStbMgr->SetState( nImportedPages++ ); } //////////////////////////////////// - // importing slide pages // + // importing slide pages // //////////////////////////////////// { - UINT32 nFPosMerk = rStCtrl.Tell(); - PptPageKind ePageKind = eAktPageKind; - UINT16 nPageNum = nAktPageNum; + UINT32 nFPosMerk = rStCtrl.Tell(); + PptPageKind ePageKind = eAktPageKind; + UINT16 nPageNum = nAktPageNum; SdPage* pHandoutPage = (SdPage*)MakeBlancPage( FALSE ); pHandoutPage->SetPageKind( PK_HANDOUT ); @@ -926,8 +926,8 @@ sal_Bool ImplSdPPTImport::Import() pPage->SetLayoutName(((SdPage&)pPage->TRG_GetMasterPage()).GetLayoutName()); } pPage->SetPageKind( PK_STANDARD ); - pSdrModel->InsertPage( pPage ); // SJ: #i29625# because of form controls, the - ImportPage( pPage, pMasterPersist ); // page must be inserted before importing + pSdrModel->InsertPage( pPage ); // SJ: #i29625# because of form controls, the + ImportPage( pPage, pMasterPersist ); // page must be inserted before importing SetHeaderFooterPageSettings( pPage, pMasterPersist ); // CWS preseng01: pPage->SetPageKind( PK_STANDARD ); @@ -968,11 +968,11 @@ sal_Bool ImplSdPPTImport::Import() } break; - case PPT_PST_NewlyAddedAtomByXP11008 : // ??? + case PPT_PST_NewlyAddedAtomByXP11008 : // ??? break; - case PPT_PST_NewlyAddedAtomByXP12011 : // ??? don't know, this atom is always 8 bytes big - break; // and is appearing in nearly every l10 progtag + case PPT_PST_NewlyAddedAtomByXP12011 : // ??? don't know, this atom is always 8 bytes big + break; // and is appearing in nearly every l10 progtag } aProgTagContentHd.SeekToEndOfRecord( rStCtrl ); } @@ -1014,8 +1014,8 @@ sal_Bool ImplSdPPTImport::Import() } pNotesPage->SetPageKind( PK_NOTES ); pNotesPage->TRG_SetMasterPage(*pSdrModel->GetMasterPage(nNotesMasterNum)); - pSdrModel->InsertPage( pNotesPage ); // SJ: #i29625# because of form controls, the - ImportPage( pNotesPage, pMasterPersist2 ); // page must be inserted before importing + pSdrModel->InsertPage( pNotesPage ); // SJ: #i29625# because of form controls, the + ImportPage( pNotesPage, pMasterPersist2 ); // page must be inserted before importing SetHeaderFooterPageSettings( pNotesPage, pMasterPersist2 ); pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES, FALSE ); } @@ -1074,7 +1074,7 @@ sal_Bool ImplSdPPTImport::Import() rStCtrl.Seek( nFPosMerk ); } /////////////////////////////////////////////////////////////////// - // Handzettel und Notiz-Seiten erzeugen // + // Handzettel und Notiz-Seiten erzeugen // /////////////////////////////////////////////////////////////////// bOk = mpDoc->CreateMissingNotesAndHandoutPages(); if ( bOk ) @@ -1090,7 +1090,7 @@ sal_Bool ImplSdPPTImport::Import() const PptSlideLayoutAtom* pSlideLayout = GetSlideLayoutAtom(); if ( pSlideLayout ) { - switch ( pSlideLayout->eLayout ) // Praesentationslayouts fuer Standard-Seiten + switch ( pSlideLayout->eLayout ) // Praesentationslayouts fuer Standard-Seiten { case PPT_LAYOUT_TITLEANDBODYSLIDE : { @@ -1188,11 +1188,11 @@ sal_Bool ImplSdPPTImport::Import() case PPT_LAYOUT_BOTTOMROW2COLUMNS : case PPT_LAYOUT_BLANCSLIDE : - case PPT_LAYOUT_MASTERSLIDE : // Layout der Standard- und Titel-MasterPage + case PPT_LAYOUT_MASTERSLIDE : // Layout der Standard- und Titel-MasterPage case PPT_LAYOUT_TITLEMASTERSLIDE : - case PPT_LAYOUT_MASTERNOTES : // Layout der Notizen-MasterPage - case PPT_LAYOUT_NOTESTITLEBODY : // Praesentationslayout fuer Notiz-Seiten - case PPT_LAYOUT_HANDOUTLAYOUT : // Praesentationslayout fuer Handzettelseiten + case PPT_LAYOUT_MASTERNOTES : // Layout der Notizen-MasterPage + case PPT_LAYOUT_NOTESTITLEBODY : // Praesentationslayout fuer Notiz-Seiten + case PPT_LAYOUT_HANDOUTLAYOUT : // Praesentationslayout fuer Handzettelseiten eAutoLayout = AUTOLAYOUT_NONE; break; } @@ -1201,7 +1201,7 @@ sal_Bool ImplSdPPTImport::Import() } } ////////////////////////////////////////////////////////////// - // Handzettel-MasterPage: Autolayout setzen // + // Handzettel-MasterPage: Autolayout setzen // ////////////////////////////////////////////////////////////// SdPage* pHandoutMPage = mpDoc->GetMasterSdPage( 0, PK_HANDOUT ); pHandoutMPage->SetAutoLayout( AUTOLAYOUT_HANDOUT6, TRUE, TRUE ); @@ -1238,44 +1238,44 @@ sal_Bool ImplSdPPTImport::Import() } if ( pFrameView ) { - sal_uInt16 nSelectedPage = 0; - PageKind ePageKind = PK_STANDARD; - EditMode eEditMode = EM_PAGE; + sal_uInt16 nSelectedPage = 0; + PageKind ePageKind = PK_STANDARD; + EditMode eEditMode = EM_PAGE; switch ( aUserEditAtom.eLastViewType ) { - case 7 : // outliner view + case 7 : // outliner view { SfxItemSet* pSet = mrMed.GetItemSet(); if ( pSet ) pSet->Put( SfxUInt16Item( SID_VIEW_ID, 3 ) ); } break; - case 8 : // slide sorter + case 8 : // slide sorter { SfxItemSet* pSet = mrMed.GetItemSet(); if ( pSet ) pSet->Put( SfxUInt16Item( SID_VIEW_ID, 2 ) ); } break; - case 10 : // titlemaster + case 10 : // titlemaster nSelectedPage = 1; - case 2 : // master + case 2 : // master { ePageKind = PK_STANDARD; eEditMode = EM_MASTERPAGE; } break; - case 5 : // notes master + case 5 : // notes master eEditMode = EM_MASTERPAGE; - case 3 : // notes + case 3 : // notes ePageKind = PK_NOTES; break; - case 4 : // handout + case 4 : // handout ePageKind = PK_HANDOUT; break; default : - case 1 : // normal + case 1 : // normal break; } pFrameView->SetPageKind( ePageKind ); @@ -1340,12 +1340,12 @@ sal_Bool ImplSdPPTImport::Import() } } // this is defaulted, maybe there is no SSDocInfoAtom - String aCustomShow; - sal_uInt32 nFlags = 1; // Bit 0: Auto advance - sal_uInt32 nPenColor = 0x1000000; - sal_Int32 nRestartTime = 0x7fffffff; - sal_uInt16 nStartSlide = 0; - sal_Int16 nEndSlide = 0; + String aCustomShow; + sal_uInt32 nFlags = 1; // Bit 0: Auto advance + sal_uInt32 nPenColor = 0x1000000; + sal_Int32 nRestartTime = 0x7fffffff; + sal_uInt16 nStartSlide = 0; + sal_Int16 nEndSlide = 0; // read the pres. configuration rStCtrl.Seek( maDocHd.GetRecBegFilePos() + 8 ); @@ -1394,8 +1394,8 @@ sal_Bool ImplSdPPTImport::Import() rPresSettings.mbCustomShow = ( nFlags & 8 ) != 0; rPresSettings.mbEndless = ( nFlags & 0x80 ) != 0; rPresSettings.mbFullScreen = ( nFlags & 0x10 ) == 0; -// rPresSettings.mnPauseTimeout; -// rPresSettings.mbShowLogo; +// rPresSettings.mnPauseTimeout; +// rPresSettings.mbShowLogo; if ( nStartSlide && ( nStartSlide <= GetPageCount() ) ) { SdPage* pPage = mpDoc->GetSdPage( nStartSlide - 1, PK_STANDARD ); @@ -1530,7 +1530,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat if ( pActualSlidePersist && ( eAktPageKind == PPT_SLIDEPAGE ) ) { - if ( ! ( pActualSlidePersist->aSlideAtom.nFlags & 1 ) ) // do not follow master objects ? + if ( ! ( pActualSlidePersist->aSlideAtom.nFlags & 1 ) ) // do not follow master objects ? { if(pPage->TRG_HasMasterPage()) { @@ -1568,12 +1568,12 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat sal_Int8 nDirection, nTransitionType, nByteDummy, nSpeed; sal_Int16 nBuildFlags; sal_Int32 nSlideTime, nSoundRef; - rStCtrl >> nSlideTime // Standzeit (in Ticks) - >> nSoundRef // Index in SoundCollection - >> nDirection // Richtung des Ueberblendeffekts - >> nTransitionType // Ueberblendeffekt - >> nBuildFlags // Buildflags (s.u.) - >> nSpeed // Geschwindigkeit (langsam, mittel, schnell) + rStCtrl >> nSlideTime // Standzeit (in Ticks) + >> nSoundRef // Index in SoundCollection + >> nDirection // Richtung des Ueberblendeffekts + >> nTransitionType // Ueberblendeffekt + >> nBuildFlags // Buildflags (s.u.) + >> nSpeed // Geschwindigkeit (langsam, mittel, schnell) >> nByteDummy >> nByteDummy >> nByteDummy; switch ( nTransitionType ) @@ -1597,21 +1597,21 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat case PPT_TRANSITION_TYPE_COVER : { if ( nDirection == 0 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_RIGHT ); // Von rechts ueberdecken + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_RIGHT ); // Von rechts ueberdecken else if ( nDirection == 1 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_BOTTOM ); // Von unten ueberdecken + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_BOTTOM ); // Von unten ueberdecken else if ( nDirection == 2 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_LEFT ); // Von links ueberdecken + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_LEFT ); // Von links ueberdecken else if ( nDirection == 3 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_TOP ); // Von oben ueberdecken + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_TOP ); // Von oben ueberdecken else if ( nDirection == 4 ) pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_LOWERRIGHT );// Von rechts unten ueberdecken ?? else if ( nDirection == 5 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_LOWERLEFT ); // Von links unten ueberdecken ?? + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_LOWERLEFT ); // Von links unten ueberdecken ?? else if ( nDirection == 6 ) pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_UPPERRIGHT );// Von rechts oben ueberdecken else if ( nDirection == 7 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_UPPERLEFT ); // Von links oben ueberdecken ?? + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_UPPERLEFT ); // Von links oben ueberdecken ?? } break; case PPT_TRANSITION_TYPE_NONE : @@ -1619,31 +1619,31 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat if ( nBuildFlags ) { if ( nDirection == 0 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_NONE ); // Direkt + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_NONE ); // Direkt else if ( nDirection == 1 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_NONE ); // Direkt ueber Schwarz + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_NONE ); // Direkt ueber Schwarz } else pPage->setTransitionType( 0 ); } break; case PPT_TRANSITION_TYPE_DISSOLVE : - pPage->SetFadeEffect(::com::sun::star::presentation::FadeEffect_DISSOLVE); // Aufloesen + pPage->SetFadeEffect(::com::sun::star::presentation::FadeEffect_DISSOLVE); // Aufloesen break; case PPT_TRANSITION_TYPE_RANDOM_BARS : { if ( nDirection == 0 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_HORIZONTAL_LINES ); // Horizontale Linien + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_HORIZONTAL_LINES ); // Horizontale Linien else if ( nDirection == 1 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_VERTICAL_LINES ); // Vertikale Linien + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_VERTICAL_LINES ); // Vertikale Linien } break; case PPT_TRANSITION_TYPE_SPLIT : { if ( nDirection == 0 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_OPEN_VERTICAL ); // Horizontal oeffnen + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_OPEN_VERTICAL ); // Horizontal oeffnen else if ( nDirection == 1 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_CLOSE_VERTICAL ); // Horizontal schliessen + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_CLOSE_VERTICAL ); // Horizontal schliessen else if ( nDirection == 2 ) pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_OPEN_HORIZONTAL ); // Vertikal oeffnen else if ( nDirection == 3 ) @@ -1665,13 +1665,13 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat case PPT_TRANSITION_TYPE_PULL : { if ( nDirection == 0 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_LEFT ); // Nach links aufdecken + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_LEFT ); // Nach links aufdecken else if ( nDirection == 1 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_TOP ); // Nach oben aufdecken + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_TOP ); // Nach oben aufdecken else if ( nDirection == 2 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_RIGHT ); // Nach rechts aufdecken + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_RIGHT ); // Nach rechts aufdecken else if ( nDirection == 3 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_BOTTOM ); // Nach unten aufdecken + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_BOTTOM ); // Nach unten aufdecken else if ( nDirection == 4 ) pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_UPPERLEFT );// Nach links oben aufdecken else if ( nDirection == 5 ) @@ -1689,13 +1689,13 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat else if ( nDirection == 1 ) pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_FROM_BOTTOM );// Von unten rollen else if ( nDirection == 2 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_FROM_LEFT ); // Von links rollen + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_FROM_LEFT ); // Von links rollen else if ( nDirection == 3 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_FROM_TOP ); // Von oben rollen + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_FROM_TOP ); // Von oben rollen } break; case PPT_TRANSITION_TYPE_RANDOM : - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_RANDOM ); // Automatisch + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_RANDOM ); // Automatisch break; case PPT_TRANSITION_TYPE_FADE : { @@ -1709,7 +1709,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat if ( nDirection == 0 ) pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_FROM_CENTER );// Von innen einblenden else if ( nDirection == 1 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_TO_CENTER ); // Von aussen einblenden + pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_TO_CENTER ); // Von aussen einblenden } break; case PPT_TRANSITION_TYPE_DIAMOND : @@ -1724,7 +1724,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat pPage->setTransitionSubtype( animations::TransitionSubType::CORNERSOUT ); } break; - case PPT_TRANSITION_TYPE_CIRCLE : + case PPT_TRANSITION_TYPE_CIRCLE : { pPage->setTransitionType( animations::TransitionType::ELLIPSEWIPE ); pPage->setTransitionSubtype( animations::TransitionSubType::CIRCLE ); @@ -1792,11 +1792,11 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat } if ( nSpeed == 0 ) - pPage->setTransitionDuration( 3.0 ); // langsam + pPage->setTransitionDuration( 3.0 ); // langsam else if ( nSpeed == 1 ) - pPage->setTransitionDuration( 2.0 ); // mittel + pPage->setTransitionDuration( 2.0 ); // mittel else if ( nSpeed == 2 ) - pPage->setTransitionDuration( 1.0 ); // schnell + pPage->setTransitionDuration( 1.0 ); // schnell if ( nBuildFlags & 0x400 ) // slidechange by time { // Standzeit (in Ticks) @@ -1806,20 +1806,20 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat else pPage->SetPresChange( mePresChange ); -// if ( nBuildFlags & 1 ) // slidechange by mouseclick -// pPage->SetPresChange( mePresChange ); +// if ( nBuildFlags & 1 ) // slidechange by mouseclick +// pPage->SetPresChange( mePresChange ); if ( nBuildFlags & 4 ) - pPage->SetExcluded( TRUE ); // Dia nicht anzeigen + pPage->SetExcluded( TRUE ); // Dia nicht anzeigen if ( nBuildFlags & 16 ) - { // Dia mit Soundeffekt + { // Dia mit Soundeffekt pPage->SetSound( TRUE ); String aSoundFile( ReadSound( nSoundRef ) ); pPage->SetSoundFile( aSoundFile ); } - if ( nBuildFlags & ( 1 << 6 ) ) // Loop until next sound + if ( nBuildFlags & ( 1 << 6 ) ) // Loop until next sound pPage->SetLoopSound( sal_True ); - if ( nBuildFlags & ( 1 << 8 ) ) // Stop the previous sound + if ( nBuildFlags & ( 1 << 8 ) ) // Stop the previous sound pPage->SetStopSound( sal_True ); break; } @@ -1941,16 +1941,16 @@ String ImplSdPPTImport::ReadSound(UINT32 nSoundRef) const // ueberpruefen, ob diese Sound-Datei schon // existiert. Wenn nicht, exportiere diese // in unser lokales Sound-Verzeichnis. - BOOL bSoundExists = FALSE; - List* pSoundList = new List(); + BOOL bSoundExists = FALSE; + List* pSoundList = new List(); GalleryExplorer::FillObjList( GALLERY_THEME_SOUNDS, *pSoundList ); GalleryExplorer::FillObjList( GALLERY_THEME_USERSOUNDS, *pSoundList ); for( ULONG n = 0; ( n < pSoundList->Count() ) && !bSoundExists; n++ ) { - INetURLObject aURL( *(String*)pSoundList->GetObject( n ) ); - String aSoundName( aURL.GetName() ); + INetURLObject aURL( *(String*)pSoundList->GetObject( n ) ); + String aSoundName( aURL.GetName() ); if( aSoundName == aRetval ) { @@ -1970,8 +1970,8 @@ String ImplSdPPTImport::ReadSound(UINT32 nSoundRef) const DffRecordHeader aSoundDataRecHd; if ( SeekToRec( rStCtrl, PPT_PST_SoundData, nStrLen, &aSoundDataRecHd, 0 ) ) { - String aGalleryDir( SvtPathOptions().GetGalleryPath() ); - INetURLObject aGalleryUserSound( aGalleryDir.GetToken( aGalleryDir.GetTokenCount( ';' ) - 1 ) ); + String aGalleryDir( SvtPathOptions().GetGalleryPath() ); + INetURLObject aGalleryUserSound( aGalleryDir.GetToken( aGalleryDir.GetTokenCount( ';' ) - 1 ) ); aGalleryUserSound.Append( aRetval ); UINT32 nSoundDataLen = aSoundDataRecHd.nRecLen; @@ -2085,51 +2085,51 @@ void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiv // Lokale Informationen in pInfo eintragen if( pIAtom->nSoundRef ) { - pInfo->SetBookmark( ReadSound( pIAtom->nSoundRef ) ); // Pfad zum Soundfile in MSDOS-Notation - pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_SOUND; // RunProgramAction + pInfo->SetBookmark( ReadSound( pIAtom->nSoundRef ) ); // Pfad zum Soundfile in MSDOS-Notation + pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_SOUND; // RunProgramAction } -// if ( nFlags & 0x01 ) // koennen wir nicht ( beim Anklicken markieren ) +// if ( nFlags & 0x01 ) // koennen wir nicht ( beim Anklicken markieren ) switch ( pIAtom->nAction ) { -// case 0x01 : // MacroAction -// { -// pInfo->meClickAction = ::com::sun::star::presentation::::com::sun::star::presentation::ClickAction_MACRO; -// // aMacro liegt in folgender Form vor: -// // "Macroname.Modulname.Libname.Dokumentname" oder -// // "Macroname.Modulname.Libname.Applikationsname" -// pInfo->maBookmark = aMacroName; -// } -// break; - case 0x02 : // RunProgramAction +// case 0x01 : // MacroAction +// { +// pInfo->meClickAction = ::com::sun::star::presentation::::com::sun::star::presentation::ClickAction_MACRO; +// // aMacro liegt in folgender Form vor: +// // "Macroname.Modulname.Libname.Dokumentname" oder +// // "Macroname.Modulname.Libname.Applikationsname" +// pInfo->maBookmark = aMacroName; +// } +// break; + case 0x02 : // RunProgramAction { pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_PROGRAM; - pInfo->SetBookmark( aMacroName ); // Programmname in aBookmark + pInfo->SetBookmark( aMacroName ); // Programmname in aBookmark } break; - case 0x03 : // JumpAction + case 0x03 : // JumpAction { switch( pIAtom->nJump ) { case 0x01 : - pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_NEXTPAGE; // Next slide + pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_NEXTPAGE; // Next slide break; case 0x02 : - pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_PREVPAGE; // Previous slide + pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_PREVPAGE; // Previous slide break; case 0x03 : - pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_FIRSTPAGE; // First slide + pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_FIRSTPAGE; // First slide break; case 0x04 : - pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_LASTPAGE; // last Slide + pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_LASTPAGE; // last Slide break; case 0x05 : - pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_PREVPAGE; // Last slide viewed + pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_PREVPAGE; // Last slide viewed break; case 0x06 : pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_STOPPRESENTATION; // End show break; default : - pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_NONE; // 0x00: no action, else unknown + pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_NONE; // 0x00: no action, else unknown break; } } @@ -2147,7 +2147,7 @@ void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiv switch( pIAtom->nHyperlinkType ) { case 9: - case 8: // hyperlink : URL + case 8: // hyperlink : URL { if ( pPtr->aTarget.Len() ) { @@ -2171,7 +2171,7 @@ void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiv case 10: break; - case 7: // hyperlink auf eine Seite + case 7: // hyperlink auf eine Seite { if ( pPtr->aConvSubString.Len() ) { @@ -2184,10 +2184,10 @@ void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiv } } break; - case 0x05 : // OLEAction ( OLEVerb to use, 0==first, 1==secnd, .. ) - case 0x06 : // MediaAction - case 0x07 : // CustomShowAction - default : // 0x00: no action, else unknown action + case 0x05 : // OLEAction ( OLEVerb to use, 0==first, 1==secnd, .. ) + case 0x06 : // MediaAction + case 0x07 : // CustomShowAction + default : // 0x00: no action, else unknown action break; } } @@ -2195,9 +2195,9 @@ void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiv SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj, SdPage* pPage, SfxStyleSheet* pSheet, SfxStyleSheet** ppStyleSheetAry ) const { - SfxStyleSheet* pStyleSheetAry[ 9 ]; - SdrTextObj* pText = pObj; - SdrObject* pRet = pText; + SfxStyleSheet* pStyleSheetAry[ 9 ]; + SdrTextObj* pText = pObj; + SdrObject* pRet = pText; ppStyleSheetAry = NULL; @@ -2216,7 +2216,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj aPresentationText = pPage->GetPresObjText( ePresKind ); } break; - case PPT_PLACEHOLDER_MASTERBODY : + case PPT_PLACEHOLDER_MASTERBODY : { ePresKind = PRESOBJ_OUTLINE; aPresentationText = pPage->GetPresObjText( ePresKind ); @@ -2234,10 +2234,10 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj aPresentationText = pPage->GetPresObjText( ePresKind ); } break; - case PPT_PLACEHOLDER_MASTERDATE : ePresKind = PRESOBJ_DATETIME; break; - case PPT_PLACEHOLDER_MASTERSLIDENUMBER : ePresKind = PRESOBJ_SLIDENUMBER;break; - case PPT_PLACEHOLDER_MASTERFOOTER : ePresKind = PRESOBJ_FOOTER; break; - case PPT_PLACEHOLDER_MASTERHEADER : ePresKind = PRESOBJ_HEADER; break; + case PPT_PLACEHOLDER_MASTERDATE : ePresKind = PRESOBJ_DATETIME; break; + case PPT_PLACEHOLDER_MASTERSLIDENUMBER : ePresKind = PRESOBJ_SLIDENUMBER;break; + case PPT_PLACEHOLDER_MASTERFOOTER : ePresKind = PRESOBJ_FOOTER; break; + case PPT_PLACEHOLDER_MASTERHEADER : ePresKind = PRESOBJ_HEADER; break; } } switch ( pTextObj->GetDestinationInstance() ) @@ -2394,15 +2394,15 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj bEmptyPresObj = sal_False; switch ( nPlaceholderId ) { - case PPT_PLACEHOLDER_NOTESBODY : ePresObjKind = PRESOBJ_NOTES; break; + case PPT_PLACEHOLDER_NOTESBODY : ePresObjKind = PRESOBJ_NOTES; break; case PPT_PLACEHOLDER_VERTICALTEXTTITLE : bVertical = sal_True; // PASSTHROUGH !!! - case PPT_PLACEHOLDER_TITLE : ePresObjKind = PRESOBJ_TITLE; break; + case PPT_PLACEHOLDER_TITLE : ePresObjKind = PRESOBJ_TITLE; break; case PPT_PLACEHOLDER_VERTICALTEXTBODY : bVertical = sal_True; // PASSTHROUGH !!! - case PPT_PLACEHOLDER_BODY : ePresObjKind = PRESOBJ_OUTLINE; break; - case PPT_PLACEHOLDER_CENTEREDTITLE : ePresObjKind = PRESOBJ_TITLE; break; - case PPT_PLACEHOLDER_SUBTITLE : ePresObjKind = PRESOBJ_TEXT; break; // PRESOBJ_OUTLINE + case PPT_PLACEHOLDER_BODY : ePresObjKind = PRESOBJ_OUTLINE; break; + case PPT_PLACEHOLDER_CENTEREDTITLE : ePresObjKind = PRESOBJ_TITLE; break; + case PPT_PLACEHOLDER_SUBTITLE : ePresObjKind = PRESOBJ_TEXT; break; // PRESOBJ_OUTLINE default : { @@ -2459,7 +2459,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj Rectangle aTitleRect; Rectangle aOutlineRect; - Size aOutlineSize; + Size aOutlineSize; if ( pTitleObj ) aTitleRect = pTitleObj->GetLogicRect(); @@ -2469,11 +2469,11 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj aOutlineSize = aOutlineRect.GetSize(); } Rectangle aLogicRect( pPresObj->GetLogicRect() ); - Size aLogicSize( aLogicRect.GetSize() ); + Size aLogicSize( aLogicRect.GetSize() ); switch ( pSlideLayout->aPlacementId[ i ] ) { - case 0 : // Lage im Titelbereich + case 0 : // Lage im Titelbereich { if ( aLogicRect != aTitleRect ) pPresObj->SetUserCall( NULL ); @@ -2483,23 +2483,23 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj case 1: { if ( pSlideLayout->eLayout == PPT_LAYOUT_TITLEANDBODYSLIDE ) - { // Lage im Outlinebereich + { // Lage im Outlinebereich if ( aLogicRect != aOutlineRect ) pPresObj->SetUserCall( NULL ); } else if ( pSlideLayout->eLayout == PPT_LAYOUT_2COLUMNSANDTITLE ) - { // Lage im Outlinebereich links - if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE || - Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE || + { // Lage im Outlinebereich links + if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE || + Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE || Abs(aLogicRect.Bottom() - aOutlineRect.Bottom()) > MAX_USER_MOVE || - aLogicSize.Width() / aOutlineSize.Width() < 0.48 || - aLogicSize.Width() / aOutlineSize.Width() > 0.5) + aLogicSize.Width() / aOutlineSize.Width() < 0.48 || + aLogicSize.Width() / aOutlineSize.Width() > 0.5) { pPresObj->SetUserCall(NULL); } } else if ( pSlideLayout->eLayout == PPT_LAYOUT_2ROWSANDTITLE ) - { // Lage im Outlinebereich oben + { // Lage im Outlinebereich oben if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE || Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE || Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE) @@ -2509,7 +2509,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj } else if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE || Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE) - { // Lage im Outlinebereich links oben + { // Lage im Outlinebereich links oben pPresObj->SetUserCall( NULL ); } } @@ -2518,36 +2518,36 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj case 2: { if ( pSlideLayout->eLayout == PPT_LAYOUT_2COLUMNSANDTITLE ) - { // Lage im Outlinebereich rechts - if (Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE || - Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE || + { // Lage im Outlinebereich rechts + if (Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE || + Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE || Abs(aLogicRect.Bottom() - aOutlineRect.Bottom()) > MAX_USER_MOVE || - aLogicSize.Width() / aOutlineSize.Width() < 0.48 || - aLogicSize.Width() / aOutlineSize.Width() > 0.5) + aLogicSize.Width() / aOutlineSize.Width() < 0.48 || + aLogicSize.Width() / aOutlineSize.Width() > 0.5) { pPresObj->SetUserCall( NULL ); } } else if ( pSlideLayout->eLayout == PPT_LAYOUT_2ROWSANDTITLE ) - { // Lage im Outlinebereich unten - if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE || + { // Lage im Outlinebereich unten + if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE || Abs(aLogicRect.Bottom() - aOutlineRect.Bottom()) > MAX_USER_MOVE || - Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE) + Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE) { pPresObj->SetUserCall( NULL ); } } else if (Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE || - Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE) - { // Lage im Outlinebereich rechts oben + Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE) + { // Lage im Outlinebereich rechts oben pPresObj->SetUserCall(NULL); } } break; case 3: - { // Lage im Outlinebereich links unten - if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE || + { // Lage im Outlinebereich links unten + if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE || Abs(aLogicRect.Bottom() - aOutlineRect.Bottom()) > MAX_USER_MOVE) { pPresObj->SetUserCall( NULL ); @@ -2556,8 +2556,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj break; case 4: - { // Lage im Outlinebereich rechts unten - if (Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE || + { // Lage im Outlinebereich rechts unten + if (Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE || Abs(aLogicRect.Bottom() - aOutlineRect.Bottom()) > MAX_USER_MOVE) { pObj->SetUserCall( NULL ); @@ -2566,7 +2566,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj break; } } - pRet = NULL; // return zero cause this obj was already inserted by CreatePresObj + pRet = NULL; // return zero cause this obj was already inserted by CreatePresObj } } else if ( !pTextObj->Count() ) @@ -2710,7 +2710,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi } //-- - SdrObject::Free( pObj ), pObj = pMediaObj; // SJ: hoping that pObj is not inserted in any list + SdrObject::Free( pObj ), pObj = pMediaObj; // SJ: hoping that pObj is not inserted in any list pMediaObj->setURL( aMediaURL ); } } diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx index 24e300bd79e9..6eae4d8199fe 100644 --- a/sd/source/filter/ppt/pptin.hxx +++ b/sd/source/filter/ppt/pptin.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,34 +56,34 @@ typedef std::vector< std::pair< SdrObject*, Ppt97AnimationPtr > > tAnimationVect class ImplSdPPTImport : public SdrPowerPointImport { - SfxMedium& mrMed; - SvStorage& mrStorage; -// SvStream* mpPicStream; - DffRecordHeader maDocHd; - List maSlideNameList; - BOOL mbDocumentFound; - sal_uInt32 mnFilterOptions; - SdDrawDocument* mpDoc; - PresChange mePresChange; - SdrLayerID mnBackgroundLayerID; - SdrLayerID mnBackgroundObjectsLayerID; + SfxMedium& mrMed; + SvStorage& mrStorage; +// SvStream* mpPicStream; + DffRecordHeader maDocHd; + List maSlideNameList; + BOOL mbDocumentFound; + sal_uInt32 mnFilterOptions; + SdDrawDocument* mpDoc; + PresChange mePresChange; + SdrLayerID mnBackgroundLayerID; + SdrLayerID mnBackgroundObjectsLayerID; tAnimationMap maAnimations; - void SetHeaderFooterPageSettings( SdPage* pPage, const PptSlidePersistEntry* pMasterPersist ); - void ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimationsUsed ); + void SetHeaderFooterPageSettings( SdPage* pPage, const PptSlidePersistEntry* pMasterPersist ); + void ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimationsUsed ); void FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiveInfoAtom* pIAtom, String aMacroName ); - virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj ); - virtual SdrObject* ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pText, SdPage* pPage, + virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj ); + virtual SdrObject* ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pText, SdPage* pPage, SfxStyleSheet*, SfxStyleSheet** ) const; public: - String ReadSound( sal_uInt32 nSoundRef ) const; - String ReadMedia( sal_uInt32 nMediaRef ) const; - + String ReadSound( sal_uInt32 nSoundRef ) const; + String ReadMedia( sal_uInt32 nMediaRef ) const; + ImplSdPPTImport( SdDrawDocument* pDoc, SvStorage& rStorage, SfxMedium& rMed, PowerPointImportParam& ); ~ImplSdPPTImport(); diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index 10b0b152b8f4..43184fe6ba30 100755 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -265,7 +265,7 @@ void AnimationImporter::import( const Reference< XDrawPage >& xPage, const DffRe processAfterEffectNodes(); } } - + #ifdef DBG_ANIM_LOG fclose( mpFile ); #endif @@ -366,7 +366,7 @@ static bool is_random( const AnimationNode& rNode, const PropertySet& rSet, sal_ switch( nPresetClass ) { - case DFF_ANIM_PRESS_CLASS_ENTRANCE: rPresetClass = EffectPresetClass::ENTRANCE; return true; + case DFF_ANIM_PRESS_CLASS_ENTRANCE: rPresetClass = EffectPresetClass::ENTRANCE; return true; case DFF_ANIM_PRESS_CLASS_EXIT: rPresetClass = EffectPresetClass::EXIT; return true; } return false; @@ -422,7 +422,7 @@ void AnimationImporter::importAnimationContainer( const Atom* pAtom, const Refer dump( "<par" ); dump( aNode ); dump( aSet ); - importTimeContainer( pAtom, xNode ); + importTimeContainer( pAtom, xNode ); dump( "</par>\n" ); // for iteration containers, map target from childs to iteration @@ -473,7 +473,7 @@ void AnimationImporter::importAnimationContainer( const Atom* pAtom, const Refer dump( "<seq" ); dump( aNode ); dump( aSet ); - importTimeContainer( pAtom, xNode ); + importTimeContainer( pAtom, xNode ); dump( "</seq>\n" ); if( aSet.hasProperty( DFF_ANIM_NODE_TYPE ) ) @@ -554,7 +554,7 @@ void AnimationImporter::importAnimationContainer( const Atom* pAtom, const Refer dump( "<audio" ); dump( aNode ); dump( aSet ); - importAudioContainer( pAtom, xNode ); + importAudioContainer( pAtom, xNode ); dump( "</audio>\n" ); } break; @@ -813,7 +813,7 @@ bool AnimationImporter::convertAnimationNode( const Reference< XAnimationNode >& if( nMasterRel != 2 ) { Event aEvent; - + aEvent.Source <<= xParent; aEvent.Trigger = EventTrigger::END_EVENT; aEvent.Repeat = 0; @@ -1085,7 +1085,7 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId // strips switch( nPresetSubType ) { - case 3: pStr = "right-to-top"; break; + case 3: pStr = "right-to-top"; break; case 6: pStr = "right-to-bottom"; break; case 9: pStr = "left-to-top"; break; case 12: pStr = "left-to-bottom"; break; @@ -1184,11 +1184,11 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim sal_Int16 nNodeType = ::com::sun::star::presentation::EffectNodeType::DEFAULT; switch( nPPTNodeType ) { - case DFF_ANIM_NODE_TYPE_ON_CLICK: nNodeType = ::com::sun::star::presentation::EffectNodeType::ON_CLICK; break; - case DFF_ANIM_NODE_TYPE_WITH_PREVIOUS: nNodeType = ::com::sun::star::presentation::EffectNodeType::WITH_PREVIOUS; break; - case DFF_ANIM_NODE_TYPE_AFTER_PREVIOUS: nNodeType = ::com::sun::star::presentation::EffectNodeType::AFTER_PREVIOUS; break; - case DFF_ANIM_NODE_TYPE_MAIN_SEQUENCE: nNodeType = ::com::sun::star::presentation::EffectNodeType::MAIN_SEQUENCE; break; - case DFF_ANIM_NODE_TYPE_TIMING_ROOT: nNodeType = ::com::sun::star::presentation::EffectNodeType::TIMING_ROOT; break; + case DFF_ANIM_NODE_TYPE_ON_CLICK: nNodeType = ::com::sun::star::presentation::EffectNodeType::ON_CLICK; break; + case DFF_ANIM_NODE_TYPE_WITH_PREVIOUS: nNodeType = ::com::sun::star::presentation::EffectNodeType::WITH_PREVIOUS; break; + case DFF_ANIM_NODE_TYPE_AFTER_PREVIOUS: nNodeType = ::com::sun::star::presentation::EffectNodeType::AFTER_PREVIOUS; break; + case DFF_ANIM_NODE_TYPE_MAIN_SEQUENCE: nNodeType = ::com::sun::star::presentation::EffectNodeType::MAIN_SEQUENCE; break; + case DFF_ANIM_NODE_TYPE_TIMING_ROOT: nNodeType = ::com::sun::star::presentation::EffectNodeType::TIMING_ROOT; break; case DFF_ANIM_NODE_TYPE_INTERACTIVE_SEQ:nNodeType = ::com::sun::star::presentation::EffectNodeType::INTERACTIVE_SEQUENCE; break; } @@ -1221,12 +1221,12 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim { switch( nPresetClass ) { - case DFF_ANIM_PRESS_CLASS_ENTRANCE: nEffectPresetClass = EffectPresetClass::ENTRANCE; break; - case DFF_ANIM_PRESS_CLASS_EXIT: nEffectPresetClass = EffectPresetClass::EXIT; break; - case DFF_ANIM_PRESS_CLASS_EMPHASIS: nEffectPresetClass = EffectPresetClass::EMPHASIS; break; - case DFF_ANIM_PRESS_CLASS_MOTIONPATH: nEffectPresetClass = EffectPresetClass::MOTIONPATH; break; - case DFF_ANIM_PRESS_CLASS_OLE_ACTION: nEffectPresetClass = EffectPresetClass::OLEACTION; break; - case DFF_ANIM_PRESS_CLASS_MEDIACALL: nEffectPresetClass = EffectPresetClass::MEDIACALL; break; + case DFF_ANIM_PRESS_CLASS_ENTRANCE: nEffectPresetClass = EffectPresetClass::ENTRANCE; break; + case DFF_ANIM_PRESS_CLASS_EXIT: nEffectPresetClass = EffectPresetClass::EXIT; break; + case DFF_ANIM_PRESS_CLASS_EMPHASIS: nEffectPresetClass = EffectPresetClass::EMPHASIS; break; + case DFF_ANIM_PRESS_CLASS_MOTIONPATH: nEffectPresetClass = EffectPresetClass::MOTIONPATH; break; + case DFF_ANIM_PRESS_CLASS_OLE_ACTION: nEffectPresetClass = EffectPresetClass::OLEACTION; break; + case DFF_ANIM_PRESS_CLASS_MEDIACALL: nEffectPresetClass = EffectPresetClass::MEDIACALL; break; } sal_Int32 nSize = aUserData.getLength(); aUserData.realloc(nSize+1); @@ -1342,7 +1342,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim if( aString.getLength() ) { sal_Int32 nElements = 1; // a non empty string has at least one value - + sal_Int32 fromIndex = 0; while(true) { @@ -1353,7 +1353,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim fromIndex++; nElements++; } - + Sequence< TimeFilterPair > aTimeFilter( nElements ); TimeFilterPair* pValues = aTimeFilter.getArray(); @@ -1372,7 +1372,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim } xAnim->setTimeFilter( aTimeFilter ); - } + } } } @@ -1479,7 +1479,7 @@ void AnimationImporter::importTimeContainer( const Atom* pAtom, const Reference< switch( nTextUnitEffect ) { case 1: nIterateType = TextAnimationType::BY_WORD; break; - case 2: nIterateType = TextAnimationType::BY_LETTER; break; + case 2: nIterateType = TextAnimationType::BY_LETTER; break; } xIter->setIterateType( nIterateType ); xIter->setIterateInterval( (double)fInterval ); @@ -1517,7 +1517,7 @@ void AnimationImporter::importTimeContainer( const Atom* pAtom, const Reference< pChildAtom = pAtom->findNextChildAtom( pChildAtom ); } - } + } } // -------------------------------------------------------------------- @@ -1571,7 +1571,7 @@ void AnimationImporter::importAnimationNodeContainer( const Atom* pAtom, const R case DFF_msofbtAnimateMotion: importAnimateMotionContainer( pChildAtom, xNode ); break; - + case DFF_msofbtAnimCommand: importCommandContainer( pChildAtom, xNode ); break; @@ -1586,8 +1586,8 @@ void AnimationImporter::importAnimationNodeContainer( const Atom* pAtom, const R } pChildAtom = pAtom->findNextChildAtom( pChildAtom ); - } - } + } + } } // -------------------------------------------------------------------- @@ -1738,7 +1738,7 @@ void AnimationImporter::importAnimateAttributeTargetContainer( const Atom* pAtom sal_Int16 nTemp = AnimationAdditiveMode::BASE; switch( nAdditive ) { - case 1: nTemp = AnimationAdditiveMode::SUM; break; + case 1: nTemp = AnimationAdditiveMode::SUM; break; case 2: nTemp = AnimationAdditiveMode::REPLACE; break; case 3: nTemp = AnimationAdditiveMode::MULTIPLY; break; case 4: nTemp = AnimationAdditiveMode::NONE; break; @@ -2245,7 +2245,7 @@ void AnimationImporter::importCommandContainer( const Atom* pAtom, const Referen switch( nType ) { - case 0: // event + case 0: // event case 1: // call if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "onstopaudio" ) ) ) { @@ -2543,7 +2543,7 @@ void AnimationImporter::importAnimateRotationContainer( const Atom* pAtom, const pChildAtom = pAtom->findNextChildAtom( pChildAtom ); } - } + } } // -------------------------------------------------------------------- @@ -2755,8 +2755,8 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen dump( ";" ); if( aValues[i] >>= aStr ) - dump( "%s", - ::rtl::OUStringToOString( aStr, + dump( "%s", + ::rtl::OUStringToOString( aStr, RTL_TEXTENCODING_ASCII_US ).getStr() ); else if( aValues[i] >>= nVal ) dump( "%f", nVal ); @@ -2767,8 +2767,8 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen if( aValues[i] >>= aValuePair ) { if( aValuePair.First >>= aStr ) - dump( "%s", - ::rtl::OUStringToOString( aStr, + dump( "%s", + ::rtl::OUStringToOString( aStr, RTL_TEXTENCODING_ASCII_US ).getStr() ); else if( aValuePair.First >>= nVal ) dump( "%f", nVal ); @@ -2776,8 +2776,8 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen dump( "%X", (sal_Int32)&aValuePair.First ); if( aValuePair.Second >>= aStr ) - dump( ",%s", - ::rtl::OUStringToOString( aStr, + dump( ",%s", + ::rtl::OUStringToOString( aStr, RTL_TEXTENCODING_ASCII_US ).getStr() ); else if( aValuePair.Second >>= nVal ) dump( ",%f", nVal ); @@ -2826,7 +2826,7 @@ bool AnimationImporter::importAttributeValue( const Atom* pAtom, Any& rAny ) break; case DFF_ANIM_PROP_TYPE_INT32 : - { + { if ( nRecLen == 5 ) { sal_uInt32 nInt32; @@ -3066,10 +3066,10 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, An switch( nRefMode ) { -// default case 0: rSubType = ShapeAnimationSubType::AS_WHOLE; break; +// default case 0: rSubType = ShapeAnimationSubType::AS_WHOLE; break; case 6: rSubType = ShapeAnimationSubType::ONLY_BACKGROUND; break; case 8: rSubType = ShapeAnimationSubType::ONLY_TEXT; break; - case 2: // one paragraph + case 2: // one paragraph { if( ((begin == -1) && (end == -1)) || !pSdrObject->ISA( SdrTextObj ) ) break; @@ -3112,7 +3112,7 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, An case 2: // sound { - OUString aSoundURL( ((ImplSdPPTImport*)mpPPTImport)->ReadSound( nRefId ) ); + OUString aSoundURL( ((ImplSdPPTImport*)mpPPTImport)->ReadSound( nRefId ) ); rTarget <<= aSoundURL; dump( " srcRef=\"%s\"", aSoundURL ); } @@ -3132,14 +3132,14 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, An } -// dump( " ref=\"%s\"", nRefMode == 3 ? "source" : ( nRefMode == 0 ? "target" : "unknown" ) ); -// dump( " type=\"%s\"", nRefType == 1 ? "shape" : ( nRefType == 2 ? "sound": "unknown" ) ); -// dump( " id=\"%lu\"", (sal_Int32)nRefId ); +// dump( " ref=\"%s\"", nRefMode == 3 ? "source" : ( nRefMode == 0 ? "target" : "unknown" ) ); +// dump( " type=\"%s\"", nRefType == 1 ? "shape" : ( nRefType == 2 ? "sound": "unknown" ) ); +// dump( " id=\"%lu\"", (sal_Int32)nRefId ); #ifdef DBG_ANIM_LOG if((begin != -1) || (end != -1) ) { -// dump( " text_begin=\"%ld\"", begin ); -// dump( " text_end=\"%ld\"", end ); +// dump( " text_begin=\"%ld\"", begin ); +// dump( " text_end=\"%ld\"", end ); } #endif } @@ -3148,9 +3148,9 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, An { sal_Int32 nU1; mrStCtrl >> nU1; - + // HINT: nU1 == 1 : target document. ? -// dump( " unknown_0x2b01=\"%#lx\"", nU1 ); +// dump( " unknown_0x2b01=\"%#lx\"", nU1 ); } break; default: @@ -3208,7 +3208,7 @@ void AnimationImporter::dump_atom_header( const Atom* pAtom, bool bOpen, bool bA { case DFF_msofbtAnimEvent: pTitle = "AnimEvent"; break; case DFF_msofbtAnimTrigger: pTitle = "AnimTrigger"; break; - case DFF_msofbtAnimateMotion: pTitle = "AnimateMotion"; break; + case DFF_msofbtAnimateMotion: pTitle = "AnimateMotion"; break; case DFF_msofbtAnimPropertySet: pTitle = "AnimPropertySet"; break; case DFF_msofbtAnimateAttributeNames: pTitle = "AnimAttributeName"; break; case DFF_msofbtAnimAttributeValue: pTitle = "AnimAttributeValue"; break; @@ -3243,7 +3243,7 @@ void AnimationImporter::dump_atom_header( const Atom* pAtom, bool bOpen, bool bA { fprintf(mpFile, "<%s", pTitle ); - fprintf(mpFile, " instance=\"%hu\"%s", + fprintf(mpFile, " instance=\"%hu\"%s", pAtom->getInstance(), bAppend ? "" : ">\n"); } @@ -3324,7 +3324,7 @@ void AnimationImporter::dump_atom( const Atom* pAtom, bool bNewLine ) else { if( pChildAtom->seekToContent() ) - { + { fprintf(mpFile, " value=\"" ); dump_atom( pChildAtom, false ); fprintf(mpFile, "\""); @@ -3418,7 +3418,7 @@ void AnimationImporter::dump( const AnimationNode& rNode ) fprintf(mpFile," restart=\"%s\"", rNode.mnRestart == 1 ? "always" : (rNode.mnRestart == 2 ? "whenOff" : (rNode.mnRestart == 3 ? "never" : "unknown")) ); } - + if( rNode.mnFill ) { fprintf(mpFile," fill=\"%s\"", @@ -3435,7 +3435,7 @@ void AnimationImporter::dump( const AnimationNode& rNode ) { fprintf(mpFile, " dur=\"indefinite\"" ); } - + if( rNode.mnU1 ) fprintf(mpFile," u1=\"%#lx\"", rNode.mnU1); if( rNode.mnU3 ) fprintf(mpFile," u3=\"%#lx\"", rNode.mnU3); if( rNode.mnU4 ) fprintf(mpFile," u4=\"%#lx\"", rNode.mnU4); @@ -3486,7 +3486,7 @@ void AnimationImporter::dump( Any& rAny ) } else if( rAny >>= aEvent ) { - static const char* triggers[] = + static const char* triggers[] = { "none","onbegin","onend","begin", "end","onclick","ondoubleclick","onmouseenter", @@ -3542,7 +3542,7 @@ void AnimationImporter::dump( const PropertySet& rSet ) break; case DFF_ANIM_DIRECTION: -// case DFF_ANIM_MASTERREL: +// case DFF_ANIM_MASTERREL: { sal_Bool bDirection; if( aAny >>= bDirection ) @@ -3556,13 +3556,13 @@ void AnimationImporter::dump( const PropertySet& rSet ) if( aAny >>= nMasterRel ) { fprintf( mpFile, " direction=\"%s\"", nMasterRel == 0 ? "sameClick" : ( nMasterRel == 2 ? "nextClick" : "lastClick" ) ); - bKnown = true; + bKnown = true; } } } break; - case DFF_ANIM_OVERRIDE: // TODO + case DFF_ANIM_OVERRIDE: // TODO { sal_Int32 nOverride; if( aAny >>= nOverride ) @@ -3614,13 +3614,13 @@ void AnimationImporter::dump( const PropertySet& rSet ) const char* pMode; switch( nPresetClass ) { - case DFF_ANIM_PRESS_CLASS_USER_DEFINED: pMode = "userdefined"; break; - case DFF_ANIM_PRESS_CLASS_ENTRANCE: pMode = "entrance"; break; - case DFF_ANIM_PRESS_CLASS_EXIT: pMode = "exit"; break; - case DFF_ANIM_PRESS_CLASS_EMPHASIS: pMode = "emphasis"; break; - case DFF_ANIM_PRESS_CLASS_MOTIONPATH: pMode = "motionpath"; break; - case DFF_ANIM_PRESS_CLASS_OLE_ACTION: pMode = "oleaction"; break; - case DFF_ANIM_PRESS_CLASS_MEDIACALL: pMode = "mediacall"; break; + case DFF_ANIM_PRESS_CLASS_USER_DEFINED: pMode = "userdefined"; break; + case DFF_ANIM_PRESS_CLASS_ENTRANCE: pMode = "entrance"; break; + case DFF_ANIM_PRESS_CLASS_EXIT: pMode = "exit"; break; + case DFF_ANIM_PRESS_CLASS_EMPHASIS: pMode = "emphasis"; break; + case DFF_ANIM_PRESS_CLASS_MOTIONPATH: pMode = "motionpath"; break; + case DFF_ANIM_PRESS_CLASS_OLE_ACTION: pMode = "oleaction"; break; + case DFF_ANIM_PRESS_CLASS_MEDIACALL: pMode = "mediacall"; break; default: { static char buffer[128]; @@ -3644,11 +3644,11 @@ void AnimationImporter::dump( const PropertySet& rSet ) const char* pNode; switch( nNodeType ) { - case DFF_ANIM_NODE_TYPE_ON_CLICK: pNode = "onclick"; break; - case DFF_ANIM_NODE_TYPE_WITH_PREVIOUS: pNode = "withprevious"; break; - case DFF_ANIM_NODE_TYPE_AFTER_PREVIOUS: pNode = "afterprevious"; break; - case DFF_ANIM_NODE_TYPE_MAIN_SEQUENCE: pNode = "mainsequence"; break; - case DFF_ANIM_NODE_TYPE_TIMING_ROOT: pNode = "timingroot"; break; + case DFF_ANIM_NODE_TYPE_ON_CLICK: pNode = "onclick"; break; + case DFF_ANIM_NODE_TYPE_WITH_PREVIOUS: pNode = "withprevious"; break; + case DFF_ANIM_NODE_TYPE_AFTER_PREVIOUS: pNode = "afterprevious"; break; + case DFF_ANIM_NODE_TYPE_MAIN_SEQUENCE: pNode = "mainsequence"; break; + case DFF_ANIM_NODE_TYPE_TIMING_ROOT: pNode = "timingroot"; break; case DFF_ANIM_NODE_TYPE_INTERACTIVE_SEQ:pNode = "interactivesequence"; break; default : { diff --git a/sd/source/filter/ppt/pptinanimations.hxx b/sd/source/filter/ppt/pptinanimations.hxx index 24f423029e82..51ba098f4a45 100755 --- a/sd/source/filter/ppt/pptinanimations.hxx +++ b/sd/source/filter/ppt/pptinanimations.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ class SvStream; class ImplSdPPTImport; namespace ppt -{ +{ class PropertySet; class Atom; @@ -92,19 +92,19 @@ private: void fixMainSequenceTiming( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); void fixInteractiveSequenceTiming( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); - + void processAfterEffectNodes(); - ::com::sun::star::uno::Any implGetColorAny( sal_Int32 nMode, sal_Int32 nA, sal_Int32 nB, sal_Int32 nC ); - sal_Int16 implGetColorSpace( sal_Int32 nMode, sal_Int32 nA, sal_Int32 nB, sal_Int32 nC ); + ::com::sun::star::uno::Any implGetColorAny( sal_Int32 nMode, sal_Int32 nA, sal_Int32 nB, sal_Int32 nC ); + sal_Int16 implGetColorSpace( sal_Int32 nMode, sal_Int32 nA, sal_Int32 nB, sal_Int32 nC ); private: ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxRootNode; ImplSdPPTImport* mpPPTImport; - SvStream& mrStCtrl; + SvStream& mrStCtrl; - sd::AfterEffectNodeList maAfterEffectNodes; + sd::AfterEffectNodeList maAfterEffectNodes; #ifdef DBG_ANIM_LOG FILE * mpFile; diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx index 54acab192cb5..873d4abf56ac 100644..100755 --- a/sd/source/filter/ppt/propread.cxx +++ b/sd/source/filter/ppt/propread.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,6 +29,7 @@ #include "precompiled_sd.hxx" #include <propread.hxx> #include <tools/bigint.hxx> +#include "tools/debug.hxx" #include "rtl/tencinfo.h" #include "rtl/textenc.h" @@ -36,32 +37,32 @@ struct PropEntry { - sal_uInt32 mnId; - sal_uInt32 mnSize; - sal_uInt16 mnTextEnc; - sal_uInt8* mpBuf; + sal_uInt32 mnId; + sal_uInt32 mnSize; + sal_uInt16 mnTextEnc; + sal_uInt8* mpBuf; PropEntry( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize, sal_uInt16 nTextEnc ); PropEntry( const PropEntry& rProp ); ~PropEntry() { delete[] mpBuf; } ; - const PropEntry& operator=(const PropEntry& rPropEntry); + const PropEntry& operator=(const PropEntry& rPropEntry); }; PropEntry::PropEntry( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize, sal_uInt16 nTextEnc ) : - mnId ( nId ), - mnSize ( nBufSize ), - mnTextEnc ( nTextEnc ), - mpBuf ( new sal_uInt8[ nBufSize ] ) + mnId ( nId ), + mnSize ( nBufSize ), + mnTextEnc ( nTextEnc ), + mpBuf ( new sal_uInt8[ nBufSize ] ) { memcpy( (void*)mpBuf, (void*)pBuf, nBufSize ); }; PropEntry::PropEntry( const PropEntry& rProp ) : - mnId ( rProp.mnId ), - mnSize ( rProp.mnSize ), - mnTextEnc ( rProp.mnTextEnc ), - mpBuf ( new sal_uInt8[ mnSize ] ) + mnId ( rProp.mnId ), + mnSize ( rProp.mnSize ), + mnTextEnc ( rProp.mnTextEnc ), + mpBuf ( new sal_uInt8[ mnSize ] ) { memcpy( (void*)mpBuf, (void*)rProp.mpBuf, mnSize ); }; @@ -80,7 +81,7 @@ const PropEntry& PropEntry::operator=(const PropEntry& rPropEntry) return *this; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- void PropItem::Clear() { @@ -88,12 +89,23 @@ void PropItem::Clear() delete[] (sal_uInt8*)SwitchBuffer(); } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- + +static xub_StrLen lcl_getMaxSafeStrLen(sal_uInt32 nSize) +{ + nSize -= 1; //Drop NULL terminator + + //If it won't fit in a string, clip it to the max size that does + if (nSize > STRING_MAXLEN) + nSize = STRING_MAXLEN; + + return nSize; +} BOOL PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlign ) { - sal_uInt32 i, nItemSize, nType, nItemPos; - sal_Bool bRetValue = sal_False; + sal_uInt32 i, nItemSize, nType, nItemPos; + sal_Bool bRetValue = sal_False; nItemPos = Tell(); @@ -108,39 +120,46 @@ BOOL PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlign ) { case VT_LPSTR : { - if ( (sal_uInt16)nItemSize ) + if ( nItemSize ) { - sal_Char* pString = new sal_Char[ (sal_uInt16)nItemSize ]; - if ( mnTextEnc == RTL_TEXTENCODING_UCS2 ) - { - nItemSize >>= 1; - if ( (sal_uInt16)nItemSize > 1 ) - { - sal_Unicode* pWString = (sal_Unicode*)pString; - for ( i = 0; i < (sal_uInt16)nItemSize; i++ ) - *this >> pWString[ i ]; - rString = String( pWString, (sal_uInt16)nItemSize - 1 ); - } - else - rString = String(); - bRetValue = sal_True; - } - else + try { - SvMemoryStream::Read( pString, (sal_uInt16)nItemSize ); - if ( pString[ (sal_uInt16)nItemSize - 1 ] == 0 ) + sal_Char* pString = new sal_Char[ nItemSize ]; + if ( mnTextEnc == RTL_TEXTENCODING_UCS2 ) { - if ( (sal_uInt16)nItemSize > 1 ) - rString = String( ByteString( pString ), mnTextEnc ); + nItemSize >>= 1; + if ( nItemSize > 1 ) + { + sal_Unicode* pWString = (sal_Unicode*)pString; + for ( i = 0; i < nItemSize; i++ ) + *this >> pWString[ i ]; + rString = String( pWString, lcl_getMaxSafeStrLen(nItemSize) ); + } else rString = String(); bRetValue = sal_True; } + else + { + SvMemoryStream::Read( pString, nItemSize ); + if ( pString[ nItemSize - 1 ] == 0 ) + { + if ( nItemSize > 1 ) + rString = String( ByteString( pString ), mnTextEnc ); + else + rString = String(); + bRetValue = sal_True; + } + } + delete[] pString; + } + catch( const std::bad_alloc& ) + { + DBG_ERROR( "sd PropItem::Read bad alloc" ); } - delete[] pString; } if ( bAlign ) - SeekRel( ( 4 - ( nItemSize & 3 ) ) & 3 ); // dword align + SeekRel( ( 4 - ( nItemSize & 3 ) ) & 3 ); // dword align } break; @@ -148,21 +167,28 @@ BOOL PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlign ) { if ( nItemSize ) { - sal_Unicode* pString = new sal_Unicode[ (sal_uInt16)nItemSize ]; - for ( i = 0; i < (sal_uInt16)nItemSize; i++ ) - *this >> pString[ i ]; - if ( pString[ i - 1 ] == 0 ) + try { - if ( (sal_uInt16)nItemSize > 1 ) - rString = String( pString, (sal_uInt16)nItemSize - 1 ); - else - rString = String(); - bRetValue = sal_True; + sal_Unicode* pString = new sal_Unicode[ nItemSize ]; + for ( i = 0; i < nItemSize; i++ ) + *this >> pString[ i ]; + if ( pString[ i - 1 ] == 0 ) + { + if ( (sal_uInt16)nItemSize > 1 ) + rString = String( pString, lcl_getMaxSafeStrLen(nItemSize) ); + else + rString = String(); + bRetValue = sal_True; + } + delete[] pString; + } + catch( const std::bad_alloc& ) + { + DBG_ERROR( "sd PropItem::Read bad alloc" ); } - delete[] pString; } if ( bAlign && ( nItemSize & 1 ) ) - SeekRel( 2 ); // dword align + SeekRel( 2 ); // dword align } break; } @@ -171,7 +197,7 @@ BOOL PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlign ) return bRetValue; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- PropItem& PropItem::operator=( PropItem& rPropItem ) { @@ -189,17 +215,17 @@ PropItem& PropItem::operator=( PropItem& rPropItem ) return *this; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- struct Dict { - sal_uInt32 mnId; - String aString; + sal_uInt32 mnId; + String aString; Dict( sal_uInt32 nId, String rString ) { mnId = nId; aString = rString; }; }; -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- Dictionary::~Dictionary() { @@ -207,11 +233,11 @@ Dictionary::~Dictionary() delete (Dict*)pPtr; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- void Dictionary::AddProperty( sal_uInt32 nId, const String& rString ) { - if ( rString.Len() ) // eindeutige namen bei properties + if ( rString.Len() ) // eindeutige namen bei properties { // pruefen, ob es die Propertybeschreibung in der Dictionary schon gibt for ( Dict* pDict = (Dict*)First(); pDict; pDict = (Dict*)Next() ) @@ -226,7 +252,7 @@ void Dictionary::AddProperty( sal_uInt32 nId, const String& rString ) } } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- UINT32 Dictionary::GetProperty( const String& rString ) { @@ -238,7 +264,7 @@ UINT32 Dictionary::GetProperty( const String& rString ) return 0; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- Dictionary& Dictionary::operator=( Dictionary& rDictionary ) { @@ -255,7 +281,7 @@ Dictionary& Dictionary::operator=( Dictionary& rDictionary ) return *this; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- Section::Section( Section& rSection ) : List() @@ -267,7 +293,7 @@ Section::Section( Section& rSection ) Insert( new PropEntry( *pProp ), LIST_APPEND ); } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- Section::Section( const sal_uInt8* pFMTID ) { @@ -276,7 +302,7 @@ Section::Section( const sal_uInt8* pFMTID ) aFMTID[ i ] = pFMTID[ i ]; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- sal_Bool Section::GetProperty( sal_uInt32 nId, PropItem& rPropItem ) { @@ -300,7 +326,7 @@ sal_Bool Section::GetProperty( sal_uInt32 nId, PropItem& rPropItem ) return sal_False; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- void Section::AddProperty( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize ) { @@ -326,7 +352,7 @@ void Section::AddProperty( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBu Insert( new PropEntry( nId, pBuf, nBufSize, mnTextEnc ), LIST_APPEND ); } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- sal_Bool Section::GetDictionary( Dictionary& rDict ) { @@ -349,24 +375,31 @@ sal_Bool Section::GetDictionary( Dictionary& rDict ) for ( sal_uInt32 i = 0; i < nDictCount; i++ ) { aStream >> nId >> nSize; - if ( (sal_uInt16)nSize ) + if ( nSize ) { String aString; nPos = aStream.Tell(); - sal_Char* pString = new sal_Char[ (sal_uInt16)nSize ]; - aStream.Read( pString, (sal_uInt16)nSize ); - if ( mnTextEnc == RTL_TEXTENCODING_UCS2 ) + try { - nSize >>= 1; - aStream.Seek( nPos ); - sal_Unicode* pWString = (sal_Unicode*)pString; - for ( i = 0; i < (sal_uInt16)nSize; i++ ) - aStream >> pWString[ i ]; - aString = String( pWString, (sal_uInt16)nSize - 1 ); + sal_Char* pString = new sal_Char[ nSize ]; + aStream.Read( pString, nSize ); + if ( mnTextEnc == RTL_TEXTENCODING_UCS2 ) + { + nSize >>= 1; + aStream.Seek( nPos ); + sal_Unicode* pWString = (sal_Unicode*)pString; + for ( i = 0; i < nSize; i++ ) + aStream >> pWString[ i ]; + aString = String( pWString, lcl_getMaxSafeStrLen(nSize) ); + } + else + aString = String( ByteString( pString, lcl_getMaxSafeStrLen(nSize) ), mnTextEnc ); + delete[] pString; + } + catch( const std::bad_alloc& ) + { + DBG_ERROR( "sd Section::GetDictionary bad alloc" ); } - else - aString = String( ByteString( pString, (sal_uInt16)nSize - 1 ), mnTextEnc ); - delete[] pString; if ( !aString.Len() ) break; aDict.AddProperty( nId, aString ); @@ -378,7 +411,7 @@ sal_Bool Section::GetDictionary( Dictionary& rDict ) return bRetValue; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- Section::~Section() { @@ -386,7 +419,7 @@ Section::~Section() delete pProp; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- void Section::Read( SvStorageStream *pStrm ) { @@ -404,7 +437,7 @@ void Section::Read( SvStorageStream *pStrm ) *pStrm >> nPropId >> nPropOfs; nCurrent = pStrm->Tell(); pStrm->Seek( nPropOfs + nSecOfs ); - if ( nPropId ) // dictionary wird nicht eingelesen + if ( nPropId ) // dictionary wird nicht eingelesen { *pStrm >> nPropType; @@ -500,6 +533,11 @@ void Section::Read( SvStorageStream *pStrm ) } if ( nPropSize ) { + if ( nPropSize > nStrmSize ) + { + nPropCount = 0; + break; + } pStrm->Seek( nPropOfs + nSecOfs ); sal_uInt8* pBuf = new sal_uInt8[ nPropSize ]; pStrm->Read( pBuf, nPropSize ); @@ -562,7 +600,7 @@ void Section::Read( SvStorageStream *pStrm ) pStrm->Seek( nSecOfs + nSecSize ); } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- Section& Section::operator=( Section& rSection ) { @@ -580,14 +618,14 @@ Section& Section::operator=( Section& rSection ) return *this; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- PropRead::PropRead( SvStorage& rStorage, const String& rName ) : - mbStatus ( sal_False ), - mnByteOrder ( 0xfffe ), - mnFormat ( 0 ), - mnVersionLo ( 4 ), - mnVersionHi ( 2 ) + mbStatus ( sal_False ), + mnByteOrder ( 0xfffe ), + mnFormat ( 0 ), + mnVersionLo ( 4 ), + mnVersionHi ( 2 ) { if ( rStorage.IsStream( rName ) ) { @@ -601,14 +639,14 @@ PropRead::PropRead( SvStorage& rStorage, const String& rName ) : } } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- void PropRead::AddSection( Section& rSection ) { Insert( new Section( rSection ), LIST_APPEND ); } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- const Section* PropRead::GetSection( const sal_uInt8* pFMTID ) { @@ -622,7 +660,7 @@ const Section* PropRead::GetSection( const sal_uInt8* pFMTID ) return pSection; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- PropRead::~PropRead() { @@ -630,7 +668,7 @@ PropRead::~PropRead() delete pSection; } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- void PropRead::Read() { @@ -639,16 +677,16 @@ void PropRead::Read() Clear(); if ( mbStatus ) { - sal_uInt32 nSections; - sal_uInt32 nSectionOfs; - sal_uInt32 nCurrent; + sal_uInt32 nSections; + sal_uInt32 nSectionOfs; + sal_uInt32 nCurrent; *mpSvStream >> mnByteOrder >> mnFormat >> mnVersionLo >> mnVersionHi; if ( mnByteOrder == 0xfffe ) { - sal_uInt8* pSectCLSID = new sal_uInt8[ 16 ]; + sal_uInt8* pSectCLSID = new sal_uInt8[ 16 ]; mpSvStream->Read( mApplicationCLSID, 16 ); *mpSvStream >> nSections; - if ( nSections > 2 ) // sj: PowerPoint documents are containing max 2 sections + if ( nSections > 2 ) // sj: PowerPoint documents are containing max 2 sections { mbStatus = sal_False; } @@ -668,7 +706,7 @@ void PropRead::Read() } } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- PropRead& PropRead::operator=( PropRead& rPropRead ) { diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx index cbb81b8cad1c..a65717aac1d8 100644 --- a/sd/source/filter/ppt/propread.hxx +++ b/sd/source/filter/ppt/propread.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,86 +38,86 @@ #include <tools/string.hxx> // SummaryInformation -#define PID_TITLE 0x02 -#define PID_SUBJECT 0x03 -#define PID_AUTHOR 0x04 -#define PID_KEYWORDS 0x05 -#define PID_COMMENTS 0x06 -#define PID_TEMPLATE 0x07 -#define PID_LASTAUTHOR 0x08 -#define PID_REVNUMBER 0x09 -#define PID_EDITTIME 0x0a -#define PID_LASTPRINTED_DTM 0x0b -#define PID_CREATE_DTM 0x0c -#define PID_LASTSAVED_DTM 0x0d +#define PID_TITLE 0x02 +#define PID_SUBJECT 0x03 +#define PID_AUTHOR 0x04 +#define PID_KEYWORDS 0x05 +#define PID_COMMENTS 0x06 +#define PID_TEMPLATE 0x07 +#define PID_LASTAUTHOR 0x08 +#define PID_REVNUMBER 0x09 +#define PID_EDITTIME 0x0a +#define PID_LASTPRINTED_DTM 0x0b +#define PID_CREATE_DTM 0x0c +#define PID_LASTSAVED_DTM 0x0d // DocumentSummaryInformation -#define PID_CATEGORY 0x02 -#define PID_PRESFORMAT 0x03 -#define PID_BYTECOUNT 0x04 -#define PID_LINECOUNT 0x05 -#define PID_PARACOUNT 0x06 -#define PID_SLIDECOUNT 0x07 -#define PID_NOTECOUNT 0x08 -#define PID_HIDDENCOUNT 0x09 -#define PID_MMCLIPCOUNT 0x0a -#define PID_SCALE 0x0b -#define PID_HEADINGPAIR 0x0c -#define PID_DOCPARTS 0x0d -#define PID_MANAGER 0x0e -#define PID_COMPANY 0x0f -#define PID_LINKSDIRTY 0x10 - -#define VT_EMPTY 0 -#define VT_NULL 1 -#define VT_I2 2 -#define VT_I4 3 -#define VT_R4 4 -#define VT_R8 5 -#define VT_CY 6 -#define VT_DATE 7 -#define VT_BSTR 8 -#define VT_UI4 9 -#define VT_ERROR 10 -#define VT_BOOL 11 -#define VT_VARIANT 12 -#define VT_DECIMAL 14 -#define VT_I1 16 -#define VT_UI1 17 -#define VT_UI2 18 -#define VT_I8 20 -#define VT_UI8 21 -#define VT_INT 22 -#define VT_UINT 23 -#define VT_LPSTR 30 -#define VT_LPWSTR 31 -#define VT_FILETIME 64 -#define VT_BLOB 65 -#define VT_STREAM 66 -#define VT_STORAGE 67 -#define VT_STREAMED_OBJECT 68 -#define VT_STORED_OBJECT 69 -#define VT_BLOB_OBJECT 70 -#define VT_CF 71 -#define VT_CLSID 72 -#define VT_VECTOR 0x1000 -#define VT_ARRAY 0x2000 -#define VT_BYREF 0x4000 -#define VT_TYPEMASK 0xFFF +#define PID_CATEGORY 0x02 +#define PID_PRESFORMAT 0x03 +#define PID_BYTECOUNT 0x04 +#define PID_LINECOUNT 0x05 +#define PID_PARACOUNT 0x06 +#define PID_SLIDECOUNT 0x07 +#define PID_NOTECOUNT 0x08 +#define PID_HIDDENCOUNT 0x09 +#define PID_MMCLIPCOUNT 0x0a +#define PID_SCALE 0x0b +#define PID_HEADINGPAIR 0x0c +#define PID_DOCPARTS 0x0d +#define PID_MANAGER 0x0e +#define PID_COMPANY 0x0f +#define PID_LINKSDIRTY 0x10 + +#define VT_EMPTY 0 +#define VT_NULL 1 +#define VT_I2 2 +#define VT_I4 3 +#define VT_R4 4 +#define VT_R8 5 +#define VT_CY 6 +#define VT_DATE 7 +#define VT_BSTR 8 +#define VT_UI4 9 +#define VT_ERROR 10 +#define VT_BOOL 11 +#define VT_VARIANT 12 +#define VT_DECIMAL 14 +#define VT_I1 16 +#define VT_UI1 17 +#define VT_UI2 18 +#define VT_I8 20 +#define VT_UI8 21 +#define VT_INT 22 +#define VT_UINT 23 +#define VT_LPSTR 30 +#define VT_LPWSTR 31 +#define VT_FILETIME 64 +#define VT_BLOB 65 +#define VT_STREAM 66 +#define VT_STORAGE 67 +#define VT_STREAMED_OBJECT 68 +#define VT_STORED_OBJECT 69 +#define VT_BLOB_OBJECT 70 +#define VT_CF 71 +#define VT_CLSID 72 +#define VT_VECTOR 0x1000 +#define VT_ARRAY 0x2000 +#define VT_BYREF 0x4000 +#define VT_TYPEMASK 0xFFF // ------------------------------------------------------------------------ class PropItem : public SvMemoryStream { - sal_uInt16 mnTextEnc; + sal_uInt16 mnTextEnc; public : PropItem(){}; - void Clear(); + void Clear(); - void SetTextEncoding( sal_uInt16 nTextEnc ){ mnTextEnc = nTextEnc; }; - sal_Bool Read( String& rString, sal_uInt32 nType = VT_EMPTY, sal_Bool bDwordAlign = sal_True ); - PropItem& operator=( PropItem& rPropItem ); + void SetTextEncoding( sal_uInt16 nTextEnc ){ mnTextEnc = nTextEnc; }; + sal_Bool Read( String& rString, sal_uInt32 nType = VT_EMPTY, sal_Bool bDwordAlign = sal_True ); + PropItem& operator=( PropItem& rPropItem ); using SvStream::Read; }; @@ -128,62 +128,62 @@ class Dictionary : protected List { friend class Section; - void AddProperty( UINT32 nId, const String& rString ); + void AddProperty( UINT32 nId, const String& rString ); public : Dictionary(){}; ~Dictionary(); Dictionary& operator=( Dictionary& rDictionary ); - UINT32 GetProperty( const String& rPropName ); + UINT32 GetProperty( const String& rPropName ); }; // ------------------------------------------------------------------------ class Section : private List { - sal_uInt16 mnTextEnc; + sal_uInt16 mnTextEnc; protected: - BYTE aFMTID[ 16 ]; + BYTE aFMTID[ 16 ]; - void AddProperty( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize ); + void AddProperty( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize ); public: Section( const sal_uInt8* pFMTID ); Section( Section& rSection ); ~Section(); - Section& operator=( Section& rSection ); - sal_Bool GetProperty( sal_uInt32 nId, PropItem& rPropItem ); - sal_Bool GetDictionary( Dictionary& rDict ); - const sal_uInt8* GetFMTID() const { return aFMTID; }; - void Read( SvStorageStream* pStrm ); + Section& operator=( Section& rSection ); + sal_Bool GetProperty( sal_uInt32 nId, PropItem& rPropItem ); + sal_Bool GetDictionary( Dictionary& rDict ); + const sal_uInt8* GetFMTID() const { return aFMTID; }; + void Read( SvStorageStream* pStrm ); }; // ------------------------------------------------------------------------ class PropRead : private List { - sal_Bool mbStatus; - SvStorageStream* mpSvStream; + sal_Bool mbStatus; + SvStorageStream* mpSvStream; - sal_uInt16 mnByteOrder; - sal_uInt16 mnFormat; - sal_uInt16 mnVersionLo; - sal_uInt16 mnVersionHi; - sal_uInt8 mApplicationCLSID[ 16 ]; + sal_uInt16 mnByteOrder; + sal_uInt16 mnFormat; + sal_uInt16 mnVersionLo; + sal_uInt16 mnVersionHi; + sal_uInt8 mApplicationCLSID[ 16 ]; - void AddSection( Section& rSection ); + void AddSection( Section& rSection ); public: PropRead( SvStorage& rSvStorage, const String& rName ); ~PropRead(); - PropRead& operator=( PropRead& rPropRead ); - const Section* GetSection( const BYTE* pFMTID ); - sal_Bool IsValid() const { return mbStatus; }; - void Read(); + PropRead& operator=( PropRead& rPropRead ); + const Section* GetSection( const BYTE* pFMTID ); + sal_Bool IsValid() const { return mbStatus; }; + void Read(); }; diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx index 1a7cd380514c..62ac970fd427 100644 --- a/sd/source/filter/sdfilter.cxx +++ b/sd/source/filter/sdfilter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,13 +58,13 @@ using namespace ::com::sun::star::frame; // - SdFilter - // ------------ -SdFilter::SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) -: mxModel( rDocShell.GetModel() ) -, mrMedium( rMedium ) -, mrDocShell( rDocShell ) -, mrDocument( *rDocShell.GetDoc() ) -, mbIsDraw( rDocShell.GetDocumentType() == DOCUMENT_TYPE_DRAW ) -, mbShowProgress( bShowProgress ) +SdFilter::SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) +: mxModel( rDocShell.GetModel() ) +, mrMedium( rMedium ) +, mrDocShell( rDocShell ) +, mrDocument( *rDocShell.GetDoc() ) +, mbIsDraw( rDocShell.GetDocumentType() == DOCUMENT_TYPE_DRAW ) +, mbShowProgress( bShowProgress ) { } @@ -107,27 +107,27 @@ void SdFilter::CreateStatusIndicator() if ( pStatusBarItem ) pStatusBarItem->GetValue() >>= mxStatusIndicator; -// try -// { -// if (mxModel.is()) -// { -// Reference< XController > xController( mxModel->getCurrentController()); -// if( xController.is()) -// { -// Reference< XFrame > xFrame( xController->getFrame()); -// if( xFrame.is()) -// { -// Reference< XStatusIndicatorFactory > xFactory( xFrame, UNO_QUERY ); -// if( xFactory.is()) -// { -// mxStatusIndicator = xFactory->createStatusIndicator(); -// } -// } -// } -// } -// } -// catch( Exception& ) -// { -// } +// try +// { +// if (mxModel.is()) +// { +// Reference< XController > xController( mxModel->getCurrentController()); +// if( xController.is()) +// { +// Reference< XFrame > xFrame( xController->getFrame()); +// if( xFrame.is()) +// { +// Reference< XStatusIndicatorFactory > xFactory( xFrame, UNO_QUERY ); +// if( xFactory.is()) +// { +// mxStatusIndicator = xFactory->createStatusIndicator(); +// } +// } +// } +// } +// } +// catch( Exception& ) +// { +// } } diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index e64cace3c696..396ae10220f7 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ typedef BOOL ( __LOADONCALLAPI *SaveVBA )( SfxObjectShell&, SvMemoryStream*& ); SdPPTFilter::SdPPTFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) : SdFilter( rMedium, rDocShell, bShowProgress ), - pBas ( NULL ) + pBas ( NULL ) { } @@ -75,14 +75,14 @@ SdPPTFilter::SdPPTFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal SdPPTFilter::~SdPPTFilter() { - delete pBas; // deleting the compressed basic storage + delete pBas; // deleting the compressed basic storage } // ----------------------------------------------------------------------------- sal_Bool SdPPTFilter::Import() { - sal_Bool bRet = sal_False; + sal_Bool bRet = sal_False; SotStorageRef pStorage = new SotStorage( mrMedium.GetInStream(), FALSE ); if( !pStorage->GetError() ) { @@ -136,14 +136,14 @@ sal_Bool SdPPTFilter::Import() sal_Bool SdPPTFilter::Export() { ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); - sal_Bool bRet = sal_False; + sal_Bool bRet = sal_False; if( pLibrary ) { if( mxModel.is() ) { SotStorageRef xStorRef = new SotStorage( mrMedium.GetOutStream(), FALSE ); - ExportPPT PPTExport = reinterpret_cast<ExportPPT>(pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii("ExportPPT") )); + ExportPPT PPTExport = reinterpret_cast<ExportPPT>(pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii("ExportPPT") )); /* !!! if ( pViewShell && pViewShell->GetView() ) @@ -151,7 +151,7 @@ sal_Bool SdPPTFilter::Export() */ if( PPTExport && xStorRef.Is() ) { - sal_uInt32 nCnvrtFlags = 0; + sal_uInt32 nCnvrtFlags = 0; SvtFilterOptions* pFilterOptions = SvtFilterOptions::Get(); if ( pFilterOptions ) { diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx index 8abafc84055e..2d888ad88dee 100644 --- a/sd/source/filter/xml/sdtransform.cxx +++ b/sd/source/filter/xml/sdtransform.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ public: bool removeAlienAttributes( SfxItemSet& rSet ); bool removeAlienAttributes( SfxItemSet& rSet, sal_uInt16 nWhich ); - SdDrawDocument& mrDocument; + SdDrawDocument& mrDocument; SdrOutliner& mrOutliner; const OUString msEnableNumbering; const OUString msTextNamespace; @@ -149,7 +149,7 @@ void SdTransformOOo2xDocument::transformStyles( SfxStyleFamily eFam ) { transformStyle( *pSheet ); pSheet = aIter.Next(); - } + } } void SdTransformOOo2xDocument::transformStyle( SfxStyleSheetBase& rSheet ) @@ -263,7 +263,7 @@ void SdTransformOOo2xDocument::transformTextShape( SdrTextObj& rTextShape ) bChange = true; } - bItemChange |= transformItemSet( aParaSet, bState ); + bItemChange |= transformItemSet( aParaSet, bState ); bItemChange |= removeAlienAttributes( aParaSet ); @@ -299,7 +299,7 @@ bool SdTransformOOo2xDocument::getBulletState( const SfxItemSet& rSet, SfxStyleS bool SdTransformOOo2xDocument::getBulletState( const SfxItemSet& rSet, sal_uInt16 nWhich, bool& rState ) { if( (rSet.GetItemState( nWhich ) == SFX_ITEM_SET) ) - { + { const SvXMLAttrContainerItem& rAttr = *static_cast< const SvXMLAttrContainerItem* >( rSet.GetItem( nWhich ) ); const sal_uInt16 nCount = rAttr.GetAttrCount(); @@ -355,7 +355,7 @@ bool SdTransformOOo2xDocument::removeAlienAttributes( SfxItemSet& rSet, sal_uInt { rSet.ClearItem( nWhich ); } - else + else { SvXMLAttrContainerItem aNewItem( nWhich ); diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index cb130f059960..d8682d2b3c66 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -465,7 +465,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) RTL_LOGFILE_CONTEXT_TRACE1( aLog, "importing %s", aFile.GetBuffer() ); #endif - sal_uInt32 nRet = 0; + sal_uInt32 nRet = 0; // Get service factory Reference< lang::XMultiServiceFactory > xServiceFactory = @@ -493,11 +493,11 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) PropertyMapEntry aImportInfoMap[] = { // #80365# necessary properties for XML progress bar at load time - { MAP_LEN( "ProgressRange" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN( "ProgressMax" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN( "Preview" ), 0, &::getCppuType((const sal_Bool*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN( "PageLayouts" ), 0, SEQTYPE(::getCppuType((const uno::Reference< container::XNameAccess >*)0)), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "ProgressRange" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "ProgressMax" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "Preview" ), 0, &::getCppuType((const sal_Bool*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "PageLayouts" ), 0, SEQTYPE(::getCppuType((const uno::Reference< container::XNameAccess >*)0)), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { MAP_LEN( "PrivateData" ), 0, &::getCppuType( (Reference<XInterface> *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, @@ -840,9 +840,9 @@ sal_Bool SdXMLFilter::Export() RTL_LOGFILE_CONTEXT_TRACE1( aLog, "exporting %s", aFile.GetBuffer() ); #endif - SvXMLEmbeddedObjectHelper* pObjectHelper = NULL; - SvXMLGraphicHelper* pGraphicHelper = NULL; - sal_Bool bDocRet = FALSE; + SvXMLEmbeddedObjectHelper* pObjectHelper = NULL; + SvXMLGraphicHelper* pGraphicHelper = NULL; + sal_Bool bDocRet = FALSE; if( !mxModel.is() ) { @@ -879,18 +879,18 @@ sal_Bool SdXMLFilter::Export() DBG_ERROR( "com.sun.star.xml.sax.Writer service missing" ); return FALSE; } - uno::Reference<xml::sax::XDocumentHandler> xHandler( xWriter, uno::UNO_QUERY ); + uno::Reference<xml::sax::XDocumentHandler> xHandler( xWriter, uno::UNO_QUERY ); /** property map for export info set */ PropertyMapEntry aExportInfoMap[] = { // #82003# - { MAP_LEN( "ProgressRange" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN( "ProgressMax" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN( "UsePrettyPrinting"),0, &::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "ProgressRange" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "ProgressMax" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "UsePrettyPrinting"),0, &::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN( "PageLayoutNames" ), 0, SEQTYPE(::getCppuType((const OUString*)0)), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN( "PageLayoutNames" ), 0, SEQTYPE(::getCppuType((const OUString*)0)), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { MAP_LEN( "BaseURI" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, @@ -956,7 +956,7 @@ sal_Bool SdXMLFilter::Export() { uno::Reference< document::XEmbeddedObjectResolver > xObjectResolver; - uno::Reference< document::XGraphicObjectResolver > xGrfResolver; + uno::Reference< document::XGraphicObjectResolver > xGrfResolver; // create helper for graphic and ole export if we have a storage if( xStorage.is() ) @@ -1061,9 +1061,9 @@ sal_Bool SdXMLFilter::Export() uno::Sequence< uno::Any > aArgs( 2 + ( mxStatusIndicator.is() ? 1 : 0 ) + ( xGrfResolver.is() ? 1 : 0 ) + ( xObjectResolver.is() ? 1 : 0 ) ); uno::Any* pArgs = aArgs.getArray(); *pArgs++ <<= xInfoSet; - if( xGrfResolver.is() ) *pArgs++ <<= xGrfResolver; - if( xObjectResolver.is() ) *pArgs++ <<= xObjectResolver; - if( mxStatusIndicator.is() ) *pArgs++ <<= mxStatusIndicator; + if( xGrfResolver.is() ) *pArgs++ <<= xGrfResolver; + if( xObjectResolver.is() ) *pArgs++ <<= xObjectResolver; + if( mxStatusIndicator.is() ) *pArgs++ <<= mxStatusIndicator; *pArgs <<= xHandler; diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx index 032373c03671..1326314c549f 100644 --- a/sd/source/helper/simplereferencecomponent.cxx +++ b/sd/source/helper/simplereferencecomponent.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,10 +68,10 @@ void SimpleReferenceComponent::release() { Dispose(); } - catch (RuntimeException & + catch (RuntimeException & #if OSL_DEBUG_LEVEL > 0 exc -#endif +#endif ) // don't break throw () { #if OSL_DEBUG_LEVEL > 0 @@ -107,7 +107,7 @@ void * SimpleReferenceComponent::operator new(std::size_t nSize, std::nothrow_t const & #ifndef WNT rNothrow -#endif +#endif ) SAL_THROW(()) { diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 034a0bc5e863..736f9bc33758 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ using ::rtl::OUString; using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star::accessibility; using ::com::sun::star::uno::Reference; class SfxViewFrame; @@ -76,7 +76,7 @@ AccessibleDocumentViewBase::AccessibleDocumentViewBase ( mxController (rxController), mxModel (NULL), maViewForwarder ( - static_cast<SdrPaintView*>(pViewShell->GetView()), + static_cast<SdrPaintView*>(pViewShell->GetView()), *static_cast<OutputDevice*>(pSdWindow)) { if (mxController.is()) @@ -114,7 +114,7 @@ void AccessibleDocumentViewBase::Init (void) // Register as window listener to stay up to date with its size and // position. mxWindow->addWindowListener (this); - // Register as focus listener to + // Register as focus listener to mxWindow->addFocusListener (this); // Determine the list of shapes on the current page. @@ -155,7 +155,7 @@ void AccessibleDocumentViewBase::Init (void) for (sal_uInt16 i=0; i<nCount; i++) { Window* pChildWindow = pWindow->GetChild (i); - if (pChildWindow && + if (pChildWindow && (AccessibleRole::EMBEDDED_OBJECT ==pChildWindow->GetAccessibleRole())) { @@ -168,7 +168,7 @@ void AccessibleDocumentViewBase::Init (void) -IMPL_LINK(AccessibleDocumentViewBase, WindowChildEventListener, +IMPL_LINK(AccessibleDocumentViewBase, WindowChildEventListener, VclSimpleEvent*, pEvent) { OSL_ASSERT(pEvent!=NULL && pEvent->ISA(VclWindowEvent)); @@ -278,7 +278,7 @@ Reference<XAccessible> SAL_CALL if (mxAccessibleOLEObject.is()) if (nIndex == 0) return mxAccessibleOLEObject; - + throw lang::IndexOutOfBoundsException ( ::rtl::OUString::createFromAscii ("no child with index ") + rtl::OUString::valueOf(nIndex), @@ -294,9 +294,9 @@ Reference<XAccessible> SAL_CALL within one of their bounding boxes. Return the first child for which this is true. */ -uno::Reference<XAccessible > SAL_CALL +uno::Reference<XAccessible > SAL_CALL AccessibleDocumentViewBase::getAccessibleAtPoint ( - const awt::Point& aPoint) + const awt::Point& aPoint) throw (uno::RuntimeException) { ThrowIfDisposed (); @@ -313,7 +313,7 @@ uno::Reference<XAccessible > SAL_CALL Reference<XAccessibleComponent> xChildComponent ( xChild->getAccessibleContext(), uno::UNO_QUERY); if (xChildComponent.is()) - { + { awt::Rectangle aBBox (xChildComponent->getBounds()); if ( (aPoint.X >= aBBox.X) && (aPoint.Y >= aBBox.Y) @@ -335,7 +335,7 @@ uno::Reference<XAccessible > SAL_CALL -awt::Rectangle SAL_CALL +awt::Rectangle SAL_CALL AccessibleDocumentViewBase::getBounds (void) throw (::com::sun::star::uno::RuntimeException) { @@ -365,9 +365,9 @@ awt::Rectangle SAL_CALL } return awt::Rectangle ( - aPixelTopLeft.X() - aParentPosition.X, - aPixelTopLeft.Y() - aParentPosition.Y, - aPixelSize.X(), + aPixelTopLeft.X() - aParentPosition.X, + aPixelTopLeft.Y() - aParentPosition.Y, + aPixelSize.X(), aPixelSize.Y()); } @@ -375,7 +375,7 @@ awt::Rectangle SAL_CALL awt::Point SAL_CALL - AccessibleDocumentViewBase::getLocation (void) + AccessibleDocumentViewBase::getLocation (void) throw (uno::RuntimeException) { ThrowIfDisposed (); @@ -387,7 +387,7 @@ awt::Point SAL_CALL awt::Point SAL_CALL - AccessibleDocumentViewBase::getLocationOnScreen (void) + AccessibleDocumentViewBase::getLocationOnScreen (void) throw (uno::RuntimeException) { ThrowIfDisposed (); @@ -400,7 +400,7 @@ awt::Point SAL_CALL awt::Size SAL_CALL - AccessibleDocumentViewBase::getSize (void) + AccessibleDocumentViewBase::getSize (void) throw (uno::RuntimeException) { ThrowIfDisposed (); @@ -423,7 +423,7 @@ awt::Size SAL_CALL //===== XInterface ========================================================== - + uno::Any SAL_CALL AccessibleDocumentViewBase::queryInterface (const uno::Type & rType) throw (uno::RuntimeException) @@ -446,7 +446,7 @@ uno::Any SAL_CALL void SAL_CALL - AccessibleDocumentViewBase::acquire (void) + AccessibleDocumentViewBase::acquire (void) throw () { AccessibleContextBase::acquire (); @@ -461,13 +461,13 @@ void SAL_CALL { AccessibleContextBase::release (); } + + - - - + //===== XServiceInfo ======================================================== - -::rtl::OUString SAL_CALL + +::rtl::OUString SAL_CALL AccessibleDocumentViewBase::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -486,11 +486,11 @@ void SAL_CALL } - - - + + + //===== XTypeProvider ======================================================= - + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL AccessibleDocumentViewBase::getTypes (void) throw (::com::sun::star::uno::RuntimeException) @@ -504,27 +504,27 @@ void SAL_CALL // ...and add the additional type for the component, ... - const uno::Type aLangEventListenerType = + const uno::Type aLangEventListenerType = ::getCppuType((const uno::Reference<lang::XEventListener>*)0); - const uno::Type aPropertyChangeListenerType = + const uno::Type aPropertyChangeListenerType = ::getCppuType((const uno::Reference<beans::XPropertyChangeListener>*)0); - const uno::Type aWindowListenerType = + const uno::Type aWindowListenerType = ::getCppuType((const uno::Reference<awt::XWindowListener>*)0); - const uno::Type aFocusListenerType = + const uno::Type aFocusListenerType = ::getCppuType((const uno::Reference<awt::XFocusListener>*)0); - const uno::Type aEventBroadcaster = + const uno::Type aEventBroadcaster = ::getCppuType((const uno::Reference<XAccessibleEventBroadcaster>*)0); // ... and merge them all into one list. - sal_Int32 nTypeCount (aTypeList.getLength()), + sal_Int32 nTypeCount (aTypeList.getLength()), nComponentTypeCount (aComponentTypeList.getLength()), i; - + aTypeList.realloc (nTypeCount + nComponentTypeCount + 5); - + for (i=0; i<nComponentTypeCount; i++) aTypeList[nTypeCount + i] = aComponentTypeList[i]; - + aTypeList[nTypeCount + i++ ] = aLangEventListenerType; aTypeList[nTypeCount + i++] = aPropertyChangeListenerType; aTypeList[nTypeCount + i++] = aWindowListenerType; @@ -551,7 +551,7 @@ void AccessibleDocumentViewBase::impl_dispose() { DBG_ASSERT (pWindow, "AccessibleDocumentViewBase::disposing"); } - + // Unregister from window. if (mxWindow.is()) { @@ -580,7 +580,7 @@ void AccessibleDocumentViewBase::impl_dispose() // Propagate change of controller down the shape tree. maShapeTreeInfo.SetControllerBroadcaster (NULL); - + // Reset the model reference. mxModel = NULL; // Reset the model reference. @@ -626,60 +626,60 @@ void SAL_CALL AccessibleDocumentViewBase::propertyChange (const beans::PropertyC //===== XWindowListener ===================================================== -void SAL_CALL - AccessibleDocumentViewBase::windowResized (const ::com::sun::star::awt::WindowEvent& ) +void SAL_CALL + AccessibleDocumentViewBase::windowResized (const ::com::sun::star::awt::WindowEvent& ) throw (::com::sun::star::uno::RuntimeException) { if( IsDisposed() ) return; ViewForwarderChanged ( - IAccessibleViewForwarderListener::VISIBLE_AREA, + IAccessibleViewForwarderListener::VISIBLE_AREA, &maViewForwarder); } -void SAL_CALL - AccessibleDocumentViewBase::windowMoved (const ::com::sun::star::awt::WindowEvent& ) +void SAL_CALL + AccessibleDocumentViewBase::windowMoved (const ::com::sun::star::awt::WindowEvent& ) throw (::com::sun::star::uno::RuntimeException) { if( IsDisposed() ) return; ViewForwarderChanged ( - IAccessibleViewForwarderListener::VISIBLE_AREA, + IAccessibleViewForwarderListener::VISIBLE_AREA, &maViewForwarder); } -void SAL_CALL - AccessibleDocumentViewBase::windowShown (const ::com::sun::star::lang::EventObject& ) +void SAL_CALL + AccessibleDocumentViewBase::windowShown (const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) { if( IsDisposed() ) return; ViewForwarderChanged ( - IAccessibleViewForwarderListener::VISIBLE_AREA, + IAccessibleViewForwarderListener::VISIBLE_AREA, &maViewForwarder); } -void SAL_CALL - AccessibleDocumentViewBase::windowHidden (const ::com::sun::star::lang::EventObject& ) +void SAL_CALL + AccessibleDocumentViewBase::windowHidden (const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) { if( IsDisposed() ) return; ViewForwarderChanged ( - IAccessibleViewForwarderListener::VISIBLE_AREA, + IAccessibleViewForwarderListener::VISIBLE_AREA, &maViewForwarder); } @@ -720,7 +720,7 @@ void SAL_CALL AccessibleDocumentViewBase::disposing (void) -/// Create a name for this view. +/// Create a name for this view. ::rtl::OUString AccessibleDocumentViewBase::CreateAccessibleName (void) throw (::com::sun::star::uno::RuntimeException) @@ -785,7 +785,7 @@ void AccessibleDocumentViewBase::SetAccessibleOLEObject ( if (mxAccessibleOLEObject != xOLEObject) if (mxAccessibleOLEObject.is()) CommitChange ( - AccessibleEventId::CHILD, + AccessibleEventId::CHILD, uno::Any(), uno::makeAny (mxAccessibleOLEObject)); @@ -799,7 +799,7 @@ void AccessibleDocumentViewBase::SetAccessibleOLEObject ( // Send child event about new accessible OLE object if necessary. if (mxAccessibleOLEObject.is()) CommitChange ( - AccessibleEventId::CHILD, + AccessibleEventId::CHILD, uno::makeAny (mxAccessibleOLEObject), uno::Any()); } @@ -810,23 +810,23 @@ void AccessibleDocumentViewBase::SetAccessibleOLEObject ( //===== methods from AccessibleSelectionBase ================================================== // return the member maMutex; -::osl::Mutex& +::osl::Mutex& AccessibleDocumentViewBase::implGetMutex() { return( maMutex ); } // return ourself as context in default case -uno::Reference< XAccessibleContext > - AccessibleDocumentViewBase::implGetAccessibleContext() +uno::Reference< XAccessibleContext > + AccessibleDocumentViewBase::implGetAccessibleContext() throw (uno::RuntimeException) { return( this ); } // return sal_False in default case -sal_Bool - AccessibleDocumentViewBase::implIsSelected( sal_Int32 ) +sal_Bool + AccessibleDocumentViewBase::implIsSelected( sal_Int32 ) throw (uno::RuntimeException) { return( sal_False ); @@ -834,7 +834,7 @@ sal_Bool // return nothing in default case void - AccessibleDocumentViewBase::implSelect( sal_Int32, sal_Bool ) + AccessibleDocumentViewBase::implSelect( sal_Int32, sal_Bool ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { } diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index dc0088d321f7..f8524ebbb1d0 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star::accessibility; class SfxViewFrame; @@ -137,7 +137,7 @@ void AccessibleDrawDocumentView::Init (void) -void AccessibleDrawDocumentView::ViewForwarderChanged (ChangeType aChangeType, +void AccessibleDrawDocumentView::ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder) { AccessibleDocumentViewBase::ViewForwarderChanged (aChangeType, pViewForwarder); @@ -247,7 +247,7 @@ uno::Reference<XAccessible> SAL_CALL nIndex -= nCount; } - // Create a copy of the pointer to the children manager and release the + // Create a copy of the pointer to the children manager and release the // mutex before calling any of its methods. ChildrenManager* pChildrenManager = mpChildrenManager; aGuard.clear(); @@ -305,7 +305,7 @@ void SAL_CALL // Update the accessible name to reflect the current slide. UpdateAccessibleName(); - + // The current page changed. Update the children manager accordingly. uno::Reference<drawing::XDrawView> xView (mxController, uno::UNO_QUERY); if (xView.is() && mpChildrenManager!=NULL) @@ -339,7 +339,7 @@ void SAL_CALL OSL_TRACE (" visible area changed"); if (mpChildrenManager != NULL) mpChildrenManager->ViewForwarderChanged ( - IAccessibleViewForwarderListener::VISIBLE_AREA, + IAccessibleViewForwarderListener::VISIBLE_AREA, &maViewForwarder); } else @@ -352,8 +352,8 @@ void SAL_CALL //===== XServiceInfo ======================================================== - -::rtl::OUString SAL_CALL + +::rtl::OUString SAL_CALL AccessibleDrawDocumentView::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -370,7 +370,7 @@ void SAL_CALL { ThrowIfDisposed(); // Get list of supported service names from base class... - uno::Sequence<OUString> aServiceNames = + uno::Sequence<OUString> aServiceNames = AccessibleDocumentViewBase::getSupportedServiceNames(); sal_Int32 nCount (aServiceNames.getLength()); @@ -384,9 +384,9 @@ void SAL_CALL } + - -/// Create a name for this view. +/// Create a name for this view. ::rtl::OUString AccessibleDrawDocumentView::CreateAccessibleName (void) throw (::com::sun::star::uno::RuntimeException) @@ -410,7 +410,7 @@ void SAL_CALL else { ::vos::OGuard aGuard( Application::GetSolarMutex() ); - + sName = String( SdResId(SID_SD_A11Y_D_DRAWVIEW_N) ); } } @@ -426,7 +426,7 @@ void SAL_CALL sName = String( SdResId(SID_SD_A11Y_I_HANDOUTVIEW_N) ); } - else + else { sName = sFirstService; } @@ -467,7 +467,7 @@ void SAL_CALL else { ::vos::OGuard aGuard( Application::GetSolarMutex() ); - + sDescription = String( SdResId(SID_SD_A11Y_D_DRAWVIEW_D) ); } } @@ -483,7 +483,7 @@ void SAL_CALL sDescription = String( SdResId(SID_SD_A11Y_I_HANDOUTVIEW_D) ); } - else + else { sDescription = sFirstService; } @@ -500,8 +500,8 @@ void SAL_CALL /** Return selection state of specified child */ -sal_Bool - AccessibleDrawDocumentView::implIsSelected( sal_Int32 nAccessibleChildIndex ) +sal_Bool + AccessibleDrawDocumentView::implIsSelected( sal_Int32 nAccessibleChildIndex ) throw (uno::RuntimeException) { const vos::OGuard aSolarGuard( Application::GetSolarMutex() ); @@ -546,7 +546,7 @@ sal_Bool the XSelectionSupplier of the controller. */ void - AccessibleDrawDocumentView::implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect ) + AccessibleDrawDocumentView::implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { const vos::OGuard aSolarGuard( Application::GetSolarMutex() ); @@ -593,7 +593,7 @@ void AccessibleShape* pAcc = AccessibleShape::getImplementation( getAccessibleChild( nAccessibleChildIndex )); pAccessibleChild = pAcc; - + // Add or remove the shape that is made accessible from the // selection of the controller. if( pAcc ) @@ -604,7 +604,7 @@ void { uno::Reference< drawing::XShapes > xShapes; sal_Bool bFound = sal_False; - + aAny = xSel->getSelection(); aAny >>= xShapes; @@ -732,7 +732,7 @@ void AccessibleDrawDocumentView::UpdateAccessibleName (void) sNewName += OUString::valueOf(xPages->getCount()); } } - + SetAccessibleName (sNewName, AutomaticallyCreated); } diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx index 6862634df9a0..8bfd3977102c 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,21 +36,21 @@ #include "OutlineView.hxx" #include <svx/sdrpaintwindow.hxx> -namespace accessibility +namespace accessibility { AccessibleOutlineEditSource::AccessibleOutlineEditSource( - SdrOutliner& rOutliner, - SdrView& rView, - OutlinerView& rOutlView, - const ::Window& rViewWindow ) + SdrOutliner& rOutliner, + SdrView& rView, + OutlinerView& rOutlView, + const ::Window& rViewWindow ) : mrView( rView ), mrWindow( rViewWindow ), mpOutliner( &rOutliner ), mpOutlinerView( &rOutlView ), mTextForwarder( rOutliner, NULL ), mViewForwarder( rOutlView ) - { + { // register as listener - need to broadcast state change messages rOutliner.SetNotifyHdl( LINK(this, AccessibleOutlineEditSource, NotifyHdl) ); StartListening(rOutliner); @@ -100,7 +100,7 @@ namespace accessibility void AccessibleOutlineEditSource::UpdateData() { - // NOOP, since we're always working on the 'real' outliner, + // NOOP, since we're always working on the 'real' outliner, // i.e. changes are immediately reflected on the screen } @@ -143,20 +143,20 @@ namespace accessibility return mrWindow.LogicToPixel( aVisArea, aMapMode ); } - return Rectangle(); + return Rectangle(); } Point AccessibleOutlineEditSource::LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const { if( IsValid() && mrView.GetModel() ) { - Point aPoint( OutputDevice::LogicToLogic( rPoint, rMapMode, + Point aPoint( OutputDevice::LogicToLogic( rPoint, rMapMode, MapMode(mrView.GetModel()->GetScaleUnit()) ) ); MapMode aMapMode(mrWindow.GetMapMode()); aMapMode.SetOrigin(Point()); return mrWindow.LogicToPixel( aPoint, aMapMode ); } - + return Point(); } @@ -167,11 +167,11 @@ namespace accessibility MapMode aMapMode(mrWindow.GetMapMode()); aMapMode.SetOrigin(Point()); Point aPoint( mrWindow.PixelToLogic( rPoint, aMapMode ) ); - return OutputDevice::LogicToLogic( aPoint, - MapMode(mrView.GetModel()->GetScaleUnit()), + return OutputDevice::LogicToLogic( aPoint, + MapMode(mrView.GetModel()->GetScaleUnit()), rMapMode ); } - + return Point(); } @@ -214,11 +214,11 @@ namespace accessibility if( aNotify ) { ::std::auto_ptr< SfxHint > aHint( SvxEditSourceHelper::EENotification2Hint( aNotify) ); - + if( aHint.get() ) Broadcast( *aHint.get() ); } - + return 0; } diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index f61e09d743f7..b2dcd2c00b8b 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #endif #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#ifndef _COM_SUN_STAR_LANG_XMULSTISERVICEFACTORY_HPP_ +#ifndef _COM_SUN_STAR_LANG_XMULSTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #endif #include <rtl/ustring.h> @@ -68,7 +68,7 @@ #include <vos/mutex.hxx> using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star::accessibility; namespace accessibility { @@ -95,12 +95,12 @@ AccessibleOutlineView::AccessibleOutlineView ( { OutlinerView* pOutlineView = static_cast< ::sd::OutlineView*>( pView)->GetViewByWindow( pSdWindow ); - SdrOutliner* pOutliner = + SdrOutliner* pOutliner = static_cast< ::sd::OutlineView*>(pView)->GetOutliner(); if( pOutlineView && pOutliner ) { - maTextHelper.SetEditSource( ::std::auto_ptr< SvxEditSource >( new AccessibleOutlineEditSource( + maTextHelper.SetEditSource( ::std::auto_ptr< SvxEditSource >( new AccessibleOutlineEditSource( *pOutliner, *pView, *pOutlineView, *pSdWindow ) ) ); } } @@ -123,11 +123,11 @@ void AccessibleOutlineView::Init (void) } -void AccessibleOutlineView::ViewForwarderChanged (ChangeType aChangeType, +void AccessibleOutlineView::ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder) { AccessibleDocumentViewBase::ViewForwarderChanged (aChangeType, pViewForwarder); - + UpdateChildren(); } @@ -171,8 +171,8 @@ void SAL_CALL AccessibleOutlineView::removeEventListener( const uno::Reference< } //===== XServiceInfo ======================================================== - -::rtl::OUString SAL_CALL + +::rtl::OUString SAL_CALL AccessibleOutlineView::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -254,7 +254,7 @@ void SAL_CALL } -/// Create a name for this view. +/// Create a name for this view. ::rtl::OUString AccessibleOutlineView::CreateAccessibleName (void) throw (::com::sun::star::uno::RuntimeException) diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx index 560e0654af60..e446d41785de 100644 --- a/sd/source/ui/accessibility/AccessiblePageShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star::accessibility; using ::com::sun::star::uno::Reference; using ::rtl::OUString; @@ -357,7 +357,7 @@ void AccessiblePageShape::dispose (void) catch (beans::UnknownPropertyException&) { } - + return CreateAccessibleBaseName()+A2S(": ")+sCurrentSlideName; } diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx index 48db0c894e9c..0d3882ecaaac 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ using namespace ::rtl; using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star::accessibility; namespace accessibility { @@ -60,8 +60,8 @@ AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape (void) //===== XServiceInfo ======================================================== - -::rtl::OUString SAL_CALL + +::rtl::OUString SAL_CALL AccessiblePresentationGraphicShape::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -71,7 +71,7 @@ AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape (void) -/// Set this object's name if is different to the current name. +/// Set this object's name if is different to the current name. ::rtl::OUString AccessiblePresentationGraphicShape::CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException) diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx index c62465916983..74fb38c1ac9a 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ using namespace ::rtl; using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star::accessibility; namespace accessibility { @@ -60,8 +60,8 @@ AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void) //===== XServiceInfo ======================================================== - -::rtl::OUString SAL_CALL + +::rtl::OUString SAL_CALL AccessiblePresentationOLEShape::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -71,7 +71,7 @@ AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void) -/// Set this object's name if it is different to the current name. +/// Set this object's name if it is different to the current name. ::rtl::OUString AccessiblePresentationOLEShape::CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException) @@ -117,19 +117,19 @@ AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void) case PRESENTATION_OLE: aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationOLEShape")); //SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE)); - aDG.AddProperty (OUString::createFromAscii ("CLSID"), + aDG.AddProperty (OUString::createFromAscii ("CLSID"), DescriptionGenerator::STRING); break; case PRESENTATION_CHART: aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationChartShape")); //SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE)); - aDG.AddProperty (OUString::createFromAscii ("CLSID"), + aDG.AddProperty (OUString::createFromAscii ("CLSID"), DescriptionGenerator::STRING); break; case PRESENTATION_TABLE: aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationTableShape")); //SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE)); - aDG.AddProperty (OUString::createFromAscii ("CLSID"), + aDG.AddProperty (OUString::createFromAscii ("CLSID"), DescriptionGenerator::STRING); break; default: diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx index 2137d88a9de2..bded19a1f441 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ using namespace ::rtl; using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star::accessibility; namespace accessibility { @@ -60,8 +60,8 @@ AccessiblePresentationShape::~AccessiblePresentationShape (void) //===== XServiceInfo ======================================================== - -::rtl::OUString SAL_CALL + +::rtl::OUString SAL_CALL AccessiblePresentationShape::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -71,7 +71,7 @@ AccessiblePresentationShape::~AccessiblePresentationShape (void) -/// Set this object's name if is different to the current name. +/// Set this object's name if is different to the current name. ::rtl::OUString AccessiblePresentationShape::CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException) @@ -177,4 +177,4 @@ AccessiblePresentationShape::~AccessiblePresentationShape (void) return aDG(); } -} // end of namespace accessibility +} // end of namespace accessibility diff --git a/sd/source/ui/accessibility/AccessibleScrollPanel.cxx b/sd/source/ui/accessibility/AccessibleScrollPanel.cxx index ff34c9556bde..93f16bb19ea3 100644 --- a/sd/source/ui/accessibility/AccessibleScrollPanel.cxx +++ b/sd/source/ui/accessibility/AccessibleScrollPanel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,11 +99,11 @@ Reference<XAccessible> SAL_CALL const vos::OGuard aSolarGuard (Application::GetSolarMutex()); Reference<XAccessible> xChild; - + ScrollPanel& rPanel (GetScrollPanel()); sal_uInt32 nControlCount (mrTreeNode.GetControlContainer().GetControlCount()); - + // The children of this accessible object include the tree node children // and the two scroll bars (when they are visible). if (nIndex < 0) @@ -124,7 +124,7 @@ Reference<XAccessible> SAL_CALL } else throw lang::IndexOutOfBoundsException(); - + return xChild; } diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index ae1f6f633edc..a21dac102a44 100755 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -138,7 +138,7 @@ Reference<XAccessibleContext> SAL_CALL //===== XAccessibleContext ==================================================== -sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleChildCount (void) +sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleChildCount (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -148,7 +148,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleChildCount (void) -Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleChild (sal_Int32 ) +Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleChild (sal_Int32 ) throw (lang::IndexOutOfBoundsException, RuntimeException) { ThrowIfDisposed(); @@ -158,7 +158,7 @@ Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleChild -Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleParent (void) +Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleParent (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -168,7 +168,7 @@ Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleParent -sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleIndexInParent() +sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleIndexInParent() throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -182,7 +182,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleIndexInParent() { sal_Int32 nChildCount (xParentContext->getAccessibleChildCount()); for (sal_Int32 i=0; i<nChildCount; ++i) - if (xParentContext->getAccessibleChild(i).get() + if (xParentContext->getAccessibleChild(i).get() == static_cast<XAccessible*>(this)) { nIndexInParent = i; @@ -190,14 +190,14 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleIndexInParent() } } } - + return nIndexInParent; } -sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole (void) +sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -208,7 +208,7 @@ sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole (void) -::rtl::OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleDescription (void) +::rtl::OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleDescription (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -218,7 +218,7 @@ sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole (void) -::rtl::OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleName (void) +::rtl::OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleName (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -235,7 +235,7 @@ sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole (void) Reference<XAccessibleRelationSet> SAL_CALL - AccessibleSlideSorterObject::getAccessibleRelationSet (void) + AccessibleSlideSorterObject::getAccessibleRelationSet (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -246,7 +246,7 @@ Reference<XAccessibleRelationSet> SAL_CALL Reference<XAccessibleStateSet> SAL_CALL - AccessibleSlideSorterObject::getAccessibleStateSet (void) + AccessibleSlideSorterObject::getAccessibleStateSet (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -278,7 +278,7 @@ Reference<XAccessibleStateSet> SAL_CALL -lang::Locale SAL_CALL AccessibleSlideSorterObject::getLocale (void) +lang::Locale SAL_CALL AccessibleSlideSorterObject::getLocale (void) throw (IllegalAccessibleComponentStateException, RuntimeException) { @@ -291,8 +291,8 @@ lang::Locale SAL_CALL AccessibleSlideSorterObject::getLocale (void) return xParentContext->getLocale (); } - // No locale and no parent. Therefore throw exception to indicate this - // cluelessness. + // No locale and no parent. Therefore throw exception to indicate this + // cluelessness. throw IllegalAccessibleComponentStateException(); } @@ -303,7 +303,7 @@ lang::Locale SAL_CALL AccessibleSlideSorterObject::getLocale (void) //===== XAccessibleEventBroadcaster =========================================== void SAL_CALL AccessibleSlideSorterObject::addEventListener( - const Reference<XAccessibleEventListener>& rxListener) + const Reference<XAccessibleEventListener>& rxListener) throw (RuntimeException) { if (rxListener.is()) @@ -328,7 +328,7 @@ void SAL_CALL AccessibleSlideSorterObject::addEventListener( void SAL_CALL AccessibleSlideSorterObject::removeEventListener( - const Reference<XAccessibleEventListener>& rxListener) + const Reference<XAccessibleEventListener>& rxListener) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -354,7 +354,7 @@ void SAL_CALL AccessibleSlideSorterObject::removeEventListener( //===== XAccessibleComponent ================================================== -sal_Bool SAL_CALL AccessibleSlideSorterObject::containsPoint(const awt::Point& aPoint) +sal_Bool SAL_CALL AccessibleSlideSorterObject::containsPoint(const awt::Point& aPoint) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -369,7 +369,7 @@ sal_Bool SAL_CALL AccessibleSlideSorterObject::containsPoint(const awt::Point& a Reference<XAccessible> SAL_CALL - AccessibleSlideSorterObject::getAccessibleAtPoint(const awt::Point& ) + AccessibleSlideSorterObject::getAccessibleAtPoint(const awt::Point& ) throw (uno::RuntimeException) { return NULL; @@ -378,7 +378,7 @@ Reference<XAccessible> SAL_CALL -awt::Rectangle SAL_CALL AccessibleSlideSorterObject::getBounds (void) +awt::Rectangle SAL_CALL AccessibleSlideSorterObject::getBounds (void) throw (RuntimeException) { ThrowIfDisposed (); @@ -414,7 +414,7 @@ awt::Rectangle SAL_CALL AccessibleSlideSorterObject::getBounds (void) -awt::Point SAL_CALL AccessibleSlideSorterObject::getLocation () +awt::Point SAL_CALL AccessibleSlideSorterObject::getLocation () throw (RuntimeException) { ThrowIfDisposed (); @@ -425,7 +425,7 @@ awt::Point SAL_CALL AccessibleSlideSorterObject::getLocation () -awt::Point SAL_CALL AccessibleSlideSorterObject::getLocationOnScreen (void) +awt::Point SAL_CALL AccessibleSlideSorterObject::getLocationOnScreen (void) throw (RuntimeException) { ThrowIfDisposed (); @@ -451,7 +451,7 @@ awt::Point SAL_CALL AccessibleSlideSorterObject::getLocationOnScreen (void) -awt::Size SAL_CALL AccessibleSlideSorterObject::getSize (void) +awt::Size SAL_CALL AccessibleSlideSorterObject::getSize (void) throw (RuntimeException) { ThrowIfDisposed (); @@ -462,7 +462,7 @@ awt::Size SAL_CALL AccessibleSlideSorterObject::getSize (void) -void SAL_CALL AccessibleSlideSorterObject::grabFocus (void) +void SAL_CALL AccessibleSlideSorterObject::grabFocus (void) throw (RuntimeException) { // nothing to do @@ -483,7 +483,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getForeground (void) -sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground (void) +sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground (void) throw (::com::sun::star::uno::RuntimeException) { ThrowIfDisposed (); diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 6f3508d731a8..f7b901affe17 100755 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -208,7 +208,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleChildCount (void) } Reference<XAccessible > SAL_CALL - AccessibleSlideSorterView::getAccessibleChild (sal_Int32 nIndex) + AccessibleSlideSorterView::getAccessibleChild (sal_Int32 nIndex) throw (lang::IndexOutOfBoundsException, RuntimeException) { ThrowIfDisposed(); @@ -220,7 +220,7 @@ Reference<XAccessible > SAL_CALL return mpImpl->GetVisibleChild(nIndex); } -Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent (void) +Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -237,7 +237,7 @@ Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent return xParent; } -sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent (void) +sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent (void) throw (uno::RuntimeException) { OSL_ASSERT(getAccessibleParent().is()); @@ -245,27 +245,27 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent (void) const vos::OGuard aSolarGuard (Application::GetSolarMutex()); sal_Int32 nIndexInParent(-1); - + Reference<XAccessibleContext> xParentContext (getAccessibleParent()->getAccessibleContext()); if (xParentContext.is()) { sal_Int32 nChildCount (xParentContext->getAccessibleChildCount()); for (sal_Int32 i=0; i<nChildCount; ++i) - if (xParentContext->getAccessibleChild(i).get() + if (xParentContext->getAccessibleChild(i).get() == static_cast<XAccessible*>(this)) { nIndexInParent = i; break; } } - + return nIndexInParent; } -sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole (void) +sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -276,7 +276,7 @@ sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole (void) -::rtl::OUString SAL_CALL AccessibleSlideSorterView::getAccessibleDescription (void) +::rtl::OUString SAL_CALL AccessibleSlideSorterView::getAccessibleDescription (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -288,7 +288,7 @@ sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole (void) -::rtl::OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName (void) +::rtl::OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -301,7 +301,7 @@ sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole (void) Reference<XAccessibleRelationSet> SAL_CALL - AccessibleSlideSorterView::getAccessibleRelationSet (void) + AccessibleSlideSorterView::getAccessibleRelationSet (void) throw (uno::RuntimeException) { return Reference<XAccessibleRelationSet>(); @@ -311,7 +311,7 @@ Reference<XAccessibleRelationSet> SAL_CALL Reference<XAccessibleStateSet > SAL_CALL - AccessibleSlideSorterView::getAccessibleStateSet (void) + AccessibleSlideSorterView::getAccessibleStateSet (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -338,7 +338,7 @@ Reference<XAccessibleStateSet > SAL_CALL -lang::Locale SAL_CALL AccessibleSlideSorterView::getLocale (void) +lang::Locale SAL_CALL AccessibleSlideSorterView::getLocale (void) throw (IllegalAccessibleComponentStateException, RuntimeException) { @@ -359,7 +359,7 @@ lang::Locale SAL_CALL AccessibleSlideSorterView::getLocale (void) void SAL_CALL AccessibleSlideSorterView::addEventListener( - const Reference<XAccessibleEventListener >& rxListener) + const Reference<XAccessibleEventListener >& rxListener) throw (RuntimeException) { if (rxListener.is()) @@ -384,7 +384,7 @@ void SAL_CALL AccessibleSlideSorterView::addEventListener( void SAL_CALL AccessibleSlideSorterView::removeEventListener( - const Reference<XAccessibleEventListener >& rxListener) + const Reference<XAccessibleEventListener >& rxListener) throw (RuntimeException) { ThrowIfDisposed(); @@ -414,7 +414,7 @@ void SAL_CALL AccessibleSlideSorterView::removeEventListener( //===== XAccessibleComponent ================================================== -sal_Bool SAL_CALL AccessibleSlideSorterView::containsPoint (const awt::Point& aPoint) +sal_Bool SAL_CALL AccessibleSlideSorterView::containsPoint (const awt::Point& aPoint) throw (RuntimeException) { ThrowIfDisposed(); @@ -429,27 +429,27 @@ sal_Bool SAL_CALL AccessibleSlideSorterView::containsPoint (const awt::Point& aP Reference<XAccessible> SAL_CALL - AccessibleSlideSorterView::getAccessibleAtPoint (const awt::Point& aPoint) + AccessibleSlideSorterView::getAccessibleAtPoint (const awt::Point& aPoint) throw (RuntimeException) { ThrowIfDisposed(); Reference<XAccessible> xAccessible; const vos::OGuard aSolarGuard (Application::GetSolarMutex()); - const Point aTestPoint (aPoint.X, aPoint.Y); + const Point aTestPoint (aPoint.X, aPoint.Y); ::sd::slidesorter::model::SharedPageDescriptor pHitDescriptor ( mrSlideSorter.GetController().GetPageAt(aTestPoint)); if (pHitDescriptor.get() != NULL) xAccessible = mpImpl->GetAccessibleChild( (pHitDescriptor->GetPage()->GetPageNum()-1)/2); - + return xAccessible; } -awt::Rectangle SAL_CALL AccessibleSlideSorterView::getBounds (void) +awt::Rectangle SAL_CALL AccessibleSlideSorterView::getBounds (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -460,25 +460,25 @@ awt::Rectangle SAL_CALL AccessibleSlideSorterView::getBounds (void) { const Point aPosition (mpContentWindow->GetPosPixel()); const Size aSize (mpContentWindow->GetOutputSizePixel()); - + aBBox.X = aPosition.X(); aBBox.Y = aPosition.Y(); aBBox.Width = aSize.Width(); aBBox.Height = aSize.Height(); } - + return aBBox; } -awt::Point SAL_CALL AccessibleSlideSorterView::getLocation (void) +awt::Point SAL_CALL AccessibleSlideSorterView::getLocation (void) throw (uno::RuntimeException) { ThrowIfDisposed(); awt::Point aLocation; - + if (mpContentWindow != NULL) { const Point aPosition (mpContentWindow->GetPosPixel()); @@ -495,7 +495,7 @@ awt::Point SAL_CALL AccessibleSlideSorterView::getLocation (void) /** Calculate the location on screen from the parent's location on screen and our own relative location. */ -awt::Point SAL_CALL AccessibleSlideSorterView::getLocationOnScreen() +awt::Point SAL_CALL AccessibleSlideSorterView::getLocationOnScreen() throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -510,7 +510,7 @@ awt::Point SAL_CALL AccessibleSlideSorterView::getLocationOnScreen() if (xParentComponent.is()) aParentLocationOnScreen = xParentComponent->getLocationOnScreen(); } - + awt::Point aLocationOnScreen (getLocation()); aLocationOnScreen.X += aParentLocationOnScreen.X; aLocationOnScreen.Y += aParentLocationOnScreen.Y; @@ -521,12 +521,12 @@ awt::Point SAL_CALL AccessibleSlideSorterView::getLocationOnScreen() -awt::Size SAL_CALL AccessibleSlideSorterView::getSize (void) +awt::Size SAL_CALL AccessibleSlideSorterView::getSize (void) throw (uno::RuntimeException) { ThrowIfDisposed(); awt::Size aSize; - + if (mpContentWindow != NULL) { const Size aOutputSize (mpContentWindow->GetOutputSizePixel()); @@ -540,7 +540,7 @@ awt::Size SAL_CALL AccessibleSlideSorterView::getSize (void) -void SAL_CALL AccessibleSlideSorterView::grabFocus (void) +void SAL_CALL AccessibleSlideSorterView::grabFocus (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -565,7 +565,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getForeground (void) -sal_Int32 SAL_CALL AccessibleSlideSorterView::getBackground (void) +sal_Int32 SAL_CALL AccessibleSlideSorterView::getBackground (void) throw (RuntimeException) { ThrowIfDisposed(); @@ -578,7 +578,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getBackground (void) //===== XAccessibleSelection ================================================== -void SAL_CALL AccessibleSlideSorterView::selectAccessibleChild (sal_Int32 nChildIndex) +void SAL_CALL AccessibleSlideSorterView::selectAccessibleChild (sal_Int32 nChildIndex) throw (lang::IndexOutOfBoundsException, RuntimeException) { @@ -595,7 +595,7 @@ void SAL_CALL AccessibleSlideSorterView::selectAccessibleChild (sal_Int32 nChild -sal_Bool SAL_CALL AccessibleSlideSorterView::isAccessibleChildSelected (sal_Int32 nChildIndex) +sal_Bool SAL_CALL AccessibleSlideSorterView::isAccessibleChildSelected (sal_Int32 nChildIndex) throw (lang::IndexOutOfBoundsException, RuntimeException) { @@ -616,7 +616,7 @@ sal_Bool SAL_CALL AccessibleSlideSorterView::isAccessibleChildSelected (sal_Int3 -void SAL_CALL AccessibleSlideSorterView::clearAccessibleSelection (void) +void SAL_CALL AccessibleSlideSorterView::clearAccessibleSelection (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -640,7 +640,7 @@ void SAL_CALL AccessibleSlideSorterView::selectAllAccessibleChildren (void) -sal_Int32 SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChildCount (void) +sal_Int32 SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChildCount (void) throw (uno::RuntimeException) { ThrowIfDisposed (); @@ -652,7 +652,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChildCount (v Reference<XAccessible > SAL_CALL - AccessibleSlideSorterView::getSelectedAccessibleChild (sal_Int32 nSelectedChildIndex ) + AccessibleSlideSorterView::getSelectedAccessibleChild (sal_Int32 nSelectedChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { ThrowIfDisposed (); @@ -674,7 +674,7 @@ Reference<XAccessible > SAL_CALL ++nSelectedCount; } - + if ( ! xChild.is() ) throw lang::IndexOutOfBoundsException(); @@ -684,7 +684,7 @@ Reference<XAccessible > SAL_CALL -void SAL_CALL AccessibleSlideSorterView::deselectAccessibleChild (sal_Int32 nChildIndex) +void SAL_CALL AccessibleSlideSorterView::deselectAccessibleChild (sal_Int32 nChildIndex) throw (lang::IndexOutOfBoundsException, RuntimeException) { @@ -899,14 +899,14 @@ AccessibleSlideSorterObject* AccessibleSlideSorterView::Implementation::GetAcces } } - + pChild = maPageObjects[nIndex].get(); } else { OSL_ASSERT(nIndex>=0 && (sal_uInt32)nIndex<maPageObjects.size()); } - + return pChild; } @@ -947,7 +947,7 @@ void AccessibleSlideSorterView::Implementation::ReleaseListeners (void) if (mpWindow != NULL) mpWindow->RemoveEventListener( LINK(this,AccessibleSlideSorterView::Implementation,WindowEventListener)); - + if (mbListeningToDocument) { if (mrSlideSorter.GetViewShell() != NULL) @@ -1006,7 +1006,7 @@ IMPL_LINK(AccessibleSlideSorterView::Implementation, WindowEventListener, VclWin case VCLEVENT_WINDOW_RESIZE: UpdateChildren(); break; - + case VCLEVENT_WINDOW_GETFOCUS: case VCLEVENT_WINDOW_LOSEFOCUS: mrAccessibleSlideSorter.FireAccessibleEvent( diff --git a/sd/source/ui/accessibility/AccessibleTreeNode.cxx b/sd/source/ui/accessibility/AccessibleTreeNode.cxx index 5c7462581d0b..37646409f1d0 100755 --- a/sd/source/ui/accessibility/AccessibleTreeNode.cxx +++ b/sd/source/ui/accessibility/AccessibleTreeNode.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,7 +106,7 @@ AccessibleTreeNode::AccessibleTreeNode( void AccessibleTreeNode::CommonConstructor (void) { UpdateStateSet(); - + Link aStateChangeLink (LINK(this,AccessibleTreeNode,StateChangeListener)); mrTreeNode.AddStateChangeListener(aStateChangeLink); @@ -189,17 +189,17 @@ sal_Int32 SAL_CALL AccessibleTreeNode::getAccessibleChildCount (void) Reference<XAccessible > SAL_CALL - AccessibleTreeNode::getAccessibleChild (sal_Int32 nIndex) + AccessibleTreeNode::getAccessibleChild (sal_Int32 nIndex) throw (lang::IndexOutOfBoundsException, RuntimeException) { ThrowIfDisposed(); const vos::OGuard aSolarGuard (Application::GetSolarMutex()); - + if (nIndex<0 || (sal_uInt32)nIndex>=mrTreeNode.GetControlContainer().GetControlCount()) throw lang::IndexOutOfBoundsException(); Reference<XAccessible> xChild; - + ::sd::toolpanel::TreeNode* pNode = mrTreeNode.GetControlContainer().GetControl(nIndex); if (pNode != NULL) xChild = pNode->GetAccessibleObject(); @@ -210,7 +210,7 @@ Reference<XAccessible > SAL_CALL -Reference<XAccessible > SAL_CALL AccessibleTreeNode::getAccessibleParent (void) +Reference<XAccessible > SAL_CALL AccessibleTreeNode::getAccessibleParent (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -221,7 +221,7 @@ Reference<XAccessible > SAL_CALL AccessibleTreeNode::getAccessibleParent (void) -sal_Int32 SAL_CALL AccessibleTreeNode::getAccessibleIndexInParent (void) +sal_Int32 SAL_CALL AccessibleTreeNode::getAccessibleIndexInParent (void) throw (uno::RuntimeException) { OSL_ASSERT(getAccessibleParent().is()); @@ -229,27 +229,27 @@ sal_Int32 SAL_CALL AccessibleTreeNode::getAccessibleIndexInParent (void) const vos::OGuard aSolarGuard (Application::GetSolarMutex()); sal_Int32 nIndexInParent(-1); - + Reference<XAccessibleContext> xParentContext (getAccessibleParent()->getAccessibleContext()); if (xParentContext.is()) { sal_Int32 nChildCount (xParentContext->getAccessibleChildCount()); for (sal_Int32 i=0; i<nChildCount; ++i) - if (xParentContext->getAccessibleChild(i).get() + if (xParentContext->getAccessibleChild(i).get() == static_cast<XAccessible*>(this)) { nIndexInParent = i; break; } } - + return nIndexInParent; } -sal_Int16 SAL_CALL AccessibleTreeNode::getAccessibleRole (void) +sal_Int16 SAL_CALL AccessibleTreeNode::getAccessibleRole (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -259,7 +259,7 @@ sal_Int16 SAL_CALL AccessibleTreeNode::getAccessibleRole (void) -::rtl::OUString SAL_CALL AccessibleTreeNode::getAccessibleDescription (void) +::rtl::OUString SAL_CALL AccessibleTreeNode::getAccessibleDescription (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -269,7 +269,7 @@ sal_Int16 SAL_CALL AccessibleTreeNode::getAccessibleRole (void) -::rtl::OUString SAL_CALL AccessibleTreeNode::getAccessibleName (void) +::rtl::OUString SAL_CALL AccessibleTreeNode::getAccessibleName (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -280,7 +280,7 @@ sal_Int16 SAL_CALL AccessibleTreeNode::getAccessibleRole (void) Reference<XAccessibleRelationSet> SAL_CALL - AccessibleTreeNode::getAccessibleRelationSet (void) + AccessibleTreeNode::getAccessibleRelationSet (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -291,7 +291,7 @@ Reference<XAccessibleRelationSet> SAL_CALL Reference<XAccessibleStateSet > SAL_CALL - AccessibleTreeNode::getAccessibleStateSet (void) + AccessibleTreeNode::getAccessibleStateSet (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -347,7 +347,7 @@ void AccessibleTreeNode::UpdateState( -lang::Locale SAL_CALL AccessibleTreeNode::getLocale (void) +lang::Locale SAL_CALL AccessibleTreeNode::getLocale (void) throw (IllegalAccessibleComponentStateException, RuntimeException) { @@ -368,7 +368,7 @@ lang::Locale SAL_CALL AccessibleTreeNode::getLocale (void) void SAL_CALL AccessibleTreeNode::addEventListener( - const Reference<XAccessibleEventListener >& rxListener) + const Reference<XAccessibleEventListener >& rxListener) throw (RuntimeException) { if (rxListener.is()) @@ -393,7 +393,7 @@ void SAL_CALL AccessibleTreeNode::addEventListener( void SAL_CALL AccessibleTreeNode::removeEventListener( - const Reference<XAccessibleEventListener >& rxListener) + const Reference<XAccessibleEventListener >& rxListener) throw (RuntimeException) { ThrowIfDisposed(); @@ -419,7 +419,7 @@ void SAL_CALL AccessibleTreeNode::removeEventListener( //===== XAccessibleComponent ================================================== -sal_Bool SAL_CALL AccessibleTreeNode::containsPoint (const awt::Point& aPoint) +sal_Bool SAL_CALL AccessibleTreeNode::containsPoint (const awt::Point& aPoint) throw (RuntimeException) { ThrowIfDisposed(); @@ -434,7 +434,7 @@ sal_Bool SAL_CALL AccessibleTreeNode::containsPoint (const awt::Point& aPoint) Reference<XAccessible> SAL_CALL - AccessibleTreeNode::getAccessibleAtPoint (const awt::Point& aPoint) + AccessibleTreeNode::getAccessibleAtPoint (const awt::Point& aPoint) throw (RuntimeException) { ThrowIfDisposed(); @@ -459,7 +459,7 @@ Reference<XAccessible> SAL_CALL } } } - + return xChildAtPoint; } @@ -505,7 +505,7 @@ awt::Rectangle SAL_CALL AccessibleTreeNode::getBounds (void) -awt::Point SAL_CALL AccessibleTreeNode::getLocation (void) +awt::Point SAL_CALL AccessibleTreeNode::getLocation (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -519,7 +519,7 @@ awt::Point SAL_CALL AccessibleTreeNode::getLocation (void) /** Calculate the location on screen from the parent's location on screen and our own relative location. */ -awt::Point SAL_CALL AccessibleTreeNode::getLocationOnScreen() +awt::Point SAL_CALL AccessibleTreeNode::getLocationOnScreen() throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -540,7 +540,7 @@ awt::Point SAL_CALL AccessibleTreeNode::getLocationOnScreen() -awt::Size SAL_CALL AccessibleTreeNode::getSize (void) +awt::Size SAL_CALL AccessibleTreeNode::getSize (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -551,7 +551,7 @@ awt::Size SAL_CALL AccessibleTreeNode::getSize (void) -void SAL_CALL AccessibleTreeNode::grabFocus (void) +void SAL_CALL AccessibleTreeNode::grabFocus (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -576,7 +576,7 @@ sal_Int32 SAL_CALL AccessibleTreeNode::getForeground (void) -sal_Int32 SAL_CALL AccessibleTreeNode::getBackground (void) +sal_Int32 SAL_CALL AccessibleTreeNode::getBackground (void) throw (RuntimeException) { ThrowIfDisposed(); @@ -661,7 +661,7 @@ IMPL_LINK(AccessibleTreeNode, StateChangeListener, TreeNodeStateChangeEvent*, pE { OSL_ASSERT(pEvent!=NULL); OSL_ASSERT(&pEvent->mrSource==&mrTreeNode); - + switch(pEvent->meEventId) { case EID_CHILD_ADDED: @@ -672,11 +672,11 @@ IMPL_LINK(AccessibleTreeNode, StateChangeListener, TreeNodeStateChangeEvent*, pE else FireAccessibleEvent(AccessibleEventId::INVALIDATE_ALL_CHILDREN,Any(),Any()); break; - + case EID_ALL_CHILDREN_REMOVED: FireAccessibleEvent(AccessibleEventId::INVALIDATE_ALL_CHILDREN,Any(),Any()); break; - + case EID_EXPANSION_STATE_CHANGED: case EID_FOCUSED_STATE_CHANGED: case EID_SHOWING_STATE_CHANGED: @@ -710,7 +710,7 @@ IMPL_LINK(AccessibleTreeNode, WindowEventListener, VclWindowEvent*, pEvent) case VCLEVENT_WINDOW_RESIZE: FireAccessibleEvent(AccessibleEventId::BOUNDRECT_CHANGED,Any(),Any()); break; - + case VCLEVENT_WINDOW_GETFOCUS: case VCLEVENT_WINDOW_LOSEFOCUS: UpdateStateSet(); diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx index de5342afd23f..ae9ba66577fb 100755 --- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx +++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -163,7 +163,7 @@ Size AccessibleViewForwarder::PixelToLogic (const Size& rSize) const SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow((sal_uInt32)mnWindowId); OutputDevice& rOutDev = pPaintWindow->GetOutputDevice(); return rOutDev.PixelToLogic (rSize); - } + } else return Size(); } diff --git a/sd/source/ui/accessibility/SdShapeTypes.cxx b/sd/source/ui/accessibility/SdShapeTypes.cxx index 6bd859c570c4..84305e7e0b70 100644 --- a/sd/source/ui/accessibility/SdShapeTypes.cxx +++ b/sd/source/ui/accessibility/SdShapeTypes.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,59 +73,59 @@ AccessibleShape* ShapeTypeDescriptor aSdShapeTypeList[] = { - ShapeTypeDescriptor ( + ShapeTypeDescriptor ( PRESENTATION_OUTLINER, ::rtl::OUString::createFromAscii ("com.sun.star.presentation.OutlinerShape"), - CreateSdAccessibleShape ), - ShapeTypeDescriptor ( + CreateSdAccessibleShape ), + ShapeTypeDescriptor ( PRESENTATION_SUBTITLE, ::rtl::OUString::createFromAscii ("com.sun.star.presentation.SubtitleShape"), - CreateSdAccessibleShape ), - ShapeTypeDescriptor ( + CreateSdAccessibleShape ), + ShapeTypeDescriptor ( PRESENTATION_GRAPHIC_OBJECT, ::rtl::OUString::createFromAscii ("com.sun.star.presentation.GraphicObjectShape"), - CreateSdAccessibleShape ), - ShapeTypeDescriptor ( + CreateSdAccessibleShape ), + ShapeTypeDescriptor ( PRESENTATION_PAGE, ::rtl::OUString::createFromAscii ("com.sun.star.presentation.PageShape"), - CreateSdAccessibleShape ), - ShapeTypeDescriptor ( + CreateSdAccessibleShape ), + ShapeTypeDescriptor ( PRESENTATION_OLE, ::rtl::OUString::createFromAscii ("com.sun.star.presentation.OLE2Shape"), - CreateSdAccessibleShape ), - ShapeTypeDescriptor ( + CreateSdAccessibleShape ), + ShapeTypeDescriptor ( PRESENTATION_CHART, ::rtl::OUString::createFromAscii ("com.sun.star.presentation.ChartShape"), - CreateSdAccessibleShape ), - ShapeTypeDescriptor ( + CreateSdAccessibleShape ), + ShapeTypeDescriptor ( PRESENTATION_TABLE, ::rtl::OUString::createFromAscii ("com.sun.star.presentation.TableShape"), - CreateSdAccessibleShape ), - ShapeTypeDescriptor ( + CreateSdAccessibleShape ), + ShapeTypeDescriptor ( PRESENTATION_NOTES, ::rtl::OUString::createFromAscii ("com.sun.star.presentation.NotesShape"), - CreateSdAccessibleShape ), - ShapeTypeDescriptor ( + CreateSdAccessibleShape ), + ShapeTypeDescriptor ( PRESENTATION_TITLE, ::rtl::OUString::createFromAscii ("com.sun.star.presentation.TitleTextShape"), CreateSdAccessibleShape ), - ShapeTypeDescriptor ( + ShapeTypeDescriptor ( PRESENTATION_HANDOUT, ::rtl::OUString::createFromAscii ("com.sun.star.presentation.HandoutShape"), CreateSdAccessibleShape ), - ShapeTypeDescriptor ( + ShapeTypeDescriptor ( PRESENTATION_HEADER, ::rtl::OUString::createFromAscii ("com.sun.star.presentation.HeaderShape"), CreateSdAccessibleShape ), - ShapeTypeDescriptor ( + ShapeTypeDescriptor ( PRESENTATION_FOOTER, ::rtl::OUString::createFromAscii ("com.sun.star.presentation.FooterShape"), CreateSdAccessibleShape ), - ShapeTypeDescriptor ( + ShapeTypeDescriptor ( PRESENTATION_DATETIME, ::rtl::OUString::createFromAscii ("com.sun.star.presentation.DateTimeShape"), CreateSdAccessibleShape ), - ShapeTypeDescriptor ( + ShapeTypeDescriptor ( PRESENTATION_PAGENUMBER, ::rtl::OUString::createFromAscii ("com.sun.star.presentation.SlideNumberShape"), CreateSdAccessibleShape ) diff --git a/sd/source/ui/accessibility/accessibility.hrc b/sd/source/ui/accessibility/accessibility.hrc index e55c62abb0a4..fada64dab2fc 100644 --- a/sd/source/ui/accessibility/accessibility.hrc +++ b/sd/source/ui/accessibility/accessibility.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,21 +32,21 @@ #include <sfx2/sfx.hrc> #endif -#define SID_SD_A11Y_START (SID_SD_START+600) - -#define SID_SD_A11Y_D_DRAWVIEW_N (SID_SD_A11Y_START + 0) -#define SID_SD_A11Y_D_DRAWVIEW_D (SID_SD_A11Y_START + 1) - -#define SID_SD_A11Y_I_DRAWVIEW_N (SID_SD_A11Y_START + 2) -#define SID_SD_A11Y_I_DRAWVIEW_D (SID_SD_A11Y_START + 3) -#define SID_SD_A11Y_I_OUTLINEVIEW_N (SID_SD_A11Y_START + 4) -#define SID_SD_A11Y_I_OUTLINEVIEW_D (SID_SD_A11Y_START + 5) -#define SID_SD_A11Y_I_SLIDEVIEW_N (SID_SD_A11Y_START + 6) -#define SID_SD_A11Y_I_SLIDEVIEW_D (SID_SD_A11Y_START + 7) -#define SID_SD_A11Y_I_NOTESVIEW_N (SID_SD_A11Y_START + 8) -#define SID_SD_A11Y_I_NOTESVIEW_D (SID_SD_A11Y_START + 9) -#define SID_SD_A11Y_I_HANDOUTVIEW_N (SID_SD_A11Y_START + 10) -#define SID_SD_A11Y_I_HANDOUTVIEW_D (SID_SD_A11Y_START + 11) +#define SID_SD_A11Y_START (SID_SD_START+600) + +#define SID_SD_A11Y_D_DRAWVIEW_N (SID_SD_A11Y_START + 0) +#define SID_SD_A11Y_D_DRAWVIEW_D (SID_SD_A11Y_START + 1) + +#define SID_SD_A11Y_I_DRAWVIEW_N (SID_SD_A11Y_START + 2) +#define SID_SD_A11Y_I_DRAWVIEW_D (SID_SD_A11Y_START + 3) +#define SID_SD_A11Y_I_OUTLINEVIEW_N (SID_SD_A11Y_START + 4) +#define SID_SD_A11Y_I_OUTLINEVIEW_D (SID_SD_A11Y_START + 5) +#define SID_SD_A11Y_I_SLIDEVIEW_N (SID_SD_A11Y_START + 6) +#define SID_SD_A11Y_I_SLIDEVIEW_D (SID_SD_A11Y_START + 7) +#define SID_SD_A11Y_I_NOTESVIEW_N (SID_SD_A11Y_START + 8) +#define SID_SD_A11Y_I_NOTESVIEW_D (SID_SD_A11Y_START + 9) +#define SID_SD_A11Y_I_HANDOUTVIEW_N (SID_SD_A11Y_START + 10) +#define SID_SD_A11Y_I_HANDOUTVIEW_D (SID_SD_A11Y_START + 11) #endif /* _SD_ACCESSIBILITY_HRC */ diff --git a/sd/source/ui/accessibility/accessibility.src b/sd/source/ui/accessibility/accessibility.src index 663d75bd29ff..03d5db4e2db3 100644 --- a/sd/source/ui/accessibility/accessibility.src +++ b/sd/source/ui/accessibility/accessibility.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/animations/CustomAnimation.hrc b/sd/source/ui/animations/CustomAnimation.hrc index bfe4e1d9c6d4..6016a800acce 100644 --- a/sd/source/ui/animations/CustomAnimation.hrc +++ b/sd/source/ui/animations/CustomAnimation.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,111 +34,111 @@ // attention, we have 200 ids free after RID_CUSTOMANIMATION_START // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -#define DLG_CUSTOMANIMATIONPANE RID_CUSTOMANIMATION_START+0 -#define DLG_CUSTOMANIMATION RID_CUSTOMANIMATION_START+1 -#define DLG_CUSTOMANIMATION_CREATE RID_CUSTOMANIMATION_START+2 -#define DLG_SLIDE_TRANSITION_PANE RID_CUSTOMANIMATION_START+3 -#define DLG_CUSTOMANIMATION_SCHEMES_PANE RID_CUSTOMANIMATION_START+4 -#define DLG_ANIMATION_SCHEMES_PANE RID_CUSTOMANIMATION_START+5 +#define DLG_CUSTOMANIMATIONPANE RID_CUSTOMANIMATION_START+0 +#define DLG_CUSTOMANIMATION RID_CUSTOMANIMATION_START+1 +#define DLG_CUSTOMANIMATION_CREATE RID_CUSTOMANIMATION_START+2 +#define DLG_SLIDE_TRANSITION_PANE RID_CUSTOMANIMATION_START+3 +#define DLG_CUSTOMANIMATION_SCHEMES_PANE RID_CUSTOMANIMATION_START+4 +#define DLG_ANIMATION_SCHEMES_PANE RID_CUSTOMANIMATION_START+5 -#define RID_EFFECT_CONTEXTMENU RID_CUSTOMANIMATION_START+0 -#define RID_TP_CUSTOMANIMATION_EFFECT RID_CUSTOMANIMATION_START+1 -#define RID_TP_CUSTOMANIMATION_DURATION RID_CUSTOMANIMATION_START+2 -#define RID_TP_CUSTOMANIMATION_TEXT RID_CUSTOMANIMATION_START+3 -#define RID_TP_CUSTOMANIMATION_ENTRANCE RID_CUSTOMANIMATION_START+4 -#define RID_TP_CUSTOMANIMATION_EMPHASIS RID_CUSTOMANIMATION_START+5 -#define RID_TP_CUSTOMANIMATION_EXIT RID_CUSTOMANIMATION_START+6 -#define RID_TP_CUSTOMANIMATION_MOTIONPATH RID_CUSTOMANIMATION_START+7 -#define RID_TP_CUSTOMANIMATION_MISCEFFECTS RID_CUSTOMANIMATION_START+8 -#define RID_CUSTOMANIMATION_ROTATION_POPUP RID_CUSTOMANIMATION_START+9 -#define RID_CUSTOMANIMATION_FONTSIZE_POPUP RID_CUSTOMANIMATION_START+10 -#define RID_CUSTOMANIMATION_SCALE_POPUP RID_CUSTOMANIMATION_START+11 -#define RID_CUSTOMANIMATION_FONTSTYLE_POPUP RID_CUSTOMANIMATION_START+12 +#define RID_EFFECT_CONTEXTMENU RID_CUSTOMANIMATION_START+0 +#define RID_TP_CUSTOMANIMATION_EFFECT RID_CUSTOMANIMATION_START+1 +#define RID_TP_CUSTOMANIMATION_DURATION RID_CUSTOMANIMATION_START+2 +#define RID_TP_CUSTOMANIMATION_TEXT RID_CUSTOMANIMATION_START+3 +#define RID_TP_CUSTOMANIMATION_ENTRANCE RID_CUSTOMANIMATION_START+4 +#define RID_TP_CUSTOMANIMATION_EMPHASIS RID_CUSTOMANIMATION_START+5 +#define RID_TP_CUSTOMANIMATION_EXIT RID_CUSTOMANIMATION_START+6 +#define RID_TP_CUSTOMANIMATION_MOTIONPATH RID_CUSTOMANIMATION_START+7 +#define RID_TP_CUSTOMANIMATION_MISCEFFECTS RID_CUSTOMANIMATION_START+8 +#define RID_CUSTOMANIMATION_ROTATION_POPUP RID_CUSTOMANIMATION_START+9 +#define RID_CUSTOMANIMATION_FONTSIZE_POPUP RID_CUSTOMANIMATION_START+10 +#define RID_CUSTOMANIMATION_SCALE_POPUP RID_CUSTOMANIMATION_START+11 +#define RID_CUSTOMANIMATION_FONTSTYLE_POPUP RID_CUSTOMANIMATION_START+12 -#define IMG_CUSTOMANIMATION_ON_CLICK RID_CUSTOMANIMATION_START+0 -#define IMG_CUSTOMANIMATION_ON_CLICK_H RID_CUSTOMANIMATION_START+1 -#define IMG_CUSTOMANIMATION_AFTER_PREVIOUS RID_CUSTOMANIMATION_START+2 -#define IMG_CUSTOMANIMATION_AFTER_PREVIOUS_H RID_CUSTOMANIMATION_START+3 -#define IMG_CUSTOMANIMATION_ENTRANCE_EFFECT RID_CUSTOMANIMATION_START+4 -#define IMG_CUSTOMANIMATION_ENTRANCE_EFFECT_H RID_CUSTOMANIMATION_START+5 -#define IMG_CUSTOMANIMATION_EMPHASIS_EFFECT RID_CUSTOMANIMATION_START+6 -#define IMG_CUSTOMANIMATION_EMPHASIS_EFFECT_H RID_CUSTOMANIMATION_START+7 -#define IMG_CUSTOMANIMATION_EXIT_EFFECT RID_CUSTOMANIMATION_START+8 -#define IMG_CUSTOMANIMATION_EXIT_EFFECT_H RID_CUSTOMANIMATION_START+9 -#define IMG_CUSTOMANIMATION_MOTION_PATH RID_CUSTOMANIMATION_START+10 -#define IMG_CUSTOMANIMATION_MOTION_PATH_H RID_CUSTOMANIMATION_START+11 -#define IMG_CUSTOMANIMATION_OLE RID_CUSTOMANIMATION_START+12 -#define IMG_CUSTOMANIMATION_OLE_H RID_CUSTOMANIMATION_START+13 -#define IMG_CUSTOMANIMATION_MEDIA_PLAY RID_CUSTOMANIMATION_START+14 -#define IMG_CUSTOMANIMATION_MEDIA_PLAY_H RID_CUSTOMANIMATION_START+15 -#define IMG_CUSTOMANIMATION_MEDIA_PAUSE RID_CUSTOMANIMATION_START+16 -#define IMG_CUSTOMANIMATION_MEDIA_PAUSE_H RID_CUSTOMANIMATION_START+17 -#define IMG_CUSTOMANIMATION_MEDIA_STOP RID_CUSTOMANIMATION_START+18 -#define IMG_CUSTOMANIMATION_MEDIA_STOP_H RID_CUSTOMANIMATION_START+19 +#define IMG_CUSTOMANIMATION_ON_CLICK RID_CUSTOMANIMATION_START+0 +#define IMG_CUSTOMANIMATION_ON_CLICK_H RID_CUSTOMANIMATION_START+1 +#define IMG_CUSTOMANIMATION_AFTER_PREVIOUS RID_CUSTOMANIMATION_START+2 +#define IMG_CUSTOMANIMATION_AFTER_PREVIOUS_H RID_CUSTOMANIMATION_START+3 +#define IMG_CUSTOMANIMATION_ENTRANCE_EFFECT RID_CUSTOMANIMATION_START+4 +#define IMG_CUSTOMANIMATION_ENTRANCE_EFFECT_H RID_CUSTOMANIMATION_START+5 +#define IMG_CUSTOMANIMATION_EMPHASIS_EFFECT RID_CUSTOMANIMATION_START+6 +#define IMG_CUSTOMANIMATION_EMPHASIS_EFFECT_H RID_CUSTOMANIMATION_START+7 +#define IMG_CUSTOMANIMATION_EXIT_EFFECT RID_CUSTOMANIMATION_START+8 +#define IMG_CUSTOMANIMATION_EXIT_EFFECT_H RID_CUSTOMANIMATION_START+9 +#define IMG_CUSTOMANIMATION_MOTION_PATH RID_CUSTOMANIMATION_START+10 +#define IMG_CUSTOMANIMATION_MOTION_PATH_H RID_CUSTOMANIMATION_START+11 +#define IMG_CUSTOMANIMATION_OLE RID_CUSTOMANIMATION_START+12 +#define IMG_CUSTOMANIMATION_OLE_H RID_CUSTOMANIMATION_START+13 +#define IMG_CUSTOMANIMATION_MEDIA_PLAY RID_CUSTOMANIMATION_START+14 +#define IMG_CUSTOMANIMATION_MEDIA_PLAY_H RID_CUSTOMANIMATION_START+15 +#define IMG_CUSTOMANIMATION_MEDIA_PAUSE RID_CUSTOMANIMATION_START+16 +#define IMG_CUSTOMANIMATION_MEDIA_PAUSE_H RID_CUSTOMANIMATION_START+17 +#define IMG_CUSTOMANIMATION_MEDIA_STOP RID_CUSTOMANIMATION_START+18 +#define IMG_CUSTOMANIMATION_MEDIA_STOP_H RID_CUSTOMANIMATION_START+19 -#define STR_CUSTOMANIMATION_DURATION_VERY_SLOW RID_CUSTOMANIMATION_START+0 -#define STR_CUSTOMANIMATION_DURATION_SLOW RID_CUSTOMANIMATION_START+1 -#define STR_CUSTOMANIMATION_DURATION_NORMAL RID_CUSTOMANIMATION_START+2 -#define STR_CUSTOMANIMATION_DURATION_FAST RID_CUSTOMANIMATION_START+3 -#define STR_CUSTOMANIMATION_DURATION_VERY_FAST RID_CUSTOMANIMATION_START+4 -#define STR_CUSTOMANIMATION_REPEAT_NONE RID_CUSTOMANIMATION_START+5 -#define STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK RID_CUSTOMANIMATION_START+6 -#define STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE RID_CUSTOMANIMATION_START+7 -#define STR_CUSTOMANIMATION_DIRECTION_PROPERTY RID_CUSTOMANIMATION_START+8 -#define STR_CUSTOMANIMATION_ZOOM_PROPERTY RID_CUSTOMANIMATION_START+9 -#define STR_CUSTOMANIMATION_SPOKES_PROPERTY RID_CUSTOMANIMATION_START+10 -#define STR_CUSTOMANIMATION_FIRST_COLOR_PROPERTY RID_CUSTOMANIMATION_START+11 -#define STR_CUSTOMANIMATION_SECOND_COLOR_PROPERTY RID_CUSTOMANIMATION_START+12 -#define STR_CUSTOMANIMATION_FILL_COLOR_PROPERTY RID_CUSTOMANIMATION_START+13 -#define STR_CUSTOMANIMATION_STYLE_PROPERTY RID_CUSTOMANIMATION_START+14 -#define STR_CUSTOMANIMATION_FONT_PROPERTY RID_CUSTOMANIMATION_START+15 -#define STR_CUSTOMANIMATION_FONT_COLOR_PROPERTY RID_CUSTOMANIMATION_START+16 -#define STR_CUSTOMANIMATION_FONT_SIZE_STYLE_PROPERTY RID_CUSTOMANIMATION_START+17 -#define STR_CUSTOMANIMATION_FONT_STYLE_PROPERTY RID_CUSTOMANIMATION_START+18 -#define STR_CUSTOMANIMATION_LINE_COLOR_PROPERTY RID_CUSTOMANIMATION_START+19 -#define STR_CUSTOMANIMATION_SIZE_PROPERTY RID_CUSTOMANIMATION_START+20 -#define STR_CUSTOMANIMATION_AMOUNT_PROPERTY RID_CUSTOMANIMATION_START+21 -#define STR_CUSTOMANIMATION_COLOR_PROPERTY RID_CUSTOMANIMATION_START+22 -#define STR_CUSTOMANIMATION_NO_SOUND RID_CUSTOMANIMATION_START+23 -#define STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND RID_CUSTOMANIMATION_START+24 -#define STR_CUSTOMANIMATION_SCALE_PROPERTY RID_CUSTOMANIMATION_START+25 -#define STR_CUSTOMANIMATION_SAMPLE RID_CUSTOMANIMATION_START+26 -#define STR_CUSTOMANIMATION_BROWSE_SOUND RID_CUSTOMANIMATION_START+27 -#define STR_CUSTOMANIMATION_1_SPOKES RID_CUSTOMANIMATION_START+28 -#define STR_CUSTOMANIMATION_2_SPOKES RID_CUSTOMANIMATION_START+29 -#define STR_CUSTOMANIMATION_3_SPOKES RID_CUSTOMANIMATION_START+30 -#define STR_CUSTOMANIMATION_4_SPOKES RID_CUSTOMANIMATION_START+31 -#define STR_CUSTOMANIMATION_8_SPOKES RID_CUSTOMANIMATION_START+32 -#define STR_CUSTOMANIMATION_INSTANT RID_CUSTOMANIMATION_START+33 -#define STR_CUSTOMANIMATION_GRADUAL RID_CUSTOMANIMATION_START+34 -#define STR_CUSTOMANIMATION_TRIGGER RID_CUSTOMANIMATION_START+35 -#define STR_CUSTOMANIMATION_LIST_HELPTEXT RID_CUSTOMANIMATION_START+36 +#define STR_CUSTOMANIMATION_DURATION_VERY_SLOW RID_CUSTOMANIMATION_START+0 +#define STR_CUSTOMANIMATION_DURATION_SLOW RID_CUSTOMANIMATION_START+1 +#define STR_CUSTOMANIMATION_DURATION_NORMAL RID_CUSTOMANIMATION_START+2 +#define STR_CUSTOMANIMATION_DURATION_FAST RID_CUSTOMANIMATION_START+3 +#define STR_CUSTOMANIMATION_DURATION_VERY_FAST RID_CUSTOMANIMATION_START+4 +#define STR_CUSTOMANIMATION_REPEAT_NONE RID_CUSTOMANIMATION_START+5 +#define STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK RID_CUSTOMANIMATION_START+6 +#define STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE RID_CUSTOMANIMATION_START+7 +#define STR_CUSTOMANIMATION_DIRECTION_PROPERTY RID_CUSTOMANIMATION_START+8 +#define STR_CUSTOMANIMATION_ZOOM_PROPERTY RID_CUSTOMANIMATION_START+9 +#define STR_CUSTOMANIMATION_SPOKES_PROPERTY RID_CUSTOMANIMATION_START+10 +#define STR_CUSTOMANIMATION_FIRST_COLOR_PROPERTY RID_CUSTOMANIMATION_START+11 +#define STR_CUSTOMANIMATION_SECOND_COLOR_PROPERTY RID_CUSTOMANIMATION_START+12 +#define STR_CUSTOMANIMATION_FILL_COLOR_PROPERTY RID_CUSTOMANIMATION_START+13 +#define STR_CUSTOMANIMATION_STYLE_PROPERTY RID_CUSTOMANIMATION_START+14 +#define STR_CUSTOMANIMATION_FONT_PROPERTY RID_CUSTOMANIMATION_START+15 +#define STR_CUSTOMANIMATION_FONT_COLOR_PROPERTY RID_CUSTOMANIMATION_START+16 +#define STR_CUSTOMANIMATION_FONT_SIZE_STYLE_PROPERTY RID_CUSTOMANIMATION_START+17 +#define STR_CUSTOMANIMATION_FONT_STYLE_PROPERTY RID_CUSTOMANIMATION_START+18 +#define STR_CUSTOMANIMATION_LINE_COLOR_PROPERTY RID_CUSTOMANIMATION_START+19 +#define STR_CUSTOMANIMATION_SIZE_PROPERTY RID_CUSTOMANIMATION_START+20 +#define STR_CUSTOMANIMATION_AMOUNT_PROPERTY RID_CUSTOMANIMATION_START+21 +#define STR_CUSTOMANIMATION_COLOR_PROPERTY RID_CUSTOMANIMATION_START+22 +#define STR_CUSTOMANIMATION_NO_SOUND RID_CUSTOMANIMATION_START+23 +#define STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND RID_CUSTOMANIMATION_START+24 +#define STR_CUSTOMANIMATION_SCALE_PROPERTY RID_CUSTOMANIMATION_START+25 +#define STR_CUSTOMANIMATION_SAMPLE RID_CUSTOMANIMATION_START+26 +#define STR_CUSTOMANIMATION_BROWSE_SOUND RID_CUSTOMANIMATION_START+27 +#define STR_CUSTOMANIMATION_1_SPOKES RID_CUSTOMANIMATION_START+28 +#define STR_CUSTOMANIMATION_2_SPOKES RID_CUSTOMANIMATION_START+29 +#define STR_CUSTOMANIMATION_3_SPOKES RID_CUSTOMANIMATION_START+30 +#define STR_CUSTOMANIMATION_4_SPOKES RID_CUSTOMANIMATION_START+31 +#define STR_CUSTOMANIMATION_8_SPOKES RID_CUSTOMANIMATION_START+32 +#define STR_CUSTOMANIMATION_INSTANT RID_CUSTOMANIMATION_START+33 +#define STR_CUSTOMANIMATION_GRADUAL RID_CUSTOMANIMATION_START+34 +#define STR_CUSTOMANIMATION_TRIGGER RID_CUSTOMANIMATION_START+35 +#define STR_CUSTOMANIMATION_LIST_HELPTEXT RID_CUSTOMANIMATION_START+36 -#define CM_WITH_CLICK 1 -#define CM_WITH_PREVIOUS 2 -#define CM_AFTER_PREVIOUS 3 -#define CM_OPTIONS 4 -#define CM_DURATION 5 -#define CM_REMOVE 6 -#define CM_CREATE 7 +#define CM_WITH_CLICK 1 +#define CM_WITH_PREVIOUS 2 +#define CM_AFTER_PREVIOUS 3 +#define CM_OPTIONS 4 +#define CM_DURATION 5 +#define CM_REMOVE 6 +#define CM_CREATE 7 -#define CM_QUARTER_SPIN 1 -#define CM_HALF_SPIN 2 -#define CM_FULL_SPIN 3 -#define CM_TWO_SPINS 4 -#define CM_CLOCKWISE 5 -#define CM_COUNTERCLOCKWISE 6 +#define CM_QUARTER_SPIN 1 +#define CM_HALF_SPIN 2 +#define CM_FULL_SPIN 3 +#define CM_TWO_SPINS 4 +#define CM_CLOCKWISE 5 +#define CM_COUNTERCLOCKWISE 6 -#define CM_SIZE_25 25 -#define CM_SIZE_50 50 -#define CM_SIZE_150 150 -#define CM_SIZE_400 400 -#define CM_HORIZONTAL 1 -#define CM_VERTICAL 2 -#define CM_BOTH 3 +#define CM_SIZE_25 25 +#define CM_SIZE_50 50 +#define CM_SIZE_150 150 +#define CM_SIZE_400 400 +#define CM_HORIZONTAL 1 +#define CM_VERTICAL 2 +#define CM_BOTH 3 -#define CM_BOLD 1 -#define CM_ITALIC 2 -#define CM_UNDERLINED 3 +#define CM_BOLD 1 +#define CM_ITALIC 2 +#define CM_UNDERLINED 3 #endif // _SD_CUSTOMANIMATION_HRC diff --git a/sd/source/ui/animations/CustomAnimation.src b/sd/source/ui/animations/CustomAnimation.src index 449107f05c75..adc0c2be996c 100644 --- a/sd/source/ui/animations/CustomAnimation.src +++ b/sd/source/ui/animations/CustomAnimation.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ Menu RID_EFFECT_CONTEXTMENU { Identifier = CM_REMOVE; Text [ en-US ] = "~Remove" ; - }; + }; }; }; @@ -81,17 +81,17 @@ Menu RID_CUSTOMANIMATION_FONTSIZE_POPUP { Identifier = CM_SIZE_50 ; Text [ en-US ] = "Smaller" ; - }; + }; MenuItem { Identifier = CM_SIZE_150 ; Text [ en-US ] = "Larger" ; - }; + }; MenuItem { Identifier = CM_SIZE_400 ; Text [ en-US ] = "Extra large" ; - }; + }; }; }; @@ -108,12 +108,12 @@ Menu RID_CUSTOMANIMATION_SCALE_POPUP { Identifier = CM_SIZE_50 ; Text [ en-US ] = "Smaller" ; - }; + }; MenuItem { Identifier = CM_SIZE_150 ; Text [ en-US ] = "Larger" ; - }; + }; MenuItem { Identifier = CM_SIZE_400 ; @@ -122,7 +122,7 @@ Menu RID_CUSTOMANIMATION_SCALE_POPUP MenuItem { Separator = TRUE ; - }; + }; MenuItem { Identifier = CM_HORIZONTAL ; @@ -143,7 +143,7 @@ Menu RID_CUSTOMANIMATION_SCALE_POPUP }; }; }; - + Menu RID_CUSTOMANIMATION_ROTATION_POPUP { ItemList = @@ -181,7 +181,7 @@ Menu RID_CUSTOMANIMATION_ROTATION_POPUP { Identifier = CM_COUNTERCLOCKWISE; Text [ en-US ] = "Counter-clockwise" ; - }; + }; }; }; diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index f76b84d29826..6d0d1d4010e4 100755 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,16 +97,16 @@ public: virtual void MouseButtonUp( const MouseEvent& rMEvt ); - USHORT InsertCategory( const XubString& rStr, USHORT nPos = LISTBOX_APPEND ); + USHORT InsertCategory( const XubString& rStr, USHORT nPos = LISTBOX_APPEND ); - void SetDoubleClickLink( const Link& rDoubleClickHdl ) { maDoubleClickHdl = rDoubleClickHdl; } + void SetDoubleClickLink( const Link& rDoubleClickHdl ) { maDoubleClickHdl = rDoubleClickHdl; } DECL_LINK( implDoubleClickHdl, Control* ); private: - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ); - Link maDoubleClickHdl; + Link maDoubleClickHdl; }; CategoryListBox::CategoryListBox( Window* pParent, const ResId& rResId ) @@ -212,12 +212,12 @@ private: void clearEffects(); private: - CategoryListBox* mpLBEffects; - FixedText* mpFTSpeed; - ComboBox* mpCBSpeed; - CheckBox* mpCBXPReview; + CategoryListBox* mpLBEffects; + FixedText* mpFTSpeed; + ComboBox* mpCBSpeed; + CheckBox* mpCBXPReview; - CustomAnimationCreateDialog* mpParent; + CustomAnimationCreateDialog* mpParent; USHORT mnCurvePathPos; USHORT mnPolygonPathPos; @@ -518,10 +518,10 @@ bool CustomAnimationCreateTabPage::select( const OUString& rsPresetId ) // -------------------------------------------------------------------- CustomAnimationCreateDialog::CustomAnimationCreateDialog( Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const ::rtl::OUString& rsPresetId, double fDuration ) -: TabDialog( pParent, SdResId( DLG_CUSTOMANIMATION_CREATE ) ) -, mpPane( pPane ) -, mrTargets( rTargets ) -, mfDuration( fDuration ) +: TabDialog( pParent, SdResId( DLG_CUSTOMANIMATION_CREATE ) ) +, mpPane( pPane ) +, mrTargets( rTargets ) +, mfDuration( fDuration ) { mpTabControl = new TabControl( this, SdResId( 1 ) ); mpOKButton = new OKButton(this, SdResId( 1 ) ) ; @@ -595,9 +595,9 @@ CustomAnimationCreateTabPage* CustomAnimationCreateDialog::getCurrentPage() cons { switch( mpTabControl->GetCurPageId() ) { - case RID_TP_CUSTOMANIMATION_ENTRANCE: return mpTabPages[ENTRANCE]; - case RID_TP_CUSTOMANIMATION_EMPHASIS: return mpTabPages[EMPHASIS]; - case RID_TP_CUSTOMANIMATION_EXIT: return mpTabPages[EXIT]; + case RID_TP_CUSTOMANIMATION_ENTRANCE: return mpTabPages[ENTRANCE]; + case RID_TP_CUSTOMANIMATION_EMPHASIS: return mpTabPages[EMPHASIS]; + case RID_TP_CUSTOMANIMATION_EXIT: return mpTabPages[EXIT]; case RID_TP_CUSTOMANIMATION_MISCEFFECTS:return mpTabPages[MISCEFFECTS]; //case RID_TP_CUSTOMANIMATION_MOTIONPATH: default: diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.hrc b/sd/source/ui/animations/CustomAnimationCreateDialog.hrc index 0bc4ff2535d5..7218f5203e28 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.hrc +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,10 +29,10 @@ #define _SD_CUSTOMANIMATIONCREATEDIALOG_HRC // TabPage RID_TP_CUSTOMANIMATION_ENTRANCE -#define LB_EFFECTS 1 -#define FT_SPEED 2 -#define CB_SPEED 3 -#define CBX_PREVIEW 4 -#define STR_USERPATH 5 +#define LB_EFFECTS 1 +#define FT_SPEED 2 +#define CB_SPEED 3 +#define CBX_PREVIEW 4 +#define STR_USERPATH 5 #endif // _SD_CUSTOMANIMATIONCREATEDIALOG_HRC diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx index 48b87045b70f..b129ec0eac0f 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.src b/sd/source/ui/animations/CustomAnimationCreateDialog.src index 0f83818fafb3..162a1d6d4fe6 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.src +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ TabDialog DLG_CUSTOMANIMATION_CREATE SVLook = TRUE ; Moveable = TRUE ; Closeable = TRUE ; - + Text [ en-US ] = "Custom Animation" ; TabControl 1 @@ -100,7 +100,7 @@ TabPage RID_TP_CUSTOMANIMATION_ENTRANCE { Hide = TRUE; Size = MAP_APPFONT ( 156, 217 ); - + ListBox LB_EFFECTS { Pos = MAP_APPFONT ( 3 , 3 ) ; @@ -135,7 +135,7 @@ TabPage RID_TP_CUSTOMANIMATION_ENTRANCE TabStop = TRUE ; Text [ en-US ] = "Automatic preview" ; }; - + String STR_USERPATH { Text [ en-US ] = "User paths"; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 7f942562b951..f81225390126 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -404,7 +404,7 @@ private: // -------------------------------------------------------------------- DropdownMenuBox::DropdownMenuBox( Window* pParent, Edit* pSubControl, PopupMenu* pMenu ) -: Edit( pParent, WB_BORDER|WB_TABSTOP| WB_DIALOGCONTROL ), +: Edit( pParent, WB_BORDER|WB_TABSTOP| WB_DIALOGCONTROL ), mpSubControl(pSubControl),mpDropdownButton(0),mpMenu(pMenu) { mpDropdownButton = new MenuButton( this, WB_NOLIGHTBORDER | WB_RECTSTYLE | WB_NOTABSTOP); @@ -1160,38 +1160,38 @@ private: sal_Bool mbHasText; const STLPropertySet* mpSet; - FixedLine* mpFLSettings; - FixedText* mpFTProperty1; + FixedLine* mpFLSettings; + FixedText* mpFTProperty1; PropertyControl* mpLBProperty1; - FixedText* mpFTProperty2; + FixedText* mpFTProperty2; PropertyControl* mpLBProperty2; - CheckBox* mpCBSmoothStart; - CheckBox* mpCBSmoothEnd; - CheckBox* mpCBAutoRestart; - - FixedLine* mpFLPlay; - RadioButton* mpRBFromStart; - RadioButton* mpRBFromLast; - RadioButton* mpRBFromTime; - MetricField* mpMFStartTime; - FixedLine* mpFLStop; - RadioButton* mpRBStopOnClick; - RadioButton* mpRBStopOnNextSlide; - RadioButton* mpRBStopAfterSlides; - MetricField* mpMFStopAfterSlides; - - FixedLine* mpFLEnhancements; - FixedText* mpFTSound; - ListBox* mpLBSound; - PushButton* mpPBSoundPreview; - FixedText* mpFTAfterEffect; - ListBox* mpLBAfterEffect; - FixedText* mpFTDimColor; - ColorListBox* mpCLBDimColor; - FixedText* mpFTTextAnim; - ListBox* mpLBTextAnim; - MetricField* mpMFTextDelay; - FixedText* mpFTTextDelay; + CheckBox* mpCBSmoothStart; + CheckBox* mpCBSmoothEnd; + CheckBox* mpCBAutoRestart; + + FixedLine* mpFLPlay; + RadioButton* mpRBFromStart; + RadioButton* mpRBFromLast; + RadioButton* mpRBFromTime; + MetricField* mpMFStartTime; + FixedLine* mpFLStop; + RadioButton* mpRBStopOnClick; + RadioButton* mpRBStopOnNextSlide; + RadioButton* mpRBStopAfterSlides; + MetricField* mpMFStopAfterSlides; + + FixedLine* mpFLEnhancements; + FixedText* mpFTSound; + ListBox* mpLBSound; + PushButton* mpPBSoundPreview; + FixedText* mpFTAfterEffect; + ListBox* mpLBAfterEffect; + FixedText* mpFTDimColor; + ColorListBox* mpCLBDimColor; + FixedText* mpFTTextAnim; + ListBox* mpLBTextAnim; + MetricField* mpMFTextDelay; + FixedText* mpFTTextDelay; ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer; }; @@ -1445,9 +1445,9 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con pSet->getPropertyValue( nHandleIterateType ) >>= nIterateType; switch( nIterateType ) { - case TextAnimationType::BY_PARAGRAPH: nPos = 0; break; - case TextAnimationType::BY_WORD: nPos = 1; break; - case TextAnimationType::BY_LETTER: nPos = 2; break; + case TextAnimationType::BY_PARAGRAPH: nPos = 0; break; + case TextAnimationType::BY_WORD: nPos = 1; break; + case TextAnimationType::BY_LETTER: nPos = 2; break; } mpLBTextAnim->SelectEntryPos( nPos ); @@ -1800,7 +1800,7 @@ sal_Int32 CustomAnimationEffectTabPage::getSoundObject( const String& rStr ) void CustomAnimationEffectTabPage::openSoundFileDialog() { - SdOpenSoundFileDialog aFileDialog; + SdOpenSoundFileDialog aFileDialog; String aFile( SvtPathOptions().GetGraphicPath() ); aFileDialog.SetPath( aFile ); @@ -1931,8 +1931,8 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent, USHORT nPos = 0; switch( nStart ) { - case EffectNodeType::WITH_PREVIOUS: nPos = 1; break; - case EffectNodeType::AFTER_PREVIOUS: nPos = 2; break; + case EffectNodeType::WITH_PREVIOUS: nPos = 1; break; + case EffectNodeType::AFTER_PREVIOUS: nPos = 2; break; } mpLBStart->SelectEntryPos( nPos ); } @@ -2260,12 +2260,12 @@ public: DECL_LINK( implSelectHdl, Control* ); private: - FixedText maFTGroupText; - ListBox maLBGroupText; - CheckBox maCBXGroupAuto; - MetricField maMFGroupAuto; - CheckBox maCBXAnimateForm; - CheckBox maCBXReverse; + FixedText maFTGroupText; + ListBox maLBGroupText; + CheckBox maCBXGroupAuto; + MetricField maMFGroupAuto; + CheckBox maCBXAnimateForm; + CheckBox maCBXReverse; const STLPropertySet* mpSet; @@ -2273,7 +2273,7 @@ private: }; CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent, const ResId& rResId, const STLPropertySet* pSet) -: TabPage( pParent, rResId ), +: TabPage( pParent, rResId ), maFTGroupText( this, SdResId( FT_GROUP_TEXT ) ), maLBGroupText( this, SdResId( LB_GROUP_TEXT ) ), maCBXGroupAuto( this, SdResId( CBX_GROUP_AUTO ) ), diff --git a/sd/source/ui/animations/CustomAnimationDialog.hrc b/sd/source/ui/animations/CustomAnimationDialog.hrc index a7895543304b..34ee796562d0 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.hrc +++ b/sd/source/ui/animations/CustomAnimationDialog.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,61 +29,61 @@ #define _SD_CUSTOMANIMATIONDIALOG_HRC // TabPage RID_TP_CUSTOMANIMATION_EFFECT -#define FL_SETTINGS 1 -#define FT_PROPERTY_1 2 -#define LB_PROPERTY_1 3 -#define FT_PROPERTY_2 4 -#define LB_PROPERTY_2 5 -#define CB_SMOOTH_START 6 -#define CB_SMOOTH_END 7 -#define CB_AUTORESTART 8 -#define FL_ENHANCEMENTS 9 -#define FT_SOUND 10 -#define LB_SOUND 11 -#define PB_SOUND_PREVIEW 12 -#define FT_AFTER_EFFECT 13 -#define LB_AFTER_EFFECT 14 -#define FT_DIMCOLOR 15 -#define CLB_DIMCOLOR 16 -#define FT_TEXT_ANIM 17 -#define LB_TEXT_ANIM 18 -#define MF_TEXT_DELAY 19 -#define FT_TEXT_DELAY 20 -#define FL_PLAY 21 -#define RB_FROM_START 22 -#define RB_FROM_LAST 23 -#define RB_FROM_TIME 24 -#define MF_START_TIME 25 -#define FL_STOP 26 -#define RB_STOP_ON_CLICK 27 -#define RB_STOP_ON_NEXT_SLIDE 28 -#define RB_STOP_AFTER_N_SLIDES 29 -#define MF_STOP_AFTER_SLIDES 30 -#define TP_CUSTOMANIMATION_EFFECT_COUNT 31 +#define FL_SETTINGS 1 +#define FT_PROPERTY_1 2 +#define LB_PROPERTY_1 3 +#define FT_PROPERTY_2 4 +#define LB_PROPERTY_2 5 +#define CB_SMOOTH_START 6 +#define CB_SMOOTH_END 7 +#define CB_AUTORESTART 8 +#define FL_ENHANCEMENTS 9 +#define FT_SOUND 10 +#define LB_SOUND 11 +#define PB_SOUND_PREVIEW 12 +#define FT_AFTER_EFFECT 13 +#define LB_AFTER_EFFECT 14 +#define FT_DIMCOLOR 15 +#define CLB_DIMCOLOR 16 +#define FT_TEXT_ANIM 17 +#define LB_TEXT_ANIM 18 +#define MF_TEXT_DELAY 19 +#define FT_TEXT_DELAY 20 +#define FL_PLAY 21 +#define RB_FROM_START 22 +#define RB_FROM_LAST 23 +#define RB_FROM_TIME 24 +#define MF_START_TIME 25 +#define FL_STOP 26 +#define RB_STOP_ON_CLICK 27 +#define RB_STOP_ON_NEXT_SLIDE 28 +#define RB_STOP_AFTER_N_SLIDES 29 +#define MF_STOP_AFTER_SLIDES 30 +#define TP_CUSTOMANIMATION_EFFECT_COUNT 31 // TabPage RID_TP_CUSTOMANIMATION_DURATION -#define FT_START 1 -#define LB_START 2 -#define FT_START_DELAY 3 -#define MF_START_DELAY 4 -#define FT_DURATION 5 -#define CB_DURATION 6 -#define FT_REPEAT 7 -#define CB_REPEAT 8 -#define CBX_REWIND 9 -#define FL_TRIGGER 10 -#define RB_CLICKSEQUENCE 11 -#define RB_INTERACTIVE 12 -#define LB_TRIGGER 13 +#define FT_START 1 +#define LB_START 2 +#define FT_START_DELAY 3 +#define MF_START_DELAY 4 +#define FT_DURATION 5 +#define CB_DURATION 6 +#define FT_REPEAT 7 +#define CB_REPEAT 8 +#define CBX_REWIND 9 +#define FL_TRIGGER 10 +#define RB_CLICKSEQUENCE 11 +#define RB_INTERACTIVE 12 +#define LB_TRIGGER 13 #define TP_CUSTOMANIMATION_DURATION_COUNT 13 // TabPage RID_TP_CUSTOMANIMATION_TEXT -#define FT_GROUP_TEXT 1 -#define LB_GROUP_TEXT 2 -#define CBX_GROUP_AUTO 3 -#define MF_GROUP_AUTO 4 -#define CBX_ANIMATE_FORM 5 -#define CBX_REVERSE 6 +#define FT_GROUP_TEXT 1 +#define LB_GROUP_TEXT 2 +#define CBX_GROUP_AUTO 3 +#define MF_GROUP_AUTO 4 +#define CBX_ANIMATE_FORM 5 +#define CBX_REVERSE 6 #define TP_CUSTOMANIMATION_TEXT_COUNT 6 #endif // _SD_CUSTOMANIMATIONDIALOG_HRC diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx index e732f4a0e731..84a28bc52943 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationDialog.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -111,15 +111,15 @@ class PropertySubControl { public: PropertySubControl( sal_Int32 nType ) : mnType( nType ) {} - virtual ~PropertySubControl(); + virtual ~PropertySubControl(); - virtual ::com::sun::star::uno::Any getValue() = 0; - virtual void setValue( const ::com::sun::star::uno::Any& rValue, const rtl::OUString& rPresetId ) = 0; + virtual ::com::sun::star::uno::Any getValue() = 0; + virtual void setValue( const ::com::sun::star::uno::Any& rValue, const rtl::OUString& rPresetId ) = 0; - virtual Control* getControl() = 0; + virtual Control* getControl() = 0; - static PropertySubControl* - create( sal_Int32 nType, + static PropertySubControl* + create( sal_Int32 nType, ::Window* pParent, const ::com::sun::star::uno::Any& rValue, const rtl::OUString& rPresetId, @@ -128,14 +128,14 @@ public: sal_Int32 getControlType() const { return mnType; } protected: - sal_Int32 mnType; + sal_Int32 mnType; }; // -------------------------------------------------------------------- class PropertyControl : public ListBox { -public: +public: PropertyControl( Window* pParent, const ResId& rResId ); ~PropertyControl(); diff --git a/sd/source/ui/animations/CustomAnimationDialog.src b/sd/source/ui/animations/CustomAnimationDialog.src index 8232638678e1..594bb7f2dea3 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.src +++ b/sd/source/ui/animations/CustomAnimationDialog.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,7 +99,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT Hide = TRUE; Size = MAP_APPFONT ( WIDTH , 159 ); Text [ en-US ] = "Effect"; - + FixedLine FL_SETTINGS { OutputSize = TRUE; @@ -109,7 +109,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT Text [ en-US ] = "Settings"; }; - + FixedText FT_PROPERTY_1 { OutputSize = TRUE; @@ -146,7 +146,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT Border = TRUE ; DropDown = TRUE ; }; - + CheckBox CB_SMOOTH_START { Pos = MAP_APPFONT( X1+6, 14 ); @@ -157,14 +157,14 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT }; CheckBox CB_SMOOTH_END - { + { Pos = MAP_APPFONT( X1 + (W0 / 2) + 3, 14 ); Size = MAP_APPFONT ( (W0 / 2) , 10 ) ; Hide = TRUE; Text [ en-US ] = "Decelerated end"; }; - + CheckBox CB_AUTORESTART { Pos = MAP_APPFONT( X1+6, 14 ); @@ -177,7 +177,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT // // controls for playback command // -/* +/* FixedLine FL_PLAY { OutputSize = TRUE; @@ -187,7 +187,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT Text [ en-US ] = "Play"; }; - + RadioButton RB_FROM_START { OutputSize = TRUE; @@ -195,10 +195,10 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT Size = MAP_APPFONT( W0, 10 ); TabStop = TRUE ; Hide = TRUE; - + Text [ en-US ] = "From start"; }; - + RadioButton RB_FROM_LAST { OutputSize = TRUE; @@ -209,7 +209,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT Text [en-US ] = "From last"; }; - + RadioButton RB_FROM_TIME { OutputSize = TRUE; @@ -220,7 +220,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT Text [ en-US ] = "From time:"; }; - + MetricField MF_START_TIME { OutputSize = TRUE; @@ -250,7 +250,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT Text [ en-US ] = "Stop playback"; }; - + RadioButton RB_STOP_ON_CLICK { OutputSize = TRUE; @@ -261,7 +261,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT Text [ en-US ] = "On click"; }; - + RadioButton RB_STOP_ON_NEXT_SLIDE { OutputSize = TRUE; @@ -272,7 +272,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT Text [ en-US ] = "After current slide"; }; - + RadioButton RB_STOP_AFTER_N_SLIDES { OutputSize = TRUE; @@ -283,7 +283,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT Text [ en-US ] = "After"; }; - + MetricField MF_STOP_AFTER_SLIDES { OutputSize = TRUE; @@ -314,10 +314,10 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT Pos = MAP_APPFONT ( X0 , 3 ) ; Size = MAP_APPFONT( W0, 8 ); Hide = TRUE; - + Text [ en-US ] = "Enhancement"; }; - + FixedText FT_SOUND { OutputSize = TRUE; @@ -335,13 +335,13 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT Border = TRUE ; DropDown = TRUE ; }; - + PushButton PB_SOUND_PREVIEW { Pos = MAP_APPFONT ( X2 + W2 - 16 , 2 ) ; Size = MAP_APPFONT( 16, 14 ); OutputSize = TRUE; - TabStop = TRUE; + TabStop = TRUE; }; FixedText FT_AFTER_EFFECT @@ -360,30 +360,30 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT TabStop = TRUE ; Border = TRUE ; DropDown = TRUE ; - + StringList [ en-US ] = { < "Don't dim" ; > ; < "Dim with color" ; > ; < "Hide after animation" ; > ; < "Hide on next animation" ; > ; - }; + }; }; - + FixedText FT_DIMCOLOR { Pos = MAP_APPFONT( X1, 35 ); Size = MAP_APPFONT( W1, 8 ); Text [ en-US ] = "Dim Color"; }; - + ListBox CLB_DIMCOLOR { Pos = MAP_APPFONT( X2, 33 ); Size = MAP_APPFONT ( W2, 100 ); TabStop = TRUE ; Border = TRUE ; - DropDown = TRUE ; + DropDown = TRUE ; }; FixedText FT_TEXT_ANIM @@ -408,7 +408,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT < "All at once" ; > ; < "Word by word" ; > ; < "Letter by letter" ; > ; - }; + }; }; FixedText FT_TEXT_DELAY @@ -434,7 +434,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT Unit = FUNIT_CUSTOM ; CustomUnitText [ en-US ] = "%"; SpinSize = 1 ; - + }; }; @@ -443,7 +443,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION Hide = TRUE; Size = MAP_APPFONT ( WIDTH , 159 ); Text [ en-US ] = "Timing"; - + FixedText FT_START { OutputSize = TRUE; @@ -468,7 +468,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION < "After previous" ; > ; }; }; - + FixedText FT_START_DELAY { OutputSize = TRUE; @@ -477,7 +477,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION Text [ en-US ] = "Delay"; }; - + MetricField MF_START_DELAY { Pos = MAP_APPFONT ( X2 , 18 ) ; @@ -530,7 +530,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION Border = TRUE ; DropDown = TRUE ; }; - + CheckBox CBX_REWIND { Pos = MAP_APPFONT ( X0 , 66 ) ; @@ -538,16 +538,16 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION TabStop = TRUE ; Text [ en-US ] = "Rewind when done playing" ; }; - + FixedLine FL_TRIGGER { OutputSize = TRUE; Pos = MAP_APPFONT ( X0 , 79 ) ; Size = MAP_APPFONT( W0, 8 ); - + Text [ en-US ] = "Trigger"; }; - + RadioButton RB_CLICKSEQUENCE { Pos = MAP_APPFONT ( X1+6, 92 ) ; @@ -563,7 +563,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION Text [ en-US ] = "Start effect on click of" ; TabStop = TRUE ; }; - + ListBox LB_TRIGGER { Pos = MAP_APPFONT ( X1+18 , 118 ); @@ -579,7 +579,7 @@ TabPage RID_TP_CUSTOMANIMATION_TEXT Hide = TRUE; Size = MAP_APPFONT ( WIDTH , 159 ); Text [ en-US ] = "Text Animation"; - + FixedText FT_GROUP_TEXT { OutputSize = TRUE; @@ -596,7 +596,7 @@ TabPage RID_TP_CUSTOMANIMATION_TEXT TabStop = TRUE ; Border = TRUE ; DropDown = TRUE ; - + StringList [ en-US ] = { < "As one object" ; > ; @@ -606,9 +606,9 @@ TabPage RID_TP_CUSTOMANIMATION_TEXT < "By 3rd level paragraphs" ; > ; < "By 4th level paragraphs" ; > ; < "By 5th level paragraphs" ; > ; - }; + }; }; - + Checkbox CBX_GROUP_AUTO { Pos = MAP_APPFONT ( X0 , 20 ) ; @@ -616,8 +616,8 @@ TabPage RID_TP_CUSTOMANIMATION_TEXT TabStop = TRUE ; Text [ en-US ] = "Automatically after" ; }; - - + + MetricField MF_GROUP_AUTO { Pos = MAP_APPFONT ( X2 , 18 ) ; @@ -642,7 +642,7 @@ TabPage RID_TP_CUSTOMANIMATION_TEXT TabStop = TRUE ; Text [ en-US ] = "Animate attached shape" ; }; - + Checkbox CBX_REVERSE { Pos = MAP_APPFONT ( X0 , 46 ) ; diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 7c07ec76127a..6e714cbfbb18 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -193,7 +193,7 @@ static OUString getDescription( const Any& rTarget, bool bWithText = true ) { Reference< XTextRange > xParagraph; xEnumeration->nextElement() >>= xParagraph; - + if( xParagraph.is() ) aDescription = xParagraph->getString(); } @@ -215,15 +215,15 @@ class CustomAnimationListEntryItem : public SvLBoxString { public: CustomAnimationListEntryItem( SvLBoxEntry*,USHORT nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent ); - virtual ~CustomAnimationListEntryItem(); - void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* ); - void Paint( const Point&, SvLBox& rDev, USHORT nFlags,SvLBoxEntry* ); - SvLBoxItem* Create() const; - void Clone( SvLBoxItem* pSource ); + virtual ~CustomAnimationListEntryItem(); + void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* ); + void Paint( const Point&, SvLBox& rDev, USHORT nFlags,SvLBoxEntry* ); + SvLBoxItem* Create() const; + void Clone( SvLBoxItem* pSource ); private: CustomAnimationList* mpParent; - OUString maDescription; + OUString maDescription; CustomAnimationEffectPtr mpEffect; }; @@ -282,21 +282,21 @@ void CustomAnimationListEntryItem::Paint( const Point& rPos, SvLBox& rDev, USHOR USHORT nImage; switch( mpEffect->getPresetClass() ) { - case EffectPresetClass::ENTRANCE: nImage = IMG_CUSTOMANIMATION_ENTRANCE_EFFECT; break; - case EffectPresetClass::EXIT: nImage = IMG_CUSTOMANIMATION_EXIT_EFFECT; break; - case EffectPresetClass::EMPHASIS: nImage = IMG_CUSTOMANIMATION_EMPHASIS_EFFECT; break; + case EffectPresetClass::ENTRANCE: nImage = IMG_CUSTOMANIMATION_ENTRANCE_EFFECT; break; + case EffectPresetClass::EXIT: nImage = IMG_CUSTOMANIMATION_EXIT_EFFECT; break; + case EffectPresetClass::EMPHASIS: nImage = IMG_CUSTOMANIMATION_EMPHASIS_EFFECT; break; case EffectPresetClass::MOTIONPATH: nImage = IMG_CUSTOMANIMATION_MOTION_PATH; break; - case EffectPresetClass::OLEACTION: nImage = IMG_CUSTOMANIMATION_OLE; break; + case EffectPresetClass::OLEACTION: nImage = IMG_CUSTOMANIMATION_OLE; break; case EffectPresetClass::MEDIACALL: switch( mpEffect->getCommand() ) { - case EffectCommands::TOGGLEPAUSE: nImage = IMG_CUSTOMANIMATION_MEDIA_PAUSE; break; - case EffectCommands::STOP: nImage = IMG_CUSTOMANIMATION_MEDIA_STOP; break; - case EffectCommands::PLAY: - default: nImage = IMG_CUSTOMANIMATION_MEDIA_PLAY; break; + case EffectCommands::TOGGLEPAUSE: nImage = IMG_CUSTOMANIMATION_MEDIA_PAUSE; break; + case EffectCommands::STOP: nImage = IMG_CUSTOMANIMATION_MEDIA_STOP; break; + case EffectCommands::PLAY: + default: nImage = IMG_CUSTOMANIMATION_MEDIA_PLAY; break; } break; - default: nImage = 0xffff; + default: nImage = 0xffff; } if( nImage != 0xffff ) @@ -366,16 +366,16 @@ class CustomAnimationTriggerEntryItem : public SvLBoxString { public: CustomAnimationTriggerEntryItem( SvLBoxEntry*,USHORT nFlags, OUString aDescription, CustomAnimationList* pParent ); - virtual ~CustomAnimationTriggerEntryItem(); - virtual USHORT IsA(); - void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* ); - void Paint( const Point&, SvLBox& rDev, USHORT nFlags,SvLBoxEntry* ); - SvLBoxItem* Create() const; - void Clone( SvLBoxItem* pSource ); + virtual ~CustomAnimationTriggerEntryItem(); + virtual USHORT IsA(); + void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* ); + void Paint( const Point&, SvLBox& rDev, USHORT nFlags,SvLBoxEntry* ); + SvLBoxItem* Create() const; + void Clone( SvLBoxItem* pSource ); private: CustomAnimationList* mpParent; - OUString maDescription; + OUString maDescription; }; // -------------------------------------------------------------------- @@ -472,10 +472,10 @@ void CustomAnimationTriggerEntryItem::Clone( SvLBoxItem* ) // ==================================================================== CustomAnimationList::CustomAnimationList( ::Window* pParent, const ResId& rResId, ICustomAnimationListController* pController ) -: SvTreeListBox( pParent, rResId ) -, mbIgnorePaint( false ) -, mpController( pController ) -, mpLastParentEntry(0) +: SvTreeListBox( pParent, rResId ) +, mbIgnorePaint( false ) +, mpController( pController ) +, mpLastParentEntry(0) { SetWindowBits( WinBits( WB_TABSTOP | WB_BORDER | WB_HASLINES | WB_HASBUTTONS | WB_HASBUTTONSATROOT ) ); @@ -489,7 +489,7 @@ CustomAnimationList::CustomAnimationList( ::Window* pParent, const ResId& rResId const Image& CustomAnimationList::getImage( USHORT nId, bool bHighContrast ) { - DBG_ASSERT( (nId >= IMG_CUSTOMANIMATION_ON_CLICK) && (nId <= IMG_CUSTOMANIMATION_MEDIA_STOP), "sd::CustomAnimationList::getImage(), illegal index!" ); + DBG_ASSERT( (nId >= IMG_CUSTOMANIMATION_ON_CLICK) && (nId <= IMG_CUSTOMANIMATION_MEDIA_STOP), "sd::CustomAnimationList::getImage(), illegal index!" ); if( bHighContrast ) nId += 1; @@ -520,16 +520,16 @@ void CustomAnimationList::KeyInput( const KeyEvent& rKEvt ) const int nKeyCode = rKEvt.GetKeyCode().GetCode(); switch( nKeyCode ) { - case KEY_DELETE: mpController->onContextMenu( CM_REMOVE ); return; - case KEY_INSERT: mpController->onContextMenu( CM_CREATE ); return; - case KEY_SPACE: + case KEY_DELETE: mpController->onContextMenu( CM_REMOVE ); return; + case KEY_INSERT: mpController->onContextMenu( CM_CREATE ); return; + case KEY_SPACE: { const Point aPos; - const CommandEvent aCEvt( aPos, COMMAND_CONTEXTMENU ); + const CommandEvent aCEvt( aPos, COMMAND_CONTEXTMENU ); Command( aCEvt ); return; } - + } ::SvTreeListBox::KeyInput( rKEvt ); @@ -545,7 +545,7 @@ void CustomAnimationList::select( CustomAnimationEffectPtr pEffect, bool bSelect while( pEntry ) { if( pEntry->getEffect() == pEffect ) - { + { Select( pEntry, bSelect ); break; } diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index 2fe96440030e..e3fe431b8046 100644 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,12 +68,12 @@ public: void update( MainSequencePtr pMainSequence ); /** updates the given effect in the list */ -// void update( CustomAnimationEffectPtr pEffect ); +// void update( CustomAnimationEffectPtr pEffect ); void update(); /** removes the given effect to the list*/ -// void remove( CustomAnimationEffectPtr pEffect ); +// void remove( CustomAnimationEffectPtr pEffect ); EffectSequence getSelection() const; @@ -81,18 +81,18 @@ public: void onSelectionChanged( ::com::sun::star::uno::Any aSelection ); // overrides - virtual void SelectHdl(); - virtual BOOL DoubleClickHdl(); + virtual void SelectHdl(); + virtual BOOL DoubleClickHdl(); virtual void Paint( const Rectangle& rRect ); virtual PopupMenu* CreateContextMenu( void ); - virtual void ExcecuteContextMenuAction( USHORT nSelectedPopupEntry ); - + virtual void ExcecuteContextMenuAction( USHORT nSelectedPopupEntry ); + virtual void KeyInput( const KeyEvent& rKEvt ); - -// virtual SvLBoxEntry* CreateEntry() const; - virtual void SetTabs(); + +// virtual SvLBoxEntry* CreateEntry() const; + virtual void SetTabs(); virtual void notify_change(); @@ -104,14 +104,14 @@ public: void clear(); private: - bool mbIgnorePaint; + bool mbIgnorePaint; /** appends the given effect to the list*/ void append( CustomAnimationEffectPtr pEffect ); ICustomAnimationListController* mpController; - MainSequencePtr mpMainSequence; + MainSequencePtr mpMainSequence; Image maImgEmpty; diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 8b96e08b4a8c..988f2feb14f5 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -162,7 +162,7 @@ void fillRepeatComboBox( ComboBox* pBox ) // -------------------------------------------------------------------- CustomAnimationPane::CustomAnimationPane( ::Window* pParent, ViewShellBase& rBase, const Size& rMinSize ) -: Control( pParent, SdResId(DLG_CUSTOMANIMATIONPANE) ), +: Control( pParent, SdResId(DLG_CUSTOMANIMATIONPANE) ), mrBase( rBase ), mpCustomAnimationPresets(NULL), mnPropertyType( nPropertyTypeNone ), @@ -202,13 +202,13 @@ CustomAnimationPane::CustomAnimationPane( ::Window* pParent, ViewShellBase& rBas maStrProperty = mpFTProperty->GetText(); FreeResource(); - + // use bold font for group headings (same font for all fixed lines): Font font( mpFLEffect->GetFont() ); font.SetWeight( WEIGHT_BOLD ); mpFLEffect->SetFont( font ); mpFLModify->SetFont( font ); - + fillDurationComboBox( mpCBSpeed ); mpPBMoveUp->SetSymbol( SYMBOL_ARROW_UP ); mpPBMoveDown->SetSymbol( SYMBOL_ARROW_DOWN ); @@ -471,7 +471,7 @@ void CustomAnimationPane::updateLayout() aSize = mpPBPropertyMore->GetSizePixel(); // place the "start" fixed text - + Point aFTPos( aCursor ); Point aLBPos( aCursor ); Size aListBoxSize( LogicToPixel( Size( 60, 12 ), MAP_APPFONT ) ); @@ -533,7 +533,7 @@ void CustomAnimationPane::updateLayout() aSize = mpFLSeperator2->GetSizePixel(); aSize.Width() = aPaneSize.Width() - 2 * aOffset.X(); mpFLSeperator2->SetPosSizePixel( aCursor, aSize ); - + // next, layout and place the play and slide show buttons aCtrlSize = mpPBSlideShow->GetSizePixel(); aCtrlSize.setWidth( mpPBSlideShow->CalcMinimumSize( aSize.Width() ).getWidth() + nButtonExtraWidth ); @@ -542,7 +542,7 @@ void CustomAnimationPane::updateLayout() aPlaySize.setWidth( mpPBPlay->CalcMinimumSize( aSize.Width() ).getWidth() + nButtonExtraWidth ); aCursor.Y() -= aCtrlSize.Height() /* + aOffset.Y() */; - + // do we need two lines for the buttons? int aTestWidth = aCursor.X() + mpPBPlay->GetSizePixel().Width() + 2 * aOffset.X() + mpPBSlideShow->GetSizePixel().Width(); if( aTestWidth > aPaneSize.Width() ) @@ -753,7 +753,7 @@ void CustomAnimationPane::updateControls() mpLBStart->Enable(nSelectionCount > 0); mpPBPropertyMore->Enable(nSelectionCount > 0); -// mpPBPlay->Enable(nSelectionCount > 0); +// mpPBPlay->Enable(nSelectionCount > 0); mpFTProperty->SetText( maStrProperty ); @@ -766,7 +766,7 @@ void CustomAnimationPane::updateControls() OUString aUIName( getPresets().getUINameForPresetId( pEffect->getPresetId() ) ); OUString aTemp( maStrModify ); - + if( aUIName.getLength() ) { aTemp += OUString( (sal_Unicode)' ' ); @@ -778,7 +778,7 @@ void CustomAnimationPane::updateControls() if( pDescriptor.get() ) { PropertySubControl* pSubControl = NULL; - + Any aValue; UStringList aProperties( pDescriptor->getProperties() ); @@ -792,7 +792,7 @@ void CustomAnimationPane::updateControls() aValue = getProperty1Value( mnPropertyType, pEffect ); } - + if( aValue.hasValue() ) { pSubControl = mpLBProperty->getSubControl(); @@ -831,9 +831,9 @@ void CustomAnimationPane::updateControls() sal_Int16 nNodeType = pEffect->getNodeType(); switch( nNodeType ) { - case EffectNodeType::ON_CLICK: nPos = 0; break; - case EffectNodeType::WITH_PREVIOUS: nPos = 1; break; - case EffectNodeType::AFTER_PREVIOUS: nPos = 2; break; + case EffectNodeType::ON_CLICK: nPos = 0; break; + case EffectNodeType::WITH_PREVIOUS: nPos = 1; break; + case EffectNodeType::AFTER_PREVIOUS: nPos = 2; break; } mpLBStart->SelectEntryPos( nPos ); @@ -850,13 +850,13 @@ void CustomAnimationPane::updateControls() nPos = 0; else if( fDuration == 3.0 ) nPos = 1; - else if( fDuration == 2.0 ) + else if( fDuration == 2.0 ) nPos = 2; - else if( fDuration == 1.0 ) + else if( fDuration == 1.0 ) nPos = 3; - else if( fDuration == 0.5 ) + else if( fDuration == 0.5 ) nPos = 4; - else + else nPos = 0xffff; mpCBSpeed->SelectEntryPos( nPos ); @@ -901,14 +901,14 @@ void CustomAnimationPane::updateControls() { do { - aIter++; + aIter++; } while( (aIter != mpMainSequence->getEnd()) && !(mpCustomAnimationList->isExpanded((*aIter)) ) ); if( aIter == mpMainSequence->getEnd() ) bEnableDown = false; } - + if( bEnableUp || bEnableDown ) { MainSequenceRebuildGuard aGuard( mpMainSequence ); @@ -1065,13 +1065,13 @@ void CustomAnimationPane::onContextMenu( USHORT nSelectedPopupEntry ) { switch( nSelectedPopupEntry ) { - case CM_WITH_CLICK: onChangeStart( EffectNodeType::ON_CLICK ); break; - case CM_WITH_PREVIOUS: onChangeStart( EffectNodeType::WITH_PREVIOUS ); break; - case CM_AFTER_PREVIOUS: onChangeStart( EffectNodeType::AFTER_PREVIOUS ); break; - case CM_OPTIONS: showOptions(); break; - case CM_DURATION: showOptions(RID_TP_CUSTOMANIMATION_DURATION); break; - case CM_REMOVE: onRemove(); break; - case CM_CREATE: if( maViewSelection.hasValue() ) onChange( true ); break; + case CM_WITH_CLICK: onChangeStart( EffectNodeType::ON_CLICK ); break; + case CM_WITH_PREVIOUS: onChangeStart( EffectNodeType::WITH_PREVIOUS ); break; + case CM_AFTER_PREVIOUS: onChangeStart( EffectNodeType::AFTER_PREVIOUS ); break; + case CM_OPTIONS: showOptions(); break; + case CM_DURATION: showOptions(RID_TP_CUSTOMANIMATION_DURATION); break; + case CM_REMOVE: onRemove(); break; + case CM_CREATE: if( maViewSelection.hasValue() ) onChange( true ); break; } updateControls(); @@ -1081,7 +1081,7 @@ void addValue( STLPropertySet* pSet, sal_Int32 nHandle, const Any& rValue ) { switch( pSet->getPropertyState( nHandle ) ) { - case STLPropertyState_AMBIGUOUS: + case STLPropertyState_AMBIGUOUS: // value is already ambiguous, do nothing break; case STLPropertyState_DIRECT: @@ -1338,7 +1338,7 @@ STLPropertySet* CustomAnimationPane::createSelectionSet() addValue( pSet, nHandlePresetId, makeAny( pEffect->getPresetId() ) ); addValue( pSet, nHandleHasText, makeAny( (sal_Bool)pEffect->hasText() ) ); - + addValue( pSet, nHandleHasVisibleShape, Any( hasVisibleShape( pEffect->getTargetShape() ) ) ); Any aSoundSource; @@ -1346,7 +1346,7 @@ STLPropertySet* CustomAnimationPane::createSelectionSet() { aSoundSource = pEffect->getAudio()->getSource(); addValue( pSet, nHandleSoundVolumne, makeAny( pEffect->getAudio()->getVolume() ) ); -// todo addValue( pSet, nHandleSoundEndAfterSlide, makeAny( pEffect->getAudio()->getEndAfterSlide() ) ); +// todo addValue( pSet, nHandleSoundEndAfterSlide, makeAny( pEffect->getAudio()->getEndAfterSlide() ) ); // this is now stored at the XCommand parameter sequence } else if( pEffect->getCommand() == EffectCommands::STOPAUDIO ) @@ -1371,7 +1371,7 @@ STLPropertySet* CustomAnimationPane::createSelectionSet() addValue( pSet, nHandleTrigger, makeAny( pIS->getTriggerShape() ) ); } - // + // CustomAnimationPresetPtr pDescriptor = rPresets.getEffectDescriptor( pEffect->getPresetId() ); if( pDescriptor.get() ) @@ -1414,7 +1414,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper { // change selected effect bool bChanged = false; - + MainSequenceRebuildGuard aGuard( mpMainSequence ); EffectSequence::iterator aIter( maListSelection.begin() ); @@ -1792,7 +1792,7 @@ bool getTextSelection( const Any& rSelection, Reference< XShape >& xShape, std:: if( xSelectedText.is() ) try { xShape.set( xSelectedText->getText(), UNO_QUERY_THROW ); - + Reference< XTextRangeCompare > xTextRangeCompare( xShape, UNO_QUERY_THROW ); Reference< XEnumerationAccess > xParaEnumAccess( xShape, UNO_QUERY_THROW ); Reference< XEnumeration > xParaEnum( xParaEnumAccess->createEnumeration(), UNO_QUERY_THROW ); @@ -1835,7 +1835,7 @@ bool getTextSelection( const Any& rSelection, Reference< XShape >& xShape, std:: else xRange.clear(); } - + return true; } catch( Exception& e ) @@ -2006,9 +2006,9 @@ void CustomAnimationPane::createPath( PathKind eKind, std::vector< Any >& rTarge switch( eKind ) { - case CURVE: nSID = SID_DRAW_BEZIER_NOFILL; break; - case POLYGON: nSID = SID_DRAW_POLYGON_NOFILL; break; - case FREEFORM: nSID = SID_DRAW_FREELINE_NOFILL; break; + case CURVE: nSID = SID_DRAW_BEZIER_NOFILL; break; + case POLYGON: nSID = SID_DRAW_POLYGON_NOFILL; break; + case FREEFORM: nSID = SID_DRAW_FREELINE_NOFILL; break; default: break; } @@ -2074,9 +2074,9 @@ void CustomAnimationPane::onChangeStart() USHORT nPos= mpLBStart->GetSelectEntryPos(); switch( nPos ) { - case 0: nNodeType = EffectNodeType::ON_CLICK; break; - case 1: nNodeType = EffectNodeType::WITH_PREVIOUS; break; - case 2: nNodeType = EffectNodeType::AFTER_PREVIOUS; break; + case 0: nNodeType = EffectNodeType::ON_CLICK; break; + case 1: nNodeType = EffectNodeType::WITH_PREVIOUS; break; + case 2: nNodeType = EffectNodeType::AFTER_PREVIOUS; break; default: return; } @@ -2222,7 +2222,7 @@ IMPL_LINK( CustomAnimationPane, implControlHdl, Control*, pControl ) else if( pControl == mpCBAutoPreview ) { SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS); - pOptions->SetPreviewChangedEffects( mpCBAutoPreview->IsChecked() ? sal_True : sal_False ); + pOptions->SetPreviewChangedEffects( mpCBAutoPreview->IsChecked() ? sal_True : sal_False ); } updateControls(); @@ -2275,7 +2275,7 @@ void CustomAnimationPane::moveSelection( bool bUp ) if( aInsertPos != rEffectSequence.begin() ) { aInsertPos--; - while( (aInsertPos != rEffectSequence.begin()) && !mpCustomAnimationList->isExpanded(*aInsertPos)) + while( (aInsertPos != rEffectSequence.begin()) && !mpCustomAnimationList->isExpanded(*aInsertPos)) aInsertPos--; rEffectSequence.insert( aInsertPos, pEffect ); @@ -2305,7 +2305,7 @@ void CustomAnimationPane::moveSelection( bool bUp ) if( aInsertPos != rEffectSequence.end() ) { aInsertPos++; - while( (aInsertPos != rEffectSequence.end()) && !mpCustomAnimationList->isExpanded(*aInsertPos)) + while( (aInsertPos != rEffectSequence.end()) && !mpCustomAnimationList->isExpanded(*aInsertPos)) aInsertPos++; rEffectSequence.insert( aInsertPos, pEffect ); @@ -2458,7 +2458,7 @@ void CustomAnimationPane::updatePathFromMotionPathTag( const rtl::Reference< Mot if( pPage ) pManager->AddUndoAction( new UndoAnimationPath( mrBase.GetDocShell()->GetDoc(), pPage, pEffect->getNode() ) ); } - + pEffect->updatePathFromSdrPathObj( *pPathObj ); } } diff --git a/sd/source/ui/animations/CustomAnimationPane.hrc b/sd/source/ui/animations/CustomAnimationPane.hrc index 0db342f7995f..e6477cf132b4 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hrc +++ b/sd/source/ui/animations/CustomAnimationPane.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,33 +28,33 @@ #ifndef _SD_CUSTOMANIMATIONPANE_HRC #define _SD_CUSTOMANIMATIONPANE_HRC -#define CM_WITH_CLICK 1 -#define CM_WITH_PREVIOUS 2 -#define CM_AFTER_PREVIOUS 3 -#define CM_OPTIONS 4 -#define CM_DURATION 5 -#define CM_REMOVE 6 +#define CM_WITH_CLICK 1 +#define CM_WITH_PREVIOUS 2 +#define CM_AFTER_PREVIOUS 3 +#define CM_OPTIONS 4 +#define CM_DURATION 5 +#define CM_REMOVE 6 -#define FL_EFFECT 1 -#define PB_ADD_EFFECT 2 -#define PB_CHANGE_EFFECT 3 -#define PB_REMOVE_EFFECT 4 -#define FL_MODIFY 5 -#define FT_START 6 -#define LB_START 7 -#define FT_PROPERTY 8 -#define LB_PROPERTY 9 -#define PB_PROPERTY_MORE 10 -#define FT_SPEED 12 -#define CB_SPEED 13 -#define CT_CUSTOM_ANIMATION_LIST 14 -#define FT_CHANGE_ORDER 15 -#define PB_MOVE_UP 16 -#define PB_MOVE_DOWN 17 -#define FL_SEPERATOR1 18 -#define PB_PLAY 19 -#define PB_SLIDE_SHOW 20 -#define FL_SEPERATOR2 21 -#define CB_AUTOPREVIEW 22 +#define FL_EFFECT 1 +#define PB_ADD_EFFECT 2 +#define PB_CHANGE_EFFECT 3 +#define PB_REMOVE_EFFECT 4 +#define FL_MODIFY 5 +#define FT_START 6 +#define LB_START 7 +#define FT_PROPERTY 8 +#define LB_PROPERTY 9 +#define PB_PROPERTY_MORE 10 +#define FT_SPEED 12 +#define CB_SPEED 13 +#define CT_CUSTOM_ANIMATION_LIST 14 +#define FT_CHANGE_ORDER 15 +#define PB_MOVE_UP 16 +#define PB_MOVE_DOWN 17 +#define FL_SEPERATOR1 18 +#define PB_PLAY 19 +#define PB_SLIDE_SHOW 20 +#define FL_SEPERATOR2 21 +#define CB_AUTOPREVIEW 22 #endif // _SD_CUSTOMANIMATIONPANE_HXX diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index 7343bc547f32..bc7d8bd809b7 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -131,39 +131,39 @@ private: const CustomAnimationPresets* mpCustomAnimationPresets; - FixedLine* mpFLModify; - PushButton* mpPBAddEffect; + FixedLine* mpFLModify; + PushButton* mpPBAddEffect; PushButton* mpPBChangeEffect; - PushButton* mpPBRemoveEffect; - FixedLine* mpFLEffect; - FixedText* mpFTStart; - ListBox* mpLBStart; - FixedText* mpFTProperty; - PropertyControl* mpLBProperty; - PushButton* mpPBPropertyMore; - FixedText* mpFTSpeed; - ComboBox* mpCBSpeed; - CustomAnimationList* mpCustomAnimationList; - FixedText* mpFTChangeOrder; - PushButton* mpPBMoveUp; + PushButton* mpPBRemoveEffect; + FixedLine* mpFLEffect; + FixedText* mpFTStart; + ListBox* mpLBStart; + FixedText* mpFTProperty; + PropertyControl* mpLBProperty; + PushButton* mpPBPropertyMore; + FixedText* mpFTSpeed; + ComboBox* mpCBSpeed; + CustomAnimationList* mpCustomAnimationList; + FixedText* mpFTChangeOrder; + PushButton* mpPBMoveUp; PushButton* mpPBMoveDown; - FixedLine* mpFLSeperator1; - PushButton* mpPBPlay; + FixedLine* mpFLSeperator1; + PushButton* mpPBPlay; PushButton* mpPBSlideShow; - FixedLine* mpFLSeperator2; - CheckBox* mpCBAutoPreview; + FixedLine* mpFLSeperator2; + CheckBox* mpCBAutoPreview; - String maStrModify; - String maStrProperty; + String maStrModify; + String maStrProperty; - sal_Int32 mnPropertyType; + sal_Int32 mnPropertyType; - Size maMinSize; + Size maMinSize; EffectSequence maListSelection; ::com::sun::star::uno::Any maViewSelection; - MainSequencePtr mpMainSequence; + MainSequencePtr mpMainSequence; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > mxCurrentPage; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawView > mxView; diff --git a/sd/source/ui/animations/CustomAnimationPane.src b/sd/source/ui/animations/CustomAnimationPane.src index 267fe1269111..d5f97614488a 100644 --- a/sd/source/ui/animations/CustomAnimationPane.src +++ b/sd/source/ui/animations/CustomAnimationPane.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,10 +42,10 @@ Control DLG_CUSTOMANIMATIONPANE { OutputSize = TRUE; Size = MAP_APPFONT( 260, 8 ); - + Text [ en-US ] = "Effect"; }; - + PushButton PB_ADD_EFFECT { HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT; @@ -55,7 +55,7 @@ Control DLG_CUSTOMANIMATIONPANE Text [ en-US ] = "~Add..."; }; - + PushButton PB_CHANGE_EFFECT { HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT; @@ -65,7 +65,7 @@ Control DLG_CUSTOMANIMATIONPANE Text [ en-US ] = "~Change..."; }; - + PushButton PB_REMOVE_EFFECT { HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT; @@ -75,15 +75,15 @@ Control DLG_CUSTOMANIMATIONPANE Text [ en-US ] = "~Remove"; }; - + FixedLine FL_MODIFY { OutputSize = TRUE; Size = MAP_APPFONT( 260, 8 ); - + Text [ en-US ] = "Modify effect"; }; - + FixedText FT_START { OutputSize = TRUE; @@ -107,7 +107,7 @@ Control DLG_CUSTOMANIMATIONPANE < "After previous" ; > ; }; }; - + FixedText FT_PROPERTY { OutputSize = TRUE; @@ -133,7 +133,7 @@ Control DLG_CUSTOMANIMATIONPANE Size = MAP_APPFONT( 16, 14 ); Text [ en-US ] = "~..."; - + QuickHelpText [en-US ] = "Effect Options"; }; @@ -142,9 +142,9 @@ Control DLG_CUSTOMANIMATIONPANE OutputSize = TRUE; Size = MAP_APPFONT( 42, 8 ); - Text [ en-US ] = "Sp~eed"; + Text [ en-US ] = "Sp~eed"; }; - + ComboBox CB_SPEED { HelpId = HID_SD_CUSTOMANIMATIONPANE_CB_SPEED; @@ -160,15 +160,15 @@ Control DLG_CUSTOMANIMATIONPANE TabStop = TRUE; Border = TRUE; }; - + FixedText FT_CHANGE_ORDER { OutputSize = TRUE; Size = MAP_APPFONT( 42, 8 ); - Text [ en-US ] = "Change order:"; + Text [ en-US ] = "Change order:"; }; - + PushButton PB_MOVE_UP { HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP; @@ -185,7 +185,7 @@ Control DLG_CUSTOMANIMATIONPANE Size = MAP_APPFONT( 16, 14 ); }; - FixedLine FL_SEPERATOR1 + FixedLine FL_SEPERATOR1 { OutputSize = TRUE; Size = MAP_APPFONT( 8, 8 ); @@ -196,7 +196,7 @@ Control DLG_CUSTOMANIMATIONPANE HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_PLAY; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE; - + Text [ en-US ] = "~Play"; }; @@ -205,7 +205,7 @@ Control DLG_CUSTOMANIMATIONPANE HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW; Size = MAP_APPFONT ( 80 , 14 ) ; TabStop = TRUE; - + Text [ en-US ] = "Slide Sho~w"; }; @@ -213,13 +213,13 @@ Control DLG_CUSTOMANIMATIONPANE { Size = MAP_APPFONT( 8, 8 ); }; - + CheckBox CB_AUTOPREVIEW { HelpId = HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW; Size = MAP_APPFONT ( 120 , 10 ) ; TabStop = TRUE ; - Text [ en-US ] = "Automatic pre~view" ; + Text [ en-US ] = "Automatic pre~view" ; }; }; diff --git a/sd/source/ui/animations/DialogListBox.cxx b/sd/source/ui/animations/DialogListBox.cxx index e1fe8d5d3918..7a9836d3f743 100644 --- a/sd/source/ui/animations/DialogListBox.cxx +++ b/sd/source/ui/animations/DialogListBox.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,17 +36,17 @@ DialogListBox::DialogListBox( Window* pParent, WinBits nWinStyle ) : Control( pParent, nWinStyle ), mpChild( 0 ) { - mpVScrollBar = new ScrollBar( this, WB_VSCROLL | WB_DRAG ); - mpHScrollBar = new ScrollBar( this, WB_HSCROLL | WB_DRAG ); - mpScrollBarBox = new ScrollBarBox( this ); + mpVScrollBar = new ScrollBar( this, WB_VSCROLL | WB_DRAG ); + mpHScrollBar = new ScrollBar( this, WB_HSCROLL | WB_DRAG ); + mpScrollBarBox = new ScrollBarBox( this ); Link aLink( LINK( this, DialogListBox, ScrollBarHdl ) ); mpVScrollBar->SetScrollHdl( aLink ); mpHScrollBar->SetScrollHdl( aLink ); - mbVScroll = false; - mbHScroll = false; - mbAutoHScroll = ( nWinStyle & WB_AUTOHSCROLL ) ? true : false; + mbVScroll = false; + mbHScroll = false; + mbAutoHScroll = ( nWinStyle & WB_AUTOHSCROLL ) ? true : false; } // ----------------------------------------------------------------------- diff --git a/sd/source/ui/animations/STLPropertySet.cxx b/sd/source/ui/animations/STLPropertySet.cxx index 3f72f581222e..7c01c08157a9 100644 --- a/sd/source/ui/animations/STLPropertySet.cxx +++ b/sd/source/ui/animations/STLPropertySet.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/animations/STLPropertySet.hxx b/sd/source/ui/animations/STLPropertySet.hxx index 2d5d95b5d7f4..fa4ed1d6b143 100644 --- a/sd/source/ui/animations/STLPropertySet.hxx +++ b/sd/source/ui/animations/STLPropertySet.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 9c12692c6597..0189db58feb8 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -222,13 +222,13 @@ struct TransitionEffect sal_Int32 mnFadeColor; // other settings - double mfDuration; + double mfDuration; ULONG mnTime; PresChange mePresChange; BOOL mbSoundOn; String maSound; - bool mbLoopSound; - bool mbStopSound; + bool mbLoopSound; + bool mbStopSound; bool mbEffectAmbiguous; bool mbDurationAmbiguous; @@ -265,9 +265,9 @@ void lcl_CreateUndoForPages( const ::sd::slidesorter::SharedPageSelection& rpPages, ::sd::ViewShellBase& rBase ) { - ::sd::DrawDocShell* pDocSh = rBase.GetDocShell(); - SfxUndoManager* pManager = pDocSh->GetUndoManager(); - SdDrawDocument* pDoc = pDocSh->GetDoc(); + ::sd::DrawDocShell* pDocSh = rBase.GetDocShell(); + SfxUndoManager* pManager = pDocSh->GetUndoManager(); + SdDrawDocument* pDoc = pDocSh->GetDoc(); if( pManager && pDocSh && pDoc ) { String aComment( SdResId(STR_UNDO_SLIDE_PARAMS) ); diff --git a/sd/source/ui/animations/SlideTransitionPane.hrc b/sd/source/ui/animations/SlideTransitionPane.hrc index cce878a547d2..d8c2fd7336c7 100644 --- a/sd/source/ui/animations/SlideTransitionPane.hrc +++ b/sd/source/ui/animations/SlideTransitionPane.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx index 965f286ac40e..f8a5731620ad 100644 --- a/sd/source/ui/animations/SlideTransitionPane.hxx +++ b/sd/source/ui/animations/SlideTransitionPane.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/animations/SlideTransitionPane.src b/sd/source/ui/animations/SlideTransitionPane.src index 7cf1cec805d3..3a992046085f 100644 --- a/sd/source/ui/animations/SlideTransitionPane.src +++ b/sd/source/ui/animations/SlideTransitionPane.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index 30992f913705..6648aed843b0 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,23 +86,23 @@ static const int DRGPIX = 2; // Drag MinMove i class PathDragMove : public SdrDragMove { private: - basegfx::B2DPolyPolygon maPathPolyPolygon; + basegfx::B2DPolyPolygon maPathPolyPolygon; protected: virtual void createSdrDragEntries(); public: - PathDragMove(SdrDragView& rNewView, + PathDragMove(SdrDragView& rNewView, const rtl::Reference <MotionPathTag >& xTag, const basegfx::B2DPolyPolygon& rPathPolyPolygon) - : SdrDragMove(rNewView), + : SdrDragMove(rNewView), maPathPolyPolygon(rPathPolyPolygon), mxTag( xTag ) {} - PathDragMove(SdrDragView& rNewView, + PathDragMove(SdrDragView& rNewView, const rtl::Reference <MotionPathTag >& xTag) - : SdrDragMove(rNewView), + : SdrDragMove(rNewView), maPathPolyPolygon(), mxTag( xTag ) {} @@ -150,23 +150,23 @@ bool PathDragMove::EndSdrDrag(bool /*bCopy*/) class PathDragResize : public SdrDragResize { private: - basegfx::B2DPolyPolygon maPathPolyPolygon; + basegfx::B2DPolyPolygon maPathPolyPolygon; protected: virtual void createSdrDragEntries(); public: - PathDragResize(SdrDragView& rNewView, + PathDragResize(SdrDragView& rNewView, const rtl::Reference <MotionPathTag >& xTag, const basegfx::B2DPolyPolygon& rPathPolyPolygon) - : SdrDragResize(rNewView), + : SdrDragResize(rNewView), maPathPolyPolygon(rPathPolyPolygon), mxTag( xTag ) {} - PathDragResize(SdrDragView& rNewView, + PathDragResize(SdrDragView& rNewView, const rtl::Reference <MotionPathTag >& xTag) - : SdrDragResize(rNewView), + : SdrDragResize(rNewView), maPathPolyPolygon(), mxTag( xTag ) {} @@ -211,7 +211,7 @@ bool PathDragResize::EndSdrDrag(bool /*bCopy*/) class PathDragObjOwn : public SdrDragObjOwn { private: - basegfx::B2DPolyPolygon maPathPolyPolygon; + basegfx::B2DPolyPolygon maPathPolyPolygon; protected: virtual void createSdrDragEntries(); @@ -219,12 +219,12 @@ protected: public: PathDragObjOwn(SdrDragView& rNewView, const basegfx::B2DPolyPolygon& rPathPolyPolygon) - : SdrDragObjOwn(rNewView), + : SdrDragObjOwn(rNewView), maPathPolyPolygon(rPathPolyPolygon) {} PathDragObjOwn(SdrDragView& rNewView) - : SdrDragObjOwn(rNewView), + : SdrDragObjOwn(rNewView), maPathPolyPolygon() {} @@ -245,7 +245,7 @@ void PathDragObjOwn::createSdrDragEntries() bool PathDragObjOwn::EndSdrDrag(bool /*bCopy*/) { Hide(); - + SdrObject* pObj = GetDragObj(); if(pObj) @@ -296,7 +296,7 @@ void SdPathHdl::CreateB2dIAObject() { // first throw away old one GetRidOfIAObject(); - + if(pHdlList) { SdrMarkView* pView = pHdlList->GetView(); @@ -510,7 +510,7 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl ) return true; } else if( rMEvt.IsLeft() ) - { + { OutputDevice* pOut = mrView.GetViewShell()->GetActiveWindow(); Point aMDPos( pOut->PixelToLogic( rMEvt.GetPosPixel() ) ); @@ -523,7 +523,7 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl ) Point aPt(aMDPos); // - pMarkedPV->GetOffset()); - if(bNewObj) + if(bNewObj) aPt = mrView.GetSnapPos(aPt,mrView.GetSdrPageView()); sal_Bool bClosed0(mpPathObj->IsClosedObj()); @@ -531,21 +531,21 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl ) sal_uInt32 nInsPointNum = mpPathObj->NbcInsPointOld(aPt, bNewObj, sal_True); if(bClosed0 != mpPathObj->IsClosedObj()) - { + { // Obj was closed implicit // object changed mpPathObj->SetChanged(); mpPathObj->BroadcastObjectChange(); } - if(0xffffffff != nInsPointNum) + if(0xffffffff != nInsPointNum) { mrView.UnmarkAllPoints(); mrView.updateHandles(); bool bRet = mrView.BegDragObj(aMDPos, pOut, mrView.GetHdl(nInsPointNum+1), 0, new PathDragObjOwn( mrView ) ); - if (bRet) + if (bRet) { const_cast< SdrDragStat* >( &mrView.GetDragStat() )->SetMinMoved(); mrView.MovDragObj(aMDPos); @@ -575,7 +575,7 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl ) pHdl = dynamic_cast< SmartHdl* >( mrView.PickHandle(aMDPos) ); } } - + if (pHdl) mrView.MarkPoint(*pHdl); } @@ -585,7 +585,7 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl ) { mrView.BrkAction(); const USHORT nDrgLog = (USHORT)pOut->PixelToLogic(Size(DRGPIX,0)).Width(); - + rtl::Reference< MotionPathTag > xTag( this ); SdrDragMethod* pDragMethod; @@ -606,12 +606,12 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl ) { pDragMethod = new PathDragResize( mrView, xTag, aDragPoly ); } - + mrView.BegDragObj(aMDPos, NULL, pHdl, nDrgLog, pDragMethod ); } return true; } - } + } } return false; @@ -701,7 +701,7 @@ bool MotionPathTag::OnMarkHandle( const KeyEvent& rKEvt ) // rescue ID of point with focus sal_uInt32 nPol(pHdl->GetPolyNum()); sal_uInt32 nPnt(pHdl->GetPointNum()); - + if(mrView.IsPointMarked(*pHdl)) { if(rKEvt.GetKeyCode().IsShift()) @@ -726,7 +726,7 @@ bool MotionPathTag::OnMarkHandle( const KeyEvent& rKEvt ) for(sal_uInt32 a(0); !pNewOne && a < rHdlList.GetHdlCount(); a++) { SdrHdl* pAct = rHdlList.GetHdl(a); - + if(pAct && pAct->GetKind() == HDL_POLY && pAct->GetPolyNum() == nPol && pAct->GetPointNum() == nPnt) pNewOne = pAct; } @@ -746,10 +746,10 @@ bool MotionPathTag::OnMove( const KeyEvent& rKEvt ) switch( rKEvt.GetKeyCode().GetCode() ) { - case KEY_UP: nY = -1; break; - case KEY_DOWN: nY = 1; break; - case KEY_LEFT: nX = -1; break; - case KEY_RIGHT: nX = 1; break; + case KEY_UP: nY = -1; break; + case KEY_DOWN: nY = 1; break; + case KEY_LEFT: nX = -1; break; + case KEY_RIGHT: nX = 1; break; default: break; } @@ -1007,13 +1007,13 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList ) const bool bSelected= pMrkPnts && pMrkPnts->Exist(sal::static_int_cast< USHORT >(nHandle)); pSmartHdl->SetSelected(bSelected); - if( mrView.IsPlusHandlesAlwaysVisible() || bSelected ) + if( mrView.IsPlusHandlesAlwaysVisible() || bSelected ) { sal_uInt32 nPlusAnz=mpPathObj->GetPlusHdlCount(*pSmartHdl); - for (sal_uInt32 nPlusNum=0; nPlusNum<nPlusAnz; nPlusNum++) + for (sal_uInt32 nPlusNum=0; nPlusNum<nPlusAnz; nPlusNum++) { SdrHdl* pPlusHdl = mpPathObj->GetPlusHdl(*pSmartHdl,nPlusNum); - if (pPlusHdl!=NULL) + if (pPlusHdl!=NULL) { pPlusHdl->SetObj(mpPathObj); pPlusHdl->SetPageView(mrView.GetSdrPageView()); @@ -1028,22 +1028,22 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList ) { Rectangle aRect(mpPathObj->GetCurrentBoundRect()); - if(!aRect.IsEmpty()) + if(!aRect.IsEmpty()) { ULONG nCount = rHandlerList.GetHdlCount(); BOOL bWdt0=aRect.Left()==aRect.Right(); BOOL bHgt0=aRect.Top()==aRect.Bottom(); - if (bWdt0 && bHgt0) + if (bWdt0 && bHgt0) { rHandlerList.AddHdl(new SmartHdl( xThis, mpPathObj, aRect.TopLeft(),HDL_UPLFT)); - } + } else if (bWdt0 || bHgt0) { rHandlerList.AddHdl(new SmartHdl( xThis, mpPathObj, aRect.TopLeft() ,HDL_UPLFT)); rHandlerList.AddHdl(new SmartHdl( xThis, mpPathObj, aRect.BottomRight(),HDL_LWRGT)); - } - else + } + else { if (!bWdt0 && !bHgt0) rHandlerList.AddHdl(new SmartHdl( xThis, mpPathObj, aRect.TopLeft() ,HDL_UPLFT)); if ( !bHgt0) rHandlerList.AddHdl(new SmartHdl( xThis, mpPathObj, aRect.TopCenter() ,HDL_UPPER)); @@ -1103,10 +1103,10 @@ void MotionPathTag::deselect() { SdrUShortCont* pPts = mpMark->GetMarkedPoints(); - if( pPts ) + if( pPts ) pPts->Clear(); } - + selectionChanged(); } @@ -1129,24 +1129,24 @@ void MotionPathTag::DeleteMarkedPoints() mrView.BrkAction(); // Description -// BegUndo(ImpGetResStr(STR_EditDelete),GetDescriptionOfMarkedPoints(),SDRREPFUNC_OBJ_DELETE); +// BegUndo(ImpGetResStr(STR_EditDelete),GetDescriptionOfMarkedPoints(),SDRREPFUNC_OBJ_DELETE); SdrUShortCont* pPts = mpMark->GetMarkedPoints(); - if( pPts ) + if( pPts ) { PolyPolygonEditor aEditor( mpPathObj->GetPathPoly(), mpPathObj->IsClosed() ); if( aEditor.DeletePoints( pPts->getContainer() ) ) { if( aEditor.GetPolyPolygon().count() ) { -// AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pPath )); +// AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pPath )); mpPathObj->SetPathPoly( aEditor.GetPolyPolygon() ); } else { -// AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoDeleteObject(*pPath ) ); -// pM->GetPageView()->GetObjList()->RemoveObject(pObj->GetOrdNum()); +// AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoDeleteObject(*pPath ) ); +// pM->GetPageView()->GetObjList()->RemoveObject(pObj->GetOrdNum()); } mrView.UnmarkAllPoints(); @@ -1155,7 +1155,7 @@ void MotionPathTag::DeleteMarkedPoints() } } -// EndUndo(); +// EndUndo(); } } @@ -1193,15 +1193,15 @@ SdrPathSegmentKind MotionPathTag::GetMarkedSegmentsKind() const void MotionPathTag::SetMarkedSegmentsKind(SdrPathSegmentKind eKind) { - if(mpPathObj && isSelected() && (GetMarkedPointCount() != 0)) + if(mpPathObj && isSelected() && (GetMarkedPointCount() != 0)) { SdrUShortCont* pPts = mpMark->GetMarkedPoints(); - if(pPts) + if(pPts) { PolyPolygonEditor aEditor( mpPathObj->GetPathPoly(), mpPathObj->IsClosed() ); if(aEditor.SetSegmentsKind( eKind, pPts->getContainer()) ) { -// AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pPath)); +// AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pPath)); mpPathObj->SetPathPoly(aEditor.GetPolyPolygon()); mrView.MarkListHasChanged(); mrView.updateHandles(); @@ -1229,33 +1229,33 @@ SdrPathSmoothKind MotionPathTag::GetMarkedPointsSmooth() const void MotionPathTag::SetMarkedPointsSmooth(SdrPathSmoothKind eKind) { basegfx::B2VectorContinuity eFlags; - - if(SDRPATHSMOOTH_ANGULAR == eKind) + + if(SDRPATHSMOOTH_ANGULAR == eKind) { eFlags = basegfx::CONTINUITY_NONE; } - else if(SDRPATHSMOOTH_ASYMMETRIC == eKind) + else if(SDRPATHSMOOTH_ASYMMETRIC == eKind) { eFlags = basegfx::CONTINUITY_C1; } - else if(SDRPATHSMOOTH_SYMMETRIC == eKind) + else if(SDRPATHSMOOTH_SYMMETRIC == eKind) { eFlags = basegfx::CONTINUITY_C2; } - else + else { return; } - if(mpPathObj && mpMark && isSelected() && (GetMarkedPointCount() != 0)) + if(mpPathObj && mpMark && isSelected() && (GetMarkedPointCount() != 0)) { SdrUShortCont* pPts = mpMark->GetMarkedPoints(); - if(pPts) + if(pPts) { PolyPolygonEditor aEditor( mpPathObj->GetPathPoly(), mpPathObj->IsClosed() ); if(aEditor.SetPointsSmooth( eFlags, pPts->getContainer() ) ) { -// AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pPath)); +// AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pPath)); mpPathObj->SetPathPoly(aEditor.GetPolyPolygon()); mrView.MarkListHasChanged(); mrView.updateHandles(); @@ -1263,7 +1263,7 @@ void MotionPathTag::SetMarkedPointsSmooth(SdrPathSmoothKind eKind) } } } - + void MotionPathTag::CloseMarkedObjects(BOOL /*bToggle*/, BOOL /*bOpen*/ ) { // not supported for motion path diff --git a/sd/source/ui/animations/motionpathtag.hxx b/sd/source/ui/animations/motionpathtag.hxx index 1413636fca2b..9834fcc323d5 100644 --- a/sd/source/ui/animations/motionpathtag.hxx +++ b/sd/source/ui/animations/motionpathtag.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ public: virtual void DeleteMarkedPoints(); virtual BOOL IsDeleteMarkedPointsPossible() const; - virtual void RipUpAtMarkedPoints(); + virtual void RipUpAtMarkedPoints(); virtual bool IsRipUpAtMarkedPointsPossible() const; virtual BOOL IsSetMarkedSegmentsKindPossible() const; @@ -88,7 +88,7 @@ public: virtual BOOL IsSetMarkedPointsSmoothPossible() const; virtual SdrPathSmoothKind GetMarkedPointsSmooth() const; virtual void SetMarkedPointsSmooth(SdrPathSmoothKind eKind); - + virtual void CloseMarkedObjects(BOOL bToggle, BOOL bOpen ); virtual bool IsOpenCloseMarkedObjectsPossible() const; virtual SdrObjClosedKind GetMarkedObjectsClosedState() const; @@ -129,5 +129,5 @@ private: } // end of namespace sd -#endif // _SD_MOTIONPATHTAG_HXX_ +#endif // _SD_MOTIONPATHTAG_HXX_ diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 1e64617edab8..465fc6f4eda0 100755 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -151,12 +151,12 @@ static SfxDispatcher* getDispatcher( ViewShellBase& rBase ) } com::sun::star::util::DateTime getCurrentDateTime() -{ +{ TimeValue osltime; osl_getSystemTime( &osltime ); oslDateTime osldt; osl_getDateTimeFromTimeValue( &osltime, &osldt ); - return com::sun::star::util::DateTime( 0, osldt.Seconds, osldt.Minutes, osldt.Hours, osldt.Day, osldt.Month, osldt.Year ); + return com::sun::star::util::DateTime( 0, osldt.Seconds, osldt.Minutes, osldt.Hours, osldt.Day, osldt.Month, osldt.Year ); } OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotation ) @@ -167,7 +167,7 @@ OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotatio const LocaleDataWrapper& rLocalData = SvtSysLocale().GetLocaleData(); com::sun::star::util::DateTime aDateTime( xAnnotation->getDateTime() ); - + Date aDate = Date( aDateTime.Day, aDateTime.Month, aDateTime.Year ); if (aDate==Date()) sRet = sRet + String(SdResId(STR_ANNOTATION_TODAY)); @@ -177,8 +177,8 @@ OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotatio else if (aDate.IsValid() ) sRet = sRet + rLocalData.getDate(aDate); - - Time aTime( aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.HundredthSeconds ); + + Time aTime( aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.HundredthSeconds ); if(aTime.GetTime() != 0) sRet = sRet + rtl::OUString::createFromAscii(" ") + rLocalData.getTime( aTime,false ); } @@ -196,7 +196,7 @@ AnnotationManagerImpl::AnnotationManagerImpl( ViewShellBase& rViewShellBase ) { SdOptions* pOptions = SD_MOD()->GetSdOptions(mpDoc->GetDocumentType()); if( pOptions ) - mbShowAnnotations = pOptions->IsShowComments() == TRUE; + mbShowAnnotations = pOptions->IsShowComments() == TRUE; } // -------------------------------------------------------------------- @@ -206,7 +206,7 @@ void AnnotationManagerImpl::init() // get current controller and initialize listeners try { - addListener(); + addListener(); mxView = Reference< XDrawView >::query(mrBase.GetController()); } catch( Exception& e ) @@ -223,7 +223,7 @@ void AnnotationManagerImpl::init() } catch( Exception& ) { - } + } } // -------------------------------------------------------------------- @@ -239,7 +239,7 @@ void SAL_CALL AnnotationManagerImpl::disposing () } catch( Exception& ) { - } + } removeListener(); DisposeTags(); @@ -255,7 +255,7 @@ void SAL_CALL AnnotationManagerImpl::disposing () } // -------------------------------------------------------------------- - + // XEventListener void SAL_CALL AnnotationManagerImpl::notifyEvent( const ::com::sun::star::document::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException) { @@ -280,9 +280,9 @@ void AnnotationManagerImpl::ShowAnnotations( bool bShow ) SdOptions* pOptions = SD_MOD()->GetSdOptions(mpDoc->GetDocumentType()); if( pOptions ) - pOptions->SetShowComments( mbShowAnnotations ? sal_True : sal_False ); - - UpdateTags(); + pOptions->SetShowComments( mbShowAnnotations ? sal_True : sal_False ); + + UpdateTags(); } } @@ -303,7 +303,7 @@ void AnnotationManagerImpl::ExecuteAnnotation(SfxRequest& rReq ) case SID_PREVIOUS_POSTIT: case SID_NEXT_POSTIT: SelectNextAnnotation( rReq.GetSlot() == SID_NEXT_POSTIT ); - break; + break; case SID_REPLYTO_POSTIT: ExecuteReplyToAnnotation( rReq ); break; @@ -318,7 +318,7 @@ void AnnotationManagerImpl::ExecuteAnnotation(SfxRequest& rReq ) void AnnotationManagerImpl::ExecuteInsertAnnotation(SfxRequest& /*rReq*/) { ShowAnnotations(true); - InsertAnnotation(); + InsertAnnotation(); } // -------------------------------------------------------------------- @@ -328,7 +328,7 @@ void AnnotationManagerImpl::ExecuteDeleteAnnotation(SfxRequest& rReq) ShowAnnotations( true ); const SfxItemSet* pArgs = rReq.GetArgs(); - + switch( rReq.GetSlot() ) { case SID_DELETEALL_POSTIT: @@ -345,12 +345,12 @@ void AnnotationManagerImpl::ExecuteDeleteAnnotation(SfxRequest& rReq) } } break; - case SID_DELETE_POSTIT: - { + case SID_DELETE_POSTIT: + { Reference< XAnnotation > xAnnotation; if( rReq.GetSlot() == SID_DELETE_POSTIT ) - { + { if( pArgs ) { const SfxPoolItem* pPoolItem = NULL; @@ -358,10 +358,10 @@ void AnnotationManagerImpl::ExecuteDeleteAnnotation(SfxRequest& rReq) ( ( const SfxUnoAnyItem* ) pPoolItem )->GetValue() >>= xAnnotation; } } - - if( !xAnnotation.is() ) + + if( !xAnnotation.is() ) GetSelectedAnnotation( xAnnotation ); - + DeleteAnnotation( xAnnotation ); } break; @@ -379,23 +379,23 @@ void AnnotationManagerImpl::InsertAnnotation() { if( mpDoc->IsUndoEnabled() ) mpDoc->BegUndo( String( SdResId( STR_ANNOTATION_UNDO_INSERT ) ) ); - + // find free space for new annotation int y = 0, x = 0; - + AnnotationVector aAnnotations( pPage->getAnnotations() ); if( !aAnnotations.empty() ) - { + { const int page_width = pPage->GetSize().Width(); const int width = 1000; const int height = 800; Rectangle aTagRect; - + while( true ) - { + { Rectangle aNewRect( x, y, x + width - 1, y + height - 1 ); bool bFree = true; - + for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); iter++ ) { RealPoint2D aPoint( (*iter)->getPosition() ); @@ -403,14 +403,14 @@ void AnnotationManagerImpl::InsertAnnotation() aTagRect.nTop = sal::static_int_cast< long >( aPoint.Y * 100.0 ); aTagRect.nRight = aTagRect.nLeft + width - 1; aTagRect.nBottom = aTagRect.nTop + height - 1; - + if( aNewRect.IsOver( aTagRect ) ) { bFree = false; break; } } - + if( bFree == false) { x += width; @@ -418,32 +418,32 @@ void AnnotationManagerImpl::InsertAnnotation() { x = 0; y += height; - } + } } else { break; } } - } - + } + Reference< XAnnotation > xAnnotation; pPage->createAnnotation( xAnnotation ); - + // set current author to new annotation SvtUserOptions aUserOptions; xAnnotation->setAuthor( aUserOptions.GetFullName() ); - + // set current time to new annotation xAnnotation->setDateTime( getCurrentDateTime() ); - + // set position RealPoint2D aPos( ((double)x) / 100.0, ((double)y) / 100.0 ); xAnnotation->setPosition( aPos ); if( mpDoc->IsUndoEnabled() ) mpDoc->EndUndo(); - + UpdateTags(true); SelectAnnotation( xAnnotation, true ); } @@ -467,7 +467,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) if( pTextApi ) { std::auto_ptr< ::Outliner > pOutliner( new ::Outliner(GetAnnotationPool(),OUTLINERMODE_TEXTOBJECT) ); - + mpDoc->SetCalcFieldValueHdl( pOutliner.get() ); pOutliner->SetUpdateMode( TRUE ); @@ -475,7 +475,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) OUString sAuthor( xAnnotation->getAuthor() ); if( sAuthor.getLength() == 0 ) sAuthor = String( SdResId( STR_ANNOTATION_NOAUTHOR ) ); - + aStr.SearchAndReplaceAscii("%1", sAuthor); aStr.Append( String(RTL_CONSTASCII_USTRINGPARAM(" (") ) ); @@ -488,32 +488,32 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) sQuote = String( RTL_CONSTASCII_USTRINGPARAM( "..." ) ); aStr.Append( sQuote ); aStr.Append( String(RTL_CONSTASCII_USTRINGPARAM("\"\n") ) ); - + USHORT nParaCount = aStr.GetTokenCount( '\n' ); for( USHORT nPara = 0; nPara < nParaCount; nPara++ ) pOutliner->Insert( aStr.GetToken( nPara, '\n' ), LIST_APPEND, -1 ); - + if( pOutliner->GetParagraphCount() > 1 ) { SfxItemSet aAnswerSet( pOutliner->GetEmptyItemSet() ); - aAnswerSet.Put(SvxPostureItem(ITALIC_NORMAL,EE_CHAR_ITALIC)); - + aAnswerSet.Put(SvxPostureItem(ITALIC_NORMAL,EE_CHAR_ITALIC)); + ESelection aSel; aSel.nEndPara = (USHORT)pOutliner->GetParagraphCount()-2; aSel.nEndPos = pOutliner->GetText( pOutliner->GetParagraph( aSel.nEndPara ) ).Len(); - + pOutliner->QuickSetAttribs( aAnswerSet, aSel ); } - + std::auto_ptr< OutlinerParaObject > pOPO( pOutliner->CreateParaObject() ); pTextApi->SetText( *pOPO.get() ); - + SvtUserOptions aUserOptions; - xAnnotation->setAuthor( aUserOptions.GetFullName() ); + xAnnotation->setAuthor( aUserOptions.GetFullName() ); // set current time to reply xAnnotation->setDateTime( getCurrentDateTime() ); - + UpdateTags(true); SelectAnnotation( xAnnotation, true ); } @@ -522,7 +522,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) // -------------------------------------------------------------------- void AnnotationManagerImpl::DeleteAnnotation( Reference< XAnnotation > xAnnotation ) -{ +{ SdPage* pPage = GetCurrentPage(); if( xAnnotation.is() && pPage ) @@ -548,9 +548,9 @@ void AnnotationManagerImpl::DeleteAnnotationsByAuthor( const rtl::OUString& sAut do { pPage = GetNextPage( pPage, true ); - + if( pPage && !pPage->getAnnotations().empty() ) - { + { AnnotationVector aAnnotations( pPage->getAnnotations() ); for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); iter++ ) { @@ -578,14 +578,14 @@ void AnnotationManagerImpl::DeleteAllAnnotations() do { pPage = GetNextPage( pPage, true ); - + if( pPage && !pPage->getAnnotations().empty() ) - { + { AnnotationVector aAnnotations( pPage->getAnnotations() ); for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); iter++ ) { - pPage->removeAnnotation( (*iter) ); + pPage->removeAnnotation( (*iter) ); } } } @@ -602,31 +602,31 @@ void AnnotationManagerImpl::DeleteAllAnnotations() void AnnotationManagerImpl::GetAnnotationState(SfxItemSet& rSet) { SdPage* pCurrentPage = GetCurrentPage(); - + const bool bReadOnly = mrBase.GetDocShell()->IsReadOnly(); const bool bWrongPageKind = (pCurrentPage == 0) || (pCurrentPage->GetPageKind() != PK_STANDARD); - + const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion( SvtSaveOptions().GetODFDefaultVersion() ); if( bReadOnly || bWrongPageKind || (nCurrentODFVersion != SvtSaveOptions::ODFVER_LATEST) ) - rSet.DisableItem( SID_INSERT_POSTIT ); + rSet.DisableItem( SID_INSERT_POSTIT ); rSet.Put(SfxBoolItem(SID_SHOW_POSTIT, mbShowAnnotations)); - + Reference< XAnnotation > xAnnotation; GetSelectedAnnotation( xAnnotation ); - + if( !xAnnotation.is() || bReadOnly ) - rSet.DisableItem( SID_DELETE_POSTIT ); + rSet.DisableItem( SID_DELETE_POSTIT ); SdPage* pPage = 0; - + bool bHasAnnotations = false; do { pPage = GetNextPage( pPage, true ); - - if( pPage && !pPage->getAnnotations().empty() ) + + if( pPage && !pPage->getAnnotations().empty() ) bHasAnnotations = true; } while( pPage && !bHasAnnotations ); @@ -634,7 +634,7 @@ void AnnotationManagerImpl::GetAnnotationState(SfxItemSet& rSet) if( !bHasAnnotations || bReadOnly ) { rSet.DisableItem( SID_DELETEALL_POSTIT ); - } + } if( bWrongPageKind || !bHasAnnotations ) { @@ -682,7 +682,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) } } else - { + { if( xCurrent.is() ) { for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); iter++ ) @@ -701,7 +701,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) } } else if( !aAnnotations.empty() ) - { + { AnnotationVector::iterator iter( aAnnotations.end() ); SelectAnnotation( *(--iter) ); return; @@ -714,8 +714,8 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) do { pPage = GetNextPage( pPage, bForeward ); - - if( pPage && !pPage->getAnnotations().empty() ) + + if( pPage && !pPage->getAnnotations().empty() ) { // switch to next/previous slide with annotations ::boost::shared_ptr<DrawViewShell> pDrawViewShell(::boost::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell())); @@ -723,17 +723,17 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) { pDrawViewShell->ChangeEditMode(pPage->IsMasterPage() ? EM_MASTERPAGE : EM_PAGE, FALSE); pDrawViewShell->SwitchPage((pPage->GetPageNum() - 1) >> 1); - + SfxDispatcher* pDispatcher = getDispatcher( mrBase ); if( pDispatcher ) pDispatcher->Execute( bForeward ? SID_NEXT_POSTIT : SID_PREVIOUS_POSTIT ); - + return; - } + } } } while( pPage ); - + // The question text depends on the search direction. bool bImpress = mpDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS; sal_uInt16 nStringId; @@ -758,7 +758,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) // -------------------------------------------------------------------- -void AnnotationManagerImpl::onTagSelected( AnnotationTag& rTag ) +void AnnotationManagerImpl::onTagSelected( AnnotationTag& rTag ) { mxSelectedAnnotation = rTag.GetAnnotation(); invalidateSlots(); @@ -778,14 +778,14 @@ void AnnotationManagerImpl::onTagDeselected( AnnotationTag& rTag ) // -------------------------------------------------------------------- void AnnotationManagerImpl::SelectAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, bool bEdit /* = FALSE */ ) -{ +{ mxSelectedAnnotation = xAnnotation; - + for( AnnotationTagVector::iterator iter( maTagVector.begin() ); iter != maTagVector.end(); iter++ ) { if( (*iter)->GetAnnotation() == xAnnotation ) { - SmartTagReference xTag( (*iter).get() ); + SmartTagReference xTag( (*iter).get() ); mrBase.GetMainViewShell()->GetView()->getSmartTags().select( xTag ); (*iter)->OpenPopup( bEdit ); break; @@ -809,8 +809,8 @@ void AnnotationManagerImpl::invalidateSlots() pBindings->Invalidate( SID_DELETE_POSTIT ); pBindings->Invalidate( SID_DELETEALL_POSTIT ); pBindings->Invalidate( SID_PREVIOUS_POSTIT ); - pBindings->Invalidate( SID_NEXT_POSTIT ); - pBindings->Invalidate( SID_UNDO ); + pBindings->Invalidate( SID_NEXT_POSTIT ); + pBindings->Invalidate( SID_UNDO ); pBindings->Invalidate( SID_REDO ); } } @@ -826,9 +826,9 @@ void AnnotationManagerImpl::onSelectionChanged() if( xPage != mxCurrentPage ) { mxCurrentPage = xPage; - + UpdateTags(true); - } + } } catch( Exception& ) { @@ -842,7 +842,7 @@ void AnnotationManagerImpl::UpdateTags( bool bSynchron ) { if( mnUpdateTagsEvent ) Application::RemoveUserEvent( mnUpdateTagsEvent ); - + UpdateTagsHdl(0); } else @@ -856,15 +856,15 @@ IMPL_LINK(AnnotationManagerImpl,UpdateTagsHdl, void *, EMPTYARG) { mnUpdateTagsEvent = 0; DisposeTags(); - + if( mbShowAnnotations ) CreateTags(); - + if( mrBase.GetDrawView() ) - static_cast< ::sd::View* >( mrBase.GetDrawView() )->updateHandles(); + static_cast< ::sd::View* >( mrBase.GetDrawView() )->updateHandles(); invalidateSlots(); - + return 0; } @@ -877,7 +877,7 @@ void AnnotationManagerImpl::CreateTags() maFont = Application::GetSettings().GetStyleSettings().GetAppFont(); rtl::Reference< AnnotationTag > xSelectedTag; - + Reference< XAnnotationEnumeration > xEnum( mxCurrentPage->createAnnotationEnumeration() ); while( xEnum->hasMoreElements() ) { @@ -885,16 +885,16 @@ void AnnotationManagerImpl::CreateTags() Color aColor( GetColorLight( mpDoc->GetAnnotationAuthorIndex( xAnnotation->getAuthor() ) ) ); rtl::Reference< AnnotationTag > xTag( new AnnotationTag( *this, *mrBase.GetMainViewShell()->GetView(), xAnnotation, aColor, nIndex++, maFont ) ); maTagVector.push_back(xTag); - + if( xAnnotation == mxSelectedAnnotation ) { xSelectedTag = xTag; } } - + if( xSelectedTag.is() ) { - SmartTagReference xTag( xSelectedTag.get() ); + SmartTagReference xTag( xSelectedTag.get() ); mrBase.GetMainViewShell()->GetView()->getSmartTags().select( xTag ); } else @@ -921,7 +921,7 @@ void AnnotationManagerImpl::DisposeTags() (*iter++)->Dispose(); } while( iter != maTagVector.end() ); - + maTagVector.clear(); } } @@ -979,19 +979,19 @@ OUString AnnotationManagerImpl::GetHelpText( ::com::sun::star::uno::Reference< : { OUString sAuthor( xAnnotation->getAuthor() ); if( sAuthor.getLength() != 0 ) - { + { sRet += sAuthor; } sRet += OUString( RTL_CONSTASCII_USTRINGPARAM( " [" ) ); - + sRet += getAnnotationDateTimeString( xAnnotation ); sRet += OUString( RTL_CONSTASCII_USTRINGPARAM( "]\n" ) ); - + Reference< XText > xText( xAnnotation->getTextRange() ); if( xText.is() ) sRet += xText->getString(); } - + return sRet; } #endif @@ -1001,29 +1001,29 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation SfxDispatcher* pDispatcher( getDispatcher( mrBase ) ); if( !pDispatcher ) return; - + const bool bReadOnly = mrBase.GetDocShell()->IsReadOnly(); - + AnnotationWindow* pAnnotationWindow = bButtonMenu ? 0 : dynamic_cast< AnnotationWindow* >( pParent ); - + if( bReadOnly && !pAnnotationWindow ) return; - + std::auto_ptr< PopupMenu > pMenu( new PopupMenu( SdResId( pAnnotationWindow ? RID_ANNOTATION_CONTEXTMENU : RID_ANNOTATION_TAG_CONTEXTMENU ) ) ); SvtUserOptions aUserOptions; - OUString sCurrentAuthor( aUserOptions.GetFullName() ); + OUString sCurrentAuthor( aUserOptions.GetFullName() ); OUString sAuthor( xAnnotation->getAuthor() ); - + String aStr( pMenu->GetItemText( SID_DELETEALLBYAUTHOR_POSTIT ) ), aReplace( sAuthor ); if( aReplace.Len() == 0 ) aReplace = String( SdResId( STR_ANNOTATION_NOAUTHOR ) ); aStr.SearchAndReplaceAscii("%1", aReplace); pMenu->SetItemText( SID_DELETEALLBYAUTHOR_POSTIT, aStr ); pMenu->EnableItem( SID_REPLYTO_POSTIT, (sAuthor != sCurrentAuthor) && !bReadOnly ); - pMenu->EnableItem( SID_DELETE_POSTIT, (xAnnotation.is() && !bReadOnly) ? TRUE : FALSE ); - pMenu->EnableItem( SID_DELETEALLBYAUTHOR_POSTIT, !bReadOnly ); - pMenu->EnableItem( SID_DELETEALL_POSTIT, !bReadOnly ); + pMenu->EnableItem( SID_DELETE_POSTIT, (xAnnotation.is() && !bReadOnly) ? TRUE : FALSE ); + pMenu->EnableItem( SID_DELETEALLBYAUTHOR_POSTIT, !bReadOnly ); + pMenu->EnableItem( SID_DELETEALL_POSTIT, !bReadOnly ); if( pAnnotationWindow ) { @@ -1038,18 +1038,18 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation else { SfxItemSet aSet(pAnnotationWindow->getView()->GetAttribs()); - + if ( aSet.GetItemState( EE_CHAR_WEIGHT ) == SFX_ITEM_ON ) { if( ((const SvxWeightItem&)aSet.Get( EE_CHAR_WEIGHT )).GetWeight() == WEIGHT_BOLD ) pMenu->CheckItem( SID_ATTR_CHAR_WEIGHT ); } - + if ( aSet.GetItemState( EE_CHAR_ITALIC ) == SFX_ITEM_ON ) { if( ((const SvxPostureItem&)aSet.Get( EE_CHAR_ITALIC )).GetPosture() != ITALIC_NONE ) pMenu->CheckItem( SID_ATTR_CHAR_POSTURE ); - + } if ( aSet.GetItemState( EE_CHAR_UNDERLINE ) == SFX_ITEM_ON ) { @@ -1065,12 +1065,12 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pAnnotationWindow ) ); pMenu->EnableItem( SID_PASTE, aDataHelper.GetFormatCount() != 0 ); } - + pMenu->EnableItem( SID_COPY, pAnnotationWindow->getView()->HasSelection() ); } USHORT nId = 0; - + // set slot images Reference< ::com::sun::star::frame::XFrame > xFrame( mrBase.GetMainViewShell()->GetViewFrame()->GetFrame().GetFrameInterface() ); if( xFrame.is() ) @@ -1078,12 +1078,12 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation const bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); for( USHORT nPos = 0; nPos < pMenu->GetItemCount(); nPos++ ) { - nId = pMenu->GetItemId( nPos ); + nId = pMenu->GetItemId( nPos ); if( pMenu->IsItemEnabled( nId ) ) { OUString sSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); sSlotURL += OUString::valueOf( sal_Int32( nId )); - + Image aImage( GetImage( xFrame, sSlotURL, false, bHighContrast ) ); if( !!aImage ) pMenu->SetItemImage( nId, aImage ); @@ -1114,10 +1114,10 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation } case SID_DELETEALL_POSTIT: pDispatcher->Execute( SID_DELETEALL_POSTIT ); - break; + break; case SID_COPY: case SID_PASTE: - case SID_ATTR_CHAR_WEIGHT: + case SID_ATTR_CHAR_WEIGHT: case SID_ATTR_CHAR_POSTURE: case SID_ATTR_CHAR_UNDERLINE: case SID_ATTR_CHAR_STRIKEOUT: @@ -1134,9 +1134,9 @@ Color AnnotationManagerImpl::GetColor(sal_uInt16 aAuthorIndex) if (!Application::GetSettings().GetStyleSettings().GetHighContrastMode()) { static const Color aArrayNormal[] = { - COL_AUTHOR1_NORMAL, COL_AUTHOR2_NORMAL, COL_AUTHOR3_NORMAL, - COL_AUTHOR4_NORMAL, COL_AUTHOR5_NORMAL, COL_AUTHOR6_NORMAL, - COL_AUTHOR7_NORMAL, COL_AUTHOR8_NORMAL, COL_AUTHOR9_NORMAL }; + COL_AUTHOR1_NORMAL, COL_AUTHOR2_NORMAL, COL_AUTHOR3_NORMAL, + COL_AUTHOR4_NORMAL, COL_AUTHOR5_NORMAL, COL_AUTHOR6_NORMAL, + COL_AUTHOR7_NORMAL, COL_AUTHOR8_NORMAL, COL_AUTHOR9_NORMAL }; return Color( aArrayNormal[ aAuthorIndex % (sizeof( aArrayNormal )/ sizeof( aArrayNormal[0] ))]); } @@ -1149,9 +1149,9 @@ Color AnnotationManagerImpl::GetColorLight(sal_uInt16 aAuthorIndex) if (!Application::GetSettings().GetStyleSettings().GetHighContrastMode()) { static const Color aArrayLight[] = { - COL_AUTHOR1_LIGHT, COL_AUTHOR2_LIGHT, COL_AUTHOR3_LIGHT, - COL_AUTHOR4_LIGHT, COL_AUTHOR5_LIGHT, COL_AUTHOR6_LIGHT, - COL_AUTHOR7_LIGHT, COL_AUTHOR8_LIGHT, COL_AUTHOR9_LIGHT }; + COL_AUTHOR1_LIGHT, COL_AUTHOR2_LIGHT, COL_AUTHOR3_LIGHT, + COL_AUTHOR4_LIGHT, COL_AUTHOR5_LIGHT, COL_AUTHOR6_LIGHT, + COL_AUTHOR7_LIGHT, COL_AUTHOR8_LIGHT, COL_AUTHOR9_LIGHT }; return Color( aArrayLight[ aAuthorIndex % (sizeof( aArrayLight )/ sizeof( aArrayLight[0] ))]); } @@ -1164,11 +1164,11 @@ Color AnnotationManagerImpl::GetColorDark(sal_uInt16 aAuthorIndex) if (!Application::GetSettings().GetStyleSettings().GetHighContrastMode()) { static const Color aArrayAnkor[] = { - COL_AUTHOR1_DARK, COL_AUTHOR2_DARK, COL_AUTHOR3_DARK, - COL_AUTHOR4_DARK, COL_AUTHOR5_DARK, COL_AUTHOR6_DARK, - COL_AUTHOR7_DARK, COL_AUTHOR8_DARK, COL_AUTHOR9_DARK }; + COL_AUTHOR1_DARK, COL_AUTHOR2_DARK, COL_AUTHOR3_DARK, + COL_AUTHOR4_DARK, COL_AUTHOR5_DARK, COL_AUTHOR6_DARK, + COL_AUTHOR7_DARK, COL_AUTHOR8_DARK, COL_AUTHOR9_DARK }; - return Color( aArrayAnkor[ aAuthorIndex % (sizeof( aArrayAnkor ) / sizeof( aArrayAnkor[0] ))]); + return Color( aArrayAnkor[ aAuthorIndex % (sizeof( aArrayAnkor ) / sizeof( aArrayAnkor[0] ))]); } else return Color(COL_WHITE); @@ -1178,14 +1178,14 @@ SdPage* AnnotationManagerImpl::GetNextPage( SdPage* pPage, bool bForeward ) { if( pPage == 0 ) return bForeward ? GetFirstPage() : GetLastPage(); - + sal_uInt16 nPageNum = (pPage->GetPageNum() - 1) >> 1; // first all non master pages if( !pPage->IsMasterPage() ) { if( bForeward ) - { + { if( nPageNum >= mpDoc->GetSdPageCount(PK_STANDARD)-1 ) { // we reached end of draw pages, start with master pages (skip handout master for draw) @@ -1197,15 +1197,15 @@ SdPage* AnnotationManagerImpl::GetNextPage( SdPage* pPage, bool bForeward ) { if( nPageNum == 0 ) return 0; // we are already on the first draw page, finished - - nPageNum--; + + nPageNum--; } return mpDoc->GetSdPage(nPageNum, PK_STANDARD); } else { if( bForeward ) - { + { if( nPageNum >= mpDoc->GetMasterSdPageCount(PK_STANDARD)-1 ) { return 0; // we reached the end, there is nothing more to see here @@ -1218,12 +1218,12 @@ SdPage* AnnotationManagerImpl::GetNextPage( SdPage* pPage, bool bForeward ) { // we reached beginning of master pages, start with end if pages return mpDoc->GetSdPage( mpDoc->GetSdPageCount(PK_STANDARD)-1, PK_STANDARD ); - } - - nPageNum--; + } + + nPageNum--; } return mpDoc->GetMasterSdPage(nPageNum,PK_STANDARD); - } + } } SdPage* AnnotationManagerImpl::GetFirstPage() diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index 70b95c2a509b..06e57d7888c2 100755 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,34 +49,34 @@ typedef std::vector< rtl::Reference< AnnotationTag > > AnnotationTagVector; namespace tools { class EventMultiplexerEvent; -} +} typedef ::cppu::WeakComponentImplHelper1 < com::sun::star::document::XEventListener > AnnotationManagerImplBase; - + class AnnotationManagerImpl : private ::cppu::BaseMutex, public AnnotationManagerImplBase { public: AnnotationManagerImpl( ViewShellBase& rViewShellBase ); - + void init(); // WeakComponentImplHelper1 virtual void SAL_CALL disposing (); - + // XEventListener virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); - // + // void ExecuteAnnotation (SfxRequest& rRequest); void GetAnnotationState (SfxItemSet& rItemSet); - + void ExecuteInsertAnnotation(SfxRequest& rReq); - void ExecuteDeleteAnnotation(SfxRequest& rReq); + void ExecuteDeleteAnnotation(SfxRequest& rReq); void ExecuteReplyToAnnotation(SfxRequest& rReq); - + void SelectNextAnnotation(bool bForeward); void SelectAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, bool bEdit = FALSE ); @@ -88,16 +88,16 @@ public: void DeleteAllAnnotations(); void ExecuteAnnotationContextMenu( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, ::Window* pParent, const Rectangle& rContextRect, bool bButtonMenu = false ); - + Color GetColorDark(sal_uInt16 aAuthorIndex); Color GetColorLight(sal_uInt16 aAuthorIndex); Color GetColor(sal_uInt16 aAuthorIndex); - + // callbacks - void onTagSelected( AnnotationTag& rTag ); + void onTagSelected( AnnotationTag& rTag ); void onTagDeselected( AnnotationTag& rTag ); - + void onSelectionChanged(); #if 0 rtl::OUString GetHelpText( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation ); @@ -117,18 +117,18 @@ public: SdPage* GetNextPage( SdPage* pPage, bool bForeward ); SdPage* GetFirstPage(); SdPage* GetLastPage(); - + SdPage* GetCurrentPage(); SdDrawDocument* GetDoc() { return mpDoc; } - + void ShowAnnotations(bool bShow); - + private: ViewShellBase& mrBase; SdDrawDocument* mpDoc; - - AnnotationTagVector maTagVector; + + AnnotationTagVector maTagVector; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawView > mxView; ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotationAccess > mxCurrentPage; diff --git a/sd/source/ui/annotations/annotations.hrc b/sd/source/ui/annotations/annotations.hrc index d2969f91be41..c3f82ea3d271 100644 --- a/sd/source/ui/annotations/annotations.hrc +++ b/sd/source/ui/annotations/annotations.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,35 +31,35 @@ #include "glob.hrc" // strings -#define STR_ANNOTATION_TODAY (RID_ANNOTATIONS_START+1) -#define STR_ANNOTATION_YESTERDAY (RID_ANNOTATIONS_START+2) -#define STR_ANNOTATION_NOAUTHOR (RID_ANNOTATIONS_START+3) -#define STR_ANNOTATION_WRAP_FORWARD (RID_ANNOTATIONS_START+4) -#define STR_ANNOTATION_WRAP_BACKWARD (RID_ANNOTATIONS_START+5) -#define STR_ANNOTATION_WRAP_FORWARD_DRAW (RID_ANNOTATIONS_START+6) -#define STR_ANNOTATION_WRAP_BACKWARD_DRAW (RID_ANNOTATIONS_START+7) -#define STR_ANNOTATION_UNDO_INSERT (RID_ANNOTATIONS_START+8) -#define STR_ANNOTATION_UNDO_DELETE (RID_ANNOTATIONS_START+9) -#define STR_ANNOTATION_UNDO_MOVE (RID_ANNOTATIONS_START+10) -#define STR_ANNOTATION_UNDO_EDIT (RID_ANNOTATIONS_START+11) -#define STR_ANNOTATION_UNDO_REPLY (RID_ANNOTATIONS_START+12) -#define STR_ANNOTATION_REPLY (RID_ANNOTATIONS_START+13) +#define STR_ANNOTATION_TODAY (RID_ANNOTATIONS_START+1) +#define STR_ANNOTATION_YESTERDAY (RID_ANNOTATIONS_START+2) +#define STR_ANNOTATION_NOAUTHOR (RID_ANNOTATIONS_START+3) +#define STR_ANNOTATION_WRAP_FORWARD (RID_ANNOTATIONS_START+4) +#define STR_ANNOTATION_WRAP_BACKWARD (RID_ANNOTATIONS_START+5) +#define STR_ANNOTATION_WRAP_FORWARD_DRAW (RID_ANNOTATIONS_START+6) +#define STR_ANNOTATION_WRAP_BACKWARD_DRAW (RID_ANNOTATIONS_START+7) +#define STR_ANNOTATION_UNDO_INSERT (RID_ANNOTATIONS_START+8) +#define STR_ANNOTATION_UNDO_DELETE (RID_ANNOTATIONS_START+9) +#define STR_ANNOTATION_UNDO_MOVE (RID_ANNOTATIONS_START+10) +#define STR_ANNOTATION_UNDO_EDIT (RID_ANNOTATIONS_START+11) +#define STR_ANNOTATION_UNDO_REPLY (RID_ANNOTATIONS_START+12) +#define STR_ANNOTATION_REPLY (RID_ANNOTATIONS_START+13) // menus -#define RID_ANNOTATION_CONTEXTMENU (RID_ANNOTATIONS_START+0) -#define RID_ANNOTATION_TAG_CONTEXTMENU (RID_ANNOTATIONS_START+1) +#define RID_ANNOTATION_CONTEXTMENU (RID_ANNOTATIONS_START+0) +#define RID_ANNOTATION_TAG_CONTEXTMENU (RID_ANNOTATIONS_START+1) -#define BTN_NEW 1 -#define BTN_DELETE 2 -#define BTN_NEXT 3 -#define BTN_PREV 4 +#define BTN_NEW 1 +#define BTN_DELETE 2 +#define BTN_NEXT 3 +#define BTN_PREV 4 -#define TBX_TOOLBAR 1 -#define FT_AUTHOR 1 -#define ED_AUTHOR 2 -#define FT_DATE 3 -#define ED_DATE 4 +#define TBX_TOOLBAR 1 +#define FT_AUTHOR 1 +#define ED_AUTHOR 2 +#define FT_DATE 3 +#define ED_DATE 4 -#define CT_TEXT 5 +#define CT_TEXT 5 #endif // _SD_ANNOTATIONPANE_HRC diff --git a/sd/source/ui/annotations/annotations.src b/sd/source/ui/annotations/annotations.src index 0ca43731d6b0..369bd02a46ae 100644 --- a/sd/source/ui/annotations/annotations.src +++ b/sd/source/ui/annotations/annotations.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ Menu RID_ANNOTATION_CONTEXTMENU MenuItem { Separator = TRUE; - }; + }; MenuItem { Identifier = SID_COPY ; @@ -121,7 +121,7 @@ Menu RID_ANNOTATION_TAG_CONTEXTMENU MenuItem { Separator = TRUE; - }; + }; MenuItem { Identifier = SID_DELETE_POSTIT ; diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 6439245a94c0..b6c943cf377f 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,7 +90,7 @@ static OUString getInitials( const OUString& rName ) // take letter if( nLength ) { - sInitials += OUString( *pStr ); + sInitials += OUString( *pStr ); nLength--; pStr++; } @@ -142,10 +142,10 @@ bool AnnotationDragMove::BeginSdrDrag() void AnnotationDragMove::MoveSdrDrag(const Point& rNoSnapPnt) { Point aPnt(rNoSnapPnt); - - if (DragStat().CheckMinMoved(rNoSnapPnt)) + + if (DragStat().CheckMinMoved(rNoSnapPnt)) { - if (aPnt!=DragStat().GetNow()) + if (aPnt!=DragStat().GetNow()) { Hide(); DragStat().NextMove(aPnt); @@ -212,12 +212,12 @@ void AnnotationHdl::CreateB2dIAObject() if( mxAnnotation.is() ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - + const Point aTagPos( GetPos() ); basegfx::B2DPoint aPosition( aTagPos.X(), aTagPos.Y() ); const bool bFocused = IsFocusHdl() && pHdlList && (pHdlList->GetFocusHdl() == this); - + BitmapEx aBitmapEx( mxTag->CreateAnnotationBitmap(mxTag->isSelected()) ); BitmapEx aBitmapEx2; if( bFocused ) @@ -249,18 +249,18 @@ void AnnotationHdl::CreateB2dIAObject() const sal_uInt32 nBlinkTime = sal::static_int_cast<sal_uInt32>(rStyleSettings.GetCursorBlinkTime()); pOverlayObject = new ::sdr::overlay::OverlayAnimatedBitmapEx(aPosition, aBitmapEx, aBitmapEx2, nBlinkTime, 0, 0, 0, 0 ); -/* - (UINT16)(aBitmapEx.GetSizePixel().Width() - 1) >> 1, +/* + (UINT16)(aBitmapEx.GetSizePixel().Width() - 1) >> 1, (UINT16)(aBitmapEx.GetSizePixel().Height() - 1) >> 1, - (UINT16)(aBitmapEx2.GetSizePixel().Width() - 1) >> 1, + (UINT16)(aBitmapEx2.GetSizePixel().Width() - 1) >> 1, (UINT16)(aBitmapEx2.GetSizePixel().Height() - 1) >> 1); -*/ +*/ } else { pOverlayObject = new ::sdr::overlay::OverlayBitmapEx( aPosition, aBitmapEx, 0, 0 ); } - + rPageWindow.GetOverlayManager()->add(*pOverlayObject); maOverlayGroup.append(*pOverlayObject); } @@ -350,21 +350,21 @@ bool AnnotationTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& /*rHdl*/ } else */ if( rMEvt.IsLeft() && !rMEvt.IsRight() ) - { + { Window* pWindow = mrView.GetViewShell()->GetActiveWindow(); if( pWindow ) { maMouseDownPos = pWindow->PixelToLogic( rMEvt.GetPosPixel() ); - + if( mpListenWindow ) mpListenWindow->RemoveEventListener( LINK(this, AnnotationTag, WindowEventHandler)); - + mpListenWindow = pWindow; - mpListenWindow->AddEventListener( LINK(this, AnnotationTag, WindowEventHandler)); + mpListenWindow->AddEventListener( LINK(this, AnnotationTag, WindowEventHandler)); } bRet = true; - } + } return bRet; } @@ -417,40 +417,40 @@ bool AnnotationTag::RequestHelp( const HelpEvent& /*rHEvt*/ ) /* ::Window* pWindow = mrView.GetViewShell()->GetActiveWindow(); if( mxAnnotation.is() && pWindow ) - { + { OUString aHelpText( mrManager.GetHelpText( mxAnnotation ) ); RealPoint2D aPosition( mxAnnotation->getPosition() ); Point aPos( pWindow->LogicToPixel( Point( static_cast<long>(aPosition.X * 100.0), static_cast<long>(aPosition.Y * 100.0) ) ) ); - Rectangle aRect( aPos, maSize ); + Rectangle aRect( aPos, maSize ); if (Help::IsBalloonHelpEnabled()) Help::ShowBalloon( pWindow, aPos, aRect, aHelpText); else if (Help::IsQuickHelpEnabled()) Help::ShowQuickHelp( pWindow, aRect, aHelpText); - + return true; } -*/ - return false; +*/ + return false; } /** returns true if the SmartTag consumes this event. */ bool AnnotationTag::Command( const CommandEvent& rCEvt ) { if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU ) - { + { ::Window* pWindow = mrView.GetViewShell()->GetActiveWindow(); if( pWindow ) { Rectangle aContextRect(rCEvt.GetMousePosPixel(),Size(1,1)); - mrManager.ExecuteAnnotationContextMenu( mxAnnotation, pWindow, aContextRect ); + mrManager.ExecuteAnnotationContextMenu( mxAnnotation, pWindow, aContextRect ); return true; } } - - return false; + + return false; } void AnnotationTag::Move( int nDX, int nDY ) @@ -459,7 +459,7 @@ void AnnotationTag::Move( int nDX, int nDY ) { if( mrManager.GetDoc()->IsUndoEnabled() ) mrManager.GetDoc()->BegUndo( String( SdResId( STR_ANNOTATION_UNDO_MOVE ) ) ); - + RealPoint2D aPosition( mxAnnotation->getPosition() ); aPosition.X += (double)nDX / 100.0; aPosition.Y += (double)nDY / 100.0; @@ -479,10 +479,10 @@ bool AnnotationTag::OnMove( const KeyEvent& rKEvt ) switch( rKEvt.GetKeyCode().GetCode() ) { - case KEY_UP: nY = -1; break; - case KEY_DOWN: nY = 1; break; - case KEY_LEFT: nX = -1; break; - case KEY_RIGHT: nX = 1; break; + case KEY_UP: nY = -1; break; + case KEY_DOWN: nY = 1; break; + case KEY_LEFT: nX = -1; break; + case KEY_RIGHT: nX = 1; break; default: break; } @@ -597,15 +597,15 @@ void AnnotationTag::disposing() void AnnotationTag::select() { SmartTag::select(); - + mrManager.onTagSelected( *this ); - + Window* pWindow = mrView.GetViewShell()->GetActiveWindow(); if( pWindow ) { RealPoint2D aPosition( mxAnnotation->getPosition() ); Point aPos( static_cast<long>(aPosition.X * 100.0), static_cast<long>(aPosition.Y * 100.0) ); - + Rectangle aVisRect( aPos, pWindow->PixelToLogic(maSize) ); mrView.MakeVisible(aVisRect, *pWindow); } @@ -617,7 +617,7 @@ void AnnotationTag::deselect() { SmartTag::deselect(); - ClosePopup(); + ClosePopup(); mrManager.onTagDeselected( *this ); } @@ -674,37 +674,37 @@ void AnnotationTag::OpenPopup( bool bEdit ) { if( !mxAnnotation.is() ) return; - + if( !mpAnnotationWindow.get() ) - { + { ::Window* pWindow = dynamic_cast< ::Window* >( getView().GetFirstOutputDevice() ); if( pWindow ) { RealPoint2D aPosition( mxAnnotation->getPosition() ); Point aPos( pWindow->OutputToScreenPixel( pWindow->LogicToPixel( Point( static_cast<long>(aPosition.X * 100.0), static_cast<long>(aPosition.Y * 100.0) ) ) ) ); - + aPos.X() += 4; // magic! aPos.Y() += 1; - + Rectangle aRect( aPos, maSize ); - mpAnnotationWindow.reset( new AnnotationWindow( mrManager, mrView.GetDocSh(), pWindow->GetWindow(WINDOW_FRAME) ) ); + mpAnnotationWindow.reset( new AnnotationWindow( mrManager, mrView.GetDocSh(), pWindow->GetWindow(WINDOW_FRAME) ) ); mpAnnotationWindow->InitControls(); mpAnnotationWindow->setAnnotation(mxAnnotation); - + USHORT nArrangeIndex = 0; Point aPopupPos( FloatingWindow::CalcFloatingPosition( mpAnnotationWindow.get(), aRect, FLOATWIN_POPUPMODE_RIGHT, nArrangeIndex ) ); Size aPopupSize( 320, 240 ); mpAnnotationWindow->SetPosSizePixel( aPopupPos, aPopupSize ); mpAnnotationWindow->DoResize(); - + mpAnnotationWindow->Show(); mpAnnotationWindow->GrabFocus(); mpAnnotationWindow->AddEventListener( LINK(this, AnnotationTag, WindowEventHandler)); } } - + if( bEdit && mpAnnotationWindow.get() ) mpAnnotationWindow->StartEdit(); } @@ -724,7 +724,7 @@ IMPL_LINK(AnnotationTag, WindowEventHandler, VclWindowEvent*, pEvent) if( pEvent != NULL ) { ::Window* pWindow = pEvent->GetWindow(); - + if( pWindow ) { if( pWindow == mpAnnotationWindow.get() ) @@ -733,7 +733,7 @@ IMPL_LINK(AnnotationTag, WindowEventHandler, VclWindowEvent*, pEvent) { if( mnClosePopupEvent ) Application::RemoveUserEvent( mnClosePopupEvent ); - + mnClosePopupEvent = Application::PostUserEvent( LINK( this, AnnotationTag, ClosePopupHdl ) ); } } @@ -754,16 +754,16 @@ IMPL_LINK(AnnotationTag, WindowEventHandler, VclWindowEvent*, pEvent) { // if we move the mouse after a button down we wan't to start draging mpListenWindow->RemoveEventListener( LINK(this, AnnotationTag, WindowEventHandler)); - mpListenWindow = 0; + mpListenWindow = 0; SdrHdl* pHdl = mrView.PickHandle(maMouseDownPos); if( pHdl ) { mrView.BrkAction(); const USHORT nDrgLog = (USHORT)pWindow->PixelToLogic(Size(DRGPIX,0)).Width(); - + rtl::Reference< AnnotationTag > xTag( this ); - + SdrDragMethod* pDragMethod = new AnnotationDragMove( mrView, xTag ); mrView.BegDragObj(maMouseDownPos, NULL, pHdl, nDrgLog, pDragMethod ); } @@ -772,7 +772,7 @@ IMPL_LINK(AnnotationTag, WindowEventHandler, VclWindowEvent*, pEvent) case VCLEVENT_OBJECT_DYING: mpListenWindow = 0; break; - } + } } } } diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx index ea0d57fd3e3e..fead71026e85 100644 --- a/sd/source/ui/annotations/annotationtag.hxx +++ b/sd/source/ui/annotations/annotationtag.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ public: void OpenPopup( bool bEdit ); void ClosePopup(); - + protected: virtual void addCustomHandles( SdrHdlList& rHandlerList ); virtual bool getContext( SdrViewContext& rContext ); @@ -87,14 +87,14 @@ protected: DECL_LINK( WindowEventHandler, VclWindowEvent* ); DECL_LINK( ClosePopupHdl, void* ); - + private: AnnotationManagerImpl& mrManager; css::uno::Reference< css::office::XAnnotation > mxAnnotation; std::auto_ptr<AnnotationWindow> mpAnnotationWindow; - Color maColor; - int mnIndex; - const Font& mrFont; + Color maColor; + int mnIndex; + const Font& mrFont; Size maSize; ULONG mnClosePopupEvent; ::Window* mpListenWindow; @@ -103,5 +103,5 @@ private: } // end of namespace sd -#endif // _SD_ANNOTATIONTAG_HXX_ +#endif // _SD_ANNOTATIONTAG_HXX_ diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index a4642bb68096..0db12f3ceee1 100755 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,7 +76,7 @@ #include <vcl/button.hxx> #include <vcl/svapp.hxx> #include <vcl/gradient.hxx> -#include <vcl/salbtype.hxx> // FRound +#include <vcl/salbtype.hxx> // FRound #include <vcl/cursor.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -101,12 +101,12 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::office; using namespace ::com::sun::star::text; -#define METABUTTON_WIDTH 16 -#define METABUTTON_HEIGHT 18 -#define METABUTTON_AREA_WIDTH 30 -#define POSTIT_META_HEIGHT (sal_Int32) 30 +#define METABUTTON_WIDTH 16 +#define METABUTTON_HEIGHT 18 +#define METABUTTON_AREA_WIDTH 30 +#define POSTIT_META_HEIGHT (sal_Int32) 30 -#define EMPTYSTRING rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) +#define EMPTYSTRING rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) namespace sd { @@ -116,9 +116,9 @@ extern com::sun::star::util::DateTime getCurrentDateTime(); Color ColorFromAlphaColor(UINT8 aTransparency, Color &aFront, Color &aBack ) { - return Color((UINT8)(aFront.GetRed() * aTransparency/(double)255 + aBack.GetRed() * (1-aTransparency/(double)255)), - (UINT8)(aFront.GetGreen() * aTransparency/(double)255 + aBack.GetGreen() * (1-aTransparency/(double)255)), - (UINT8)(aFront.GetBlue() * aTransparency/(double)255 + aBack.GetBlue() * (1-aTransparency/(double)255))); + return Color((UINT8)(aFront.GetRed() * aTransparency/(double)255 + aBack.GetRed() * (1-aTransparency/(double)255)), + (UINT8)(aFront.GetGreen() * aTransparency/(double)255 + aBack.GetGreen() * (1-aTransparency/(double)255)), + (UINT8)(aFront.GetBlue() * aTransparency/(double)255 + aBack.GetBlue() * (1-aTransparency/(double)255))); } /************ AnnotationTextWindow **********************************/ @@ -323,8 +323,8 @@ void AnnotationWindow::InitControls() mpMeta->AlwaysDisableInput(true); mpMeta->SetCallHandlersOnInputDisabled(true); -// mpMeta->AddEventListener( LINK( mpPostItTxt, PostItTxt, WindowEventListener ) ); -// AddEventListener( LINK( mpTextWindow, PostItTxt, WindowEventListener ) ); +// mpMeta->AddEventListener( LINK( mpPostItTxt, PostItTxt, WindowEventListener ) ); +// AddEventListener( LINK( mpTextWindow, PostItTxt, WindowEventListener ) ); // we should leave this setting alone, but for this we need a better layout algo // with variable meta size height @@ -352,9 +352,9 @@ void AnnotationWindow::InitControls() mpTextWindow->SetOutlinerView(mpOutlinerView); mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,1,1) ) ); -// SfxItemSet item(DocShell()->GetPool()); -// item.Put(SvxFontHeightItem(352,100,EE_CHAR_FONTHEIGHT)); -// mpOutlinerView->SetAttribs(item); +// SfxItemSet item(DocShell()->GetPool()); +// item.Put(SvxFontHeightItem(352,100,EE_CHAR_FONTHEIGHT)); +// mpOutlinerView->SetAttribs(item); // TODO: ?? EEHorizontalTextDirection aDefHoriTextDir = Application::GetSettings().GetLayoutRTL() ? EE_HTEXTDIR_R2L : EE_HTEXTDIR_L2R; @@ -366,7 +366,7 @@ void AnnotationWindow::InitControls() mpVScrollbar->EnableRTL( false ); mpVScrollbar->SetScrollHdl(LINK(this, AnnotationWindow, ScrollHdl)); mpVScrollbar->EnableDrag(); -// mpVScrollbar->AddEventListener( LINK( this, AnnotationWindow, WindowEventListener ) ); +// mpVScrollbar->AddEventListener( LINK( this, AnnotationWindow, WindowEventListener ) ); ULONG nCntrl = mpOutliner->GetControlWord(); nCntrl |= EE_CNTRL_PASTESPECIAL | EE_CNTRL_AUTOCORRECT | EV_CNTRL_AUTOSCROLL | EE_CNTRL_NOCOLORS; @@ -381,7 +381,7 @@ void AnnotationWindow::InitControls() nCntrl &= ~EE_CNTRL_ONLINESPELLING; */ mpOutliner->SetControlWord(nCntrl); -// mpOutliner->SetFlatMode( TRUE ); +// mpOutliner->SetFlatMode( TRUE ); Engine()->SetModifyHdl( Link() ); Engine()->EnableUndo( FALSE ); @@ -427,14 +427,14 @@ void AnnotationWindow::Rescale() void AnnotationWindow::DoResize() { - unsigned long aWidth = GetSizePixel().Width(); - long aHeight = GetSizePixel().Height() - POSTIT_META_HEIGHT; + unsigned long aWidth = GetSizePixel().Width(); + long aHeight = GetSizePixel().Height() - POSTIT_META_HEIGHT; mpOutliner->SetPaperSize( PixelToLogic( Size(aWidth,aHeight) ) ) ; - long aTextHeight = LogicToPixel( mpOutliner->CalcTextSize()).Height(); + long aTextHeight = LogicToPixel( mpOutliner->CalcTextSize()).Height(); if( aTextHeight > aHeight ) - { // we need vertical scrollbars and have to reduce the width + { // we need vertical scrollbars and have to reduce the width aWidth -= GetScrollbarWidth(); mpVScrollbar->Show(); } @@ -453,7 +453,7 @@ void AnnotationWindow::DoResize() mpOutliner->SetPaperSize( PixelToLogic( Size(aWidth,aHeight) ) ) ; mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,aWidth,aHeight) ) ); if (!mpVScrollbar->IsVisible()) - { // if we do not have a scrollbar anymore, we want to see the complete text + { // if we do not have a scrollbar anymore, we want to see the complete text mpOutlinerView->SetVisArea( PixelToLogic( Rectangle(0,0,aWidth,aHeight) ) ); } mpVScrollbar->SetPosSizePixel( 0 + aWidth, 0, GetScrollbarWidth(), aHeight ); @@ -551,7 +551,7 @@ IMPL_LINK(AnnotationWindow, ModifyHdl, void*, EMPTYARG) sal_Int32 AnnotationWindow::GetScrollbarWidth() { return 16; -// return mpView->GetWrtShell().GetViewOptions()->GetZoom() / 10; +// return mpView->GetWrtShell().GetViewOptions()->GetZoom() / 10; } SvxLanguageItem AnnotationWindow::GetLanguage(void) diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 264cb2fa1afe..d5d935617502 100755 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,28 +62,28 @@ class View; class AnnotationTextWindow : public Control { private: - OutlinerView* mpOutlinerView; - AnnotationWindow* mpAnnotationWindow; + OutlinerView* mpOutlinerView; + AnnotationWindow* mpAnnotationWindow; protected: - virtual void Paint( const Rectangle& rRect); - virtual void KeyInput( const KeyEvent& rKeyEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void LoseFocus(); + virtual void Paint( const Rectangle& rRect); + virtual void KeyInput( const KeyEvent& rKeyEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Command( const CommandEvent& rCEvt ); + virtual void LoseFocus(); public: AnnotationTextWindow( AnnotationWindow* pParent, WinBits nBits ); ~AnnotationTextWindow(); void SetOutlinerView( OutlinerView* pOutlinerView ) { mpOutlinerView = pOutlinerView; } - + virtual XubString GetSurroundingText() const; virtual Selection GetSurroundingTextSelection() const; - virtual void GetFocus(); + virtual void GetFocus(); }; @@ -91,24 +91,24 @@ class AnnotationWindow : public FloatingWindow { private: AnnotationManagerImpl& mrManager; - DrawDocShell* mpDocShell; - View* mpView; - SdDrawDocument* mpDoc; + DrawDocShell* mpDocShell; + View* mpView; + SdDrawDocument* mpDoc; - OutlinerView* mpOutlinerView; - Outliner* mpOutliner; - ScrollBar* mpVScrollbar; + OutlinerView* mpOutlinerView; + Outliner* mpOutliner; + ScrollBar* mpVScrollbar; ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > mxAnnotation; bool mbReadonly; bool mbProtected; bool mbMouseOverButton; AnnotationTextWindow* mpTextWindow; MultiLineEdit* mpMeta; - Rectangle maRectMetaButton; + Rectangle maRectMetaButton; basegfx::B2DPolygon maPopupTriangle; - protected: - void SetSizePixel( const Size& rNewSize ); + protected: + void SetSizePixel( const Size& rNewSize ); DECL_LINK(ModifyHdl, void*); DECL_LINK(ScrollHdl, ScrollBar*); @@ -118,46 +118,46 @@ class AnnotationWindow : public FloatingWindow virtual ~AnnotationWindow(); void StartEdit(); - - virtual SvxLanguageItem GetLanguage(void); - + + virtual SvxLanguageItem GetLanguage(void); + void setAnnotation( const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation, bool bGrabFocus = false ); const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& getAnnotation() const { return mxAnnotation; } void ExecuteSlot( USHORT nSID ); + + ScrollBar* Scrollbar() { return mpVScrollbar;} - ScrollBar* Scrollbar() { return mpVScrollbar;} - - DrawDocShell* DocShell() { return mpDocShell; } - OutlinerView* getView() { return mpOutlinerView; } - sd::View* DocView() { return mpView; } - Outliner* Engine() { return mpOutliner; } - SdDrawDocument* Doc() { return mpDoc; } + DrawDocShell* DocShell() { return mpDocShell; } + OutlinerView* getView() { return mpOutlinerView; } + sd::View* DocView() { return mpView; } + Outliner* Engine() { return mpOutliner; } + SdDrawDocument* Doc() { return mpDoc; } long GetPostItTextHeight(); - void InitControls(); + void InitControls(); void HidePostIt(); void DoResize(); - void ResizeIfNeccessary(long aOldHeight, long aNewHeight); - void SetScrollbar(); + void ResizeIfNeccessary(long aOldHeight, long aNewHeight); + void SetScrollbar(); - void Rescale(); + void Rescale(); - bool IsReadOnly() { return mbReadonly;} + bool IsReadOnly() { return mbReadonly;} bool IsProtected() { return mbProtected; } - void SetLanguage(const SvxLanguageItem aNewItem); + void SetLanguage(const SvxLanguageItem aNewItem); - sal_Int32 GetScrollbarWidth(); + sal_Int32 GetScrollbarWidth(); - void ToggleInsMode(); + void ToggleInsMode(); DECL_LINK( OnlineSpellCallback, SpellCallbackInfo*); - - virtual void Deactivate(); - virtual void Paint( const Rectangle& rRect); + + virtual void Deactivate(); + virtual void Paint( const Rectangle& rRect); virtual void MouseMove( const MouseEvent& rMEvt ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void Command( const CommandEvent& rCEvt ); @@ -165,9 +165,9 @@ class AnnotationWindow : public FloatingWindow void SetColor(); - Color maColor; - Color maColorDark; - Color maColorLight; + Color maColor; + Color maColorDark; + Color maColorLight; }; } // namespace sd diff --git a/sd/source/ui/app/_app.hrc b/sd/source/ui/app/_app.hrc index 3bbaaf9f4557..7b3eaa023175 100644 --- a/sd/source/ui/app/_app.hrc +++ b/sd/source/ui/app/_app.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/app/accel_tmpl.src b/sd/source/ui/app/accel_tmpl.src index 467c5e2ae466..5afada2dd5fc 100644 --- a/sd/source/ui/app/accel_tmpl.src +++ b/sd/source/ui/app/accel_tmpl.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ Accelerator SD_ACCELERATOR AI_COPYOBJECTS AI_LEAVE_GROUP AI_ATTR_TRANSFORM - // AI_NAVIGATOR + // AI_NAVIGATOR AI_SD_NAVIGATOR AI_SPELLING AI_THESAURUS diff --git a/sd/source/ui/app/accelids_tmpl.src b/sd/source/ui/app/accelids_tmpl.src index 0a3c33c0bb38..a96008c1d862 100644 --- a/sd/source/ui/app/accelids_tmpl.src +++ b/sd/source/ui/app/accelids_tmpl.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/app/app.src b/sd/source/ui/app/app.src index 94945be2c3ce..4433082781a7 100644 --- a/sd/source/ui/app/app.src +++ b/sd/source/ui/app/app.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/app/menu_tmpl.src b/sd/source/ui/app/menu_tmpl.src index d4c6e2774024..24b7df31bd28 100644 --- a/sd/source/ui/app/menu_tmpl.src +++ b/sd/source/ui/app/menu_tmpl.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include "menuids2.src" #endif -#define DEFINE_SLOTID_FOR_NUMBER_BULLETS SID_OUTLINE_BULLET +#define DEFINE_SLOTID_FOR_NUMBER_BULLETS SID_OUTLINE_BULLET /*The application menu bar resource has become obsolete. You can now find the menu bar definition at: diff --git a/sd/source/ui/app/menuids2_tmpl.src b/sd/source/ui/app/menuids2_tmpl.src index 21d906bfedf0..0913a74cb585 100755 --- a/sd/source/ui/app/menuids2_tmpl.src +++ b/sd/source/ui/app/menuids2_tmpl.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,23 +28,23 @@ #ifndef _MENUIDS2_SRC #define _MENUIDS2_SRC -#define MI(x) MenuItem { x }; +#define MI(x) MenuItem { x }; #define SEPARATOR MenuItem { Separator = TRUE; }; // SubMenu-IDs -#define MN_SUB_VIEW 91 -#define MN_SUB_TOOLBAR 92 -#define MN_SUB_GRAPHIC 93 -#define MN_SUB_SPELLING 94 -#define MN_SUB_TEMPLATES 95 -#define MN_SUB_POSITION 96 -#define MN_SUB_MASTERPAGE 97 -#define MN_SUB_SEND 98 -#define MN_SUB_FIELD 99 -#define MN_SUB_OUTPUT_QUALITY 100 -#define MN_SUB_PREVIEW_OUTPUT_QUALITY 101 -#define MN_SUB_GROUP 102 -#define MN_TEMPLATES 103 -#define MN_SUB_MASTER_LAYOUTS 104 +#define MN_SUB_VIEW 91 +#define MN_SUB_TOOLBAR 92 +#define MN_SUB_GRAPHIC 93 +#define MN_SUB_SPELLING 94 +#define MN_SUB_TEMPLATES 95 +#define MN_SUB_POSITION 96 +#define MN_SUB_MASTERPAGE 97 +#define MN_SUB_SEND 98 +#define MN_SUB_FIELD 99 +#define MN_SUB_OUTPUT_QUALITY 100 +#define MN_SUB_PREVIEW_OUTPUT_QUALITY 101 +#define MN_SUB_GROUP 102 +#define MN_TEMPLATES 103 +#define MN_SUB_MASTER_LAYOUTS 104 // Windowmenu-ID (wird in globlmn.hrc gebraucht) #ifndef MN_WIN @@ -113,7 +113,7 @@ HelpID = 20 ; \ Command = ".uno:EditMenu"; \ Text [ en-US ] = "~Edit" ; \ - + #define MN_PASTE2 \ MenuItem\ {\ @@ -169,7 +169,7 @@ HelpID = 23 ; \ Command = ".uno:ViewMenu" ; \ Text [ en-US ] = "~View" ; \ - + #define MN_TOGGLETOOLBAR \ MenuItem\ {\ @@ -396,7 +396,7 @@ HelpID = 21 ; \ Command = ".uno:InsertMenu" ; \ Text [ en-US ] = "~Insert" ; \ - + #define MN_INSERTPAGE \ MenuItem\ {\ @@ -773,7 +773,7 @@ HelpID = 24 ; \ Command = ".uno:ModifyMenu" ; \ Text [ en-US ] = "~Modify" ; \ - + #define MN_MOREFRONT \ MenuItem\ {\ diff --git a/sd/source/ui/app/menuids3_tmpl.src b/sd/source/ui/app/menuids3_tmpl.src index 09a90fdc0649..a7935fe2c67c 100644 --- a/sd/source/ui/app/menuids3_tmpl.src +++ b/sd/source/ui/app/menuids3_tmpl.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/app/menuids4_tmpl.src b/sd/source/ui/app/menuids4_tmpl.src index 9b077db8f22f..5cd541b0243e 100644 --- a/sd/source/ui/app/menuids4_tmpl.src +++ b/sd/source/ui/app/menuids4_tmpl.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ };\ };\ }; -#endif // _MENUIDS4_SRC +#endif // _MENUIDS4_SRC diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src index e21caafaa739..6e89d6a4d4e0 100644 --- a/sd/source/ui/app/menuids_tmpl.src +++ b/sd/source/ui/app/menuids_tmpl.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1271,7 +1271,7 @@ Identifier = DUMMY + 7 ; \ Command = ".uno:LayerMenu" ; \ Text [ en-US ] = "La~yer"; \ - SubMenu = Menu \ + SubMenu = Menu \ {\ ItemList = \ {\ diff --git a/sd/source/ui/app/menuportal_tmpl.src b/sd/source/ui/app/menuportal_tmpl.src index 29d7c6da1e4a..cdc1a705e011 100644 --- a/sd/source/ui/app/menuportal_tmpl.src +++ b/sd/source/ui/app/menuportal_tmpl.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include "menuids2.src" #endif -#define DEFINE_SLOTID_FOR_NUMBER_BULLETS SID_OUTLINE_BULLET +#define DEFINE_SLOTID_FOR_NUMBER_BULLETS SID_OUTLINE_BULLET Menu SD_MENU_PORTAL { @@ -297,13 +297,13 @@ Menu SD_MENU_PORTAL MNSUB_POSITION MNSUB_OBJECT_ALIGN MN_DISTRIBUTE - + //-#i68101#---------------------- SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP //-#i68101#---------------------- - + SEPARATOR MN_GROUP MN_UNGROUP @@ -341,7 +341,7 @@ Menu SD_MENU_PORTAL MN_HIDE_SLIDE SEPARATOR MN_ANIMATION_OBJECTS -// MN_EFFECT_WIN +// MN_EFFECT_WIN MN_ANIMATION_EFFECTS }; }; diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index 4355da3011c9..a5a26f267646 100755 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,8 +52,8 @@ using namespace ::com::sun::star::uno; // ----------------- SdOptionsItem::SdOptionsItem( const SdOptionsGeneric& rParent, const OUString rSubTree ) : - ConfigItem ( rSubTree ), - mrParent ( rParent ) + ConfigItem ( rSubTree ), + mrParent ( rParent ) { } @@ -77,7 +77,7 @@ void SdOptionsItem::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& // ----------------------------------------------------------------------------- -Sequence< Any > SdOptionsItem::GetProperties( const Sequence< OUString >& rNames ) +Sequence< Any > SdOptionsItem::GetProperties( const Sequence< OUString >& rNames ) { return ConfigItem::GetProperties( rNames ); } @@ -101,10 +101,10 @@ void SdOptionsItem::SetModified() // -------------------- SdOptionsGeneric::SdOptionsGeneric( USHORT nConfigId, const OUString& rSubTree ) : - maSubTree ( rSubTree ), - mpCfgItem ( NULL ), - mnConfigId ( nConfigId ), - mbInit ( rSubTree.getLength() == 0 ) + maSubTree ( rSubTree ), + mpCfgItem ( NULL ), + mnConfigId ( nConfigId ), + mbInit ( rSubTree.getLength() == 0 ) { } @@ -114,13 +114,13 @@ void SdOptionsGeneric::Init() const { if( !mbInit ) { - SdOptionsGeneric* pThis = const_cast<SdOptionsGeneric*>(this); + SdOptionsGeneric* pThis = const_cast<SdOptionsGeneric*>(this); if( !mpCfgItem ) pThis->mpCfgItem = new SdOptionsItem( *this, maSubTree ); - const Sequence< OUString > aNames( GetPropertyNames() ); - const Sequence< Any > aValues = mpCfgItem->GetProperties( aNames ); + const Sequence< OUString > aNames( GetPropertyNames() ); + const Sequence< Any > aValues = mpCfgItem->GetProperties( aNames ); if( aNames.getLength() && ( aValues.getLength() == aNames.getLength() ) ) { @@ -147,8 +147,8 @@ SdOptionsGeneric::~SdOptionsGeneric() void SdOptionsGeneric::Commit( SdOptionsItem& rCfgItem ) const { - const Sequence< OUString > aNames( GetPropertyNames() ); - Sequence< Any > aValues( aNames.getLength() ); + const Sequence< OUString > aNames( GetPropertyNames() ); + Sequence< Any > aValues( aNames.getLength() ); if( aNames.getLength() && ( aValues.getLength() == aNames.getLength() ) ) { @@ -165,13 +165,13 @@ void SdOptionsGeneric::Commit( SdOptionsItem& rCfgItem ) const Sequence< OUString > SdOptionsGeneric::GetPropertyNames() const { - ULONG nCount; - const char** ppPropNames; + ULONG nCount; + const char** ppPropNames; GetPropNameArray( ppPropNames, nCount ); Sequence< OUString > aNames( nCount ); - OUString* pNames = aNames.getArray(); + OUString* pNames = aNames.getArray(); for( ULONG i = 0; i < nCount; i++ ) pNames[ i ] = OUString::createFromAscii( ppPropNames[ i ] ); @@ -215,7 +215,7 @@ SdOptionsLayout::SdOptionsLayout( USHORT nConfigId, BOOL bUseConfig ) : bHandlesBezier( FALSE ), bHelplines( TRUE ), nMetric((UINT16)(isMetricSystem() ? FUNIT_CM : FUNIT_INCH)), - nDefTab( 1250 ) + nDefTab( 1250 ) { EnableModify( TRUE ); } @@ -224,7 +224,7 @@ SdOptionsLayout::SdOptionsLayout( USHORT nConfigId, BOOL bUseConfig ) : BOOL SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const { - return( IsRulerVisible() == rOpt.IsRulerVisible() && + return( IsRulerVisible() == rOpt.IsRulerVisible() && IsMoveOutline() == rOpt.IsMoveOutline() && IsDragStripes() == rOpt.IsDragStripes() && IsHandlesBezier() == rOpt.IsHandlesBezier() && @@ -304,16 +304,16 @@ BOOL SdOptionsLayout::WriteData( Any* pValues ) const \************************************************************************/ SdOptionsLayoutItem::SdOptionsLayoutItem( USHORT _nWhich ) -: SfxPoolItem ( _nWhich ) -, maOptionsLayout ( 0, FALSE ) +: SfxPoolItem ( _nWhich ) +, maOptionsLayout ( 0, FALSE ) { } // ---------------------------------------------------------------------- SdOptionsLayoutItem::SdOptionsLayoutItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) -: SfxPoolItem ( _nWhich ) -, maOptionsLayout ( 0, FALSE ) +: SfxPoolItem ( _nWhich ) +, maOptionsLayout ( 0, FALSE ) { if( pOpts ) { @@ -438,8 +438,8 @@ BOOL SdOptionsContents::WriteData( Any* pValues ) const \************************************************************************/ SdOptionsContentsItem::SdOptionsContentsItem(USHORT _nWhich, SdOptions*, ::sd::FrameView*) -: SfxPoolItem ( _nWhich ) -, maOptionsContents ( 0, FALSE ) +: SfxPoolItem ( _nWhich ) +, maOptionsContents ( 0, FALSE ) { } @@ -514,7 +514,7 @@ SdOptionsMisc::SdOptionsMisc( USHORT nConfigId, BOOL bUseConfig ) : BOOL SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const { - return( IsStartWithTemplate() == rOpt.IsStartWithTemplate() && + return( IsStartWithTemplate() == rOpt.IsStartWithTemplate() && IsMarkedHitMovesAlways() == rOpt.IsMarkedHitMovesAlways() && IsMoveOnlyDragging() == rOpt.IsMoveOnlyDragging() && IsCrookNoContortion() == rOpt.IsCrookNoContortion() && @@ -603,7 +603,7 @@ BOOL SdOptionsMisc::ReadData( const Any* pValues ) if( pValues[6].hasValue() ) SetBigHandles( *(sal_Bool*) pValues[ 6 ].getValue() ); if( pValues[7].hasValue() ) SetDoubleClickTextEdit( *(sal_Bool*) pValues[ 7 ].getValue() ); if( pValues[8].hasValue() ) SetClickChangeRotation( *(sal_Bool*) pValues[ 8 ].getValue() ); - // if( pValues[9].hasValue() ) SetPreviewQuality( FRound( *(double*) pValues[ 9 ].getValue() ) ); + // if( pValues[9].hasValue() ) SetPreviewQuality( FRound( *(double*) pValues[ 9 ].getValue() ) ); if( pValues[10].hasValue() ) SetSolidDragging( *(sal_Bool*) pValues[ 10 ].getValue() ); if( pValues[11].hasValue() ) SetSolidMarkHdl( *(sal_Bool*) pValues[ 11 ].getValue() ); // #97016# @@ -624,7 +624,7 @@ BOOL SdOptionsMisc::ReadData( const Any* pValues ) if( pValues[18].hasValue() ) SetSummationOfParagraphs( *(sal_Bool*) pValues[ 18 ].getValue() ); // #90356# - if( pValues[19].hasValue() ) + if( pValues[19].hasValue() ) SetShowUndoDeleteWarning( *(sal_Bool*) pValues[ 19 ].getValue() ); if( pValues[20].hasValue() ) @@ -668,7 +668,7 @@ BOOL SdOptionsMisc::WriteData( Any* pValues ) const pValues[ 13 ] <<= GetDefaultObjectSizeHeight(); pValues[ 14 ] <<= GetPrinterIndependentLayout(); pValues[ 15 ] <<= (sal_Bool)IsShowComments(); - + // just for Impress if( GetConfigId() == SDCFG_IMPRESS ) { @@ -696,16 +696,16 @@ BOOL SdOptionsMisc::WriteData( Any* pValues ) const \************************************************************************/ SdOptionsMiscItem::SdOptionsMiscItem( USHORT _nWhich ) -: SfxPoolItem ( _nWhich ) -, maOptionsMisc ( 0, FALSE ) +: SfxPoolItem ( _nWhich ) +, maOptionsMisc ( 0, FALSE ) { } // ---------------------------------------------------------------------- SdOptionsMiscItem::SdOptionsMiscItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) -: SfxPoolItem ( _nWhich ) -, maOptionsMisc ( 0, FALSE ) +: SfxPoolItem ( _nWhich ) +, maOptionsMisc ( 0, FALSE ) { if( pOpts ) { @@ -823,9 +823,9 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const \************************************************************************/ SdOptionsSnap::SdOptionsSnap( USHORT nConfigId, BOOL bUseConfig ) : - SdOptionsGeneric( nConfigId, bUseConfig ? - ( ( SDCFG_DRAW == nConfigId ) ? - B2U( "Office.Draw/Snap" ) : + SdOptionsGeneric( nConfigId, bUseConfig ? + ( ( SDCFG_DRAW == nConfigId ) ? + B2U( "Office.Draw/Snap" ) : B2U( "Office.Impress/Snap" ) ) : OUString() ), bSnapHelplines( TRUE ), @@ -847,7 +847,7 @@ SdOptionsSnap::SdOptionsSnap( USHORT nConfigId, BOOL bUseConfig ) : BOOL SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const { - return( IsSnapHelplines() == rOpt.IsSnapHelplines() && + return( IsSnapHelplines() == rOpt.IsSnapHelplines() && IsSnapBorder() == rOpt.IsSnapBorder() && IsSnapFrame() == rOpt.IsSnapFrame() && IsSnapPoints() == rOpt.IsSnapPoints() && @@ -876,7 +876,7 @@ void SdOptionsSnap::GetPropNameArray( const char**& ppNames, ULONG& rCount ) con "Position/RotatingValue", "Position/PointReduction" }; - + rCount = 10; ppNames = aPropNames; } @@ -885,16 +885,16 @@ void SdOptionsSnap::GetPropNameArray( const char**& ppNames, ULONG& rCount ) con BOOL SdOptionsSnap::ReadData( const Any* pValues ) { - if( pValues[0].hasValue() ) SetSnapHelplines( *(sal_Bool*) pValues[ 0 ].getValue() ); - if( pValues[1].hasValue() ) SetSnapBorder( *(sal_Bool*)pValues[ 1 ].getValue() ); - if( pValues[2].hasValue() ) SetSnapFrame( *(sal_Bool*) pValues[ 2 ].getValue() ); - if( pValues[3].hasValue() ) SetSnapPoints( *(sal_Bool*) pValues[ 3 ].getValue() ); - if( pValues[4].hasValue() ) SetOrtho( *(sal_Bool*) pValues[ 4 ].getValue() ); - if( pValues[5].hasValue() ) SetBigOrtho( *(sal_Bool*) pValues[ 5 ].getValue() ); - if( pValues[6].hasValue() ) SetRotate( *(sal_Bool*) pValues[ 6 ].getValue() ); - if( pValues[7].hasValue() ) SetSnapArea( (INT16) *(sal_Int32*) pValues[ 7 ].getValue() ); - if( pValues[8].hasValue() ) SetAngle( (INT16) *(sal_Int32*) pValues[ 8 ].getValue() ); - if( pValues[9].hasValue() ) SetEliminatePolyPointLimitAngle( (INT16) *(sal_Int32*) pValues[ 9 ].getValue() ); + if( pValues[0].hasValue() ) SetSnapHelplines( *(sal_Bool*) pValues[ 0 ].getValue() ); + if( pValues[1].hasValue() ) SetSnapBorder( *(sal_Bool*)pValues[ 1 ].getValue() ); + if( pValues[2].hasValue() ) SetSnapFrame( *(sal_Bool*) pValues[ 2 ].getValue() ); + if( pValues[3].hasValue() ) SetSnapPoints( *(sal_Bool*) pValues[ 3 ].getValue() ); + if( pValues[4].hasValue() ) SetOrtho( *(sal_Bool*) pValues[ 4 ].getValue() ); + if( pValues[5].hasValue() ) SetBigOrtho( *(sal_Bool*) pValues[ 5 ].getValue() ); + if( pValues[6].hasValue() ) SetRotate( *(sal_Bool*) pValues[ 6 ].getValue() ); + if( pValues[7].hasValue() ) SetSnapArea( (INT16) *(sal_Int32*) pValues[ 7 ].getValue() ); + if( pValues[8].hasValue() ) SetAngle( (INT16) *(sal_Int32*) pValues[ 8 ].getValue() ); + if( pValues[9].hasValue() ) SetEliminatePolyPointLimitAngle( (INT16) *(sal_Int32*) pValues[ 9 ].getValue() ); return TRUE; } @@ -903,16 +903,16 @@ BOOL SdOptionsSnap::ReadData( const Any* pValues ) BOOL SdOptionsSnap::WriteData( Any* pValues ) const { - pValues[ 0 ] <<= IsSnapHelplines(); - pValues[ 1 ] <<= IsSnapBorder(); - pValues[ 2 ] <<= IsSnapFrame(); - pValues[ 3 ] <<= IsSnapPoints(); - pValues[ 4 ] <<= IsOrtho(); - pValues[ 5 ] <<= IsBigOrtho(); - pValues[ 6 ] <<= IsRotate(); - pValues[ 7 ] <<= (sal_Int32) GetSnapArea(); - pValues[ 8 ] <<= (sal_Int32) GetAngle(); - pValues[ 9 ] <<= (sal_Int32) GetEliminatePolyPointLimitAngle(); + pValues[ 0 ] <<= IsSnapHelplines(); + pValues[ 1 ] <<= IsSnapBorder(); + pValues[ 2 ] <<= IsSnapFrame(); + pValues[ 3 ] <<= IsSnapPoints(); + pValues[ 4 ] <<= IsOrtho(); + pValues[ 5 ] <<= IsBigOrtho(); + pValues[ 6 ] <<= IsRotate(); + pValues[ 7 ] <<= (sal_Int32) GetSnapArea(); + pValues[ 8 ] <<= (sal_Int32) GetAngle(); + pValues[ 9 ] <<= (sal_Int32) GetEliminatePolyPointLimitAngle(); return TRUE; } @@ -924,16 +924,16 @@ BOOL SdOptionsSnap::WriteData( Any* pValues ) const \************************************************************************/ SdOptionsSnapItem::SdOptionsSnapItem( USHORT _nWhich ) -: SfxPoolItem ( _nWhich ) -, maOptionsSnap ( 0, FALSE ) +: SfxPoolItem ( _nWhich ) +, maOptionsSnap ( 0, FALSE ) { } // ---------------------------------------------------------------------- SdOptionsSnapItem::SdOptionsSnapItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) -: SfxPoolItem ( _nWhich ) -, maOptionsSnap ( 0, FALSE ) +: SfxPoolItem ( _nWhich ) +, maOptionsSnap ( 0, FALSE ) { if( pView ) { @@ -1006,12 +1006,12 @@ void SdOptionsSnapItem::SetOptions( SdOptions* pOpts ) const \************************************************************************/ SdOptionsZoom::SdOptionsZoom( USHORT nConfigId, BOOL bUseConfig ) : - SdOptionsGeneric( nConfigId, ( bUseConfig && ( SDCFG_DRAW == nConfigId ) ) ? - B2U( "Office.Draw/Zoom" ) : + SdOptionsGeneric( nConfigId, ( bUseConfig && ( SDCFG_DRAW == nConfigId ) ) ? + B2U( "Office.Draw/Zoom" ) : OUString() ), nX( 1 ), nY( 1 ) - + { EnableModify( TRUE ); } @@ -1025,7 +1025,7 @@ BOOL SdOptionsZoom::operator==( const SdOptionsZoom& rOpt ) const GetScale( nX1, nY1 ); rOpt.GetScale( nX2, nY2 ); - return( ( nX1 == nX2 ) && + return( ( nX1 == nX2 ) && ( nY1 == nY2 ) ); } @@ -1038,7 +1038,7 @@ void SdOptionsZoom::GetPropNameArray( const char**& ppNames, ULONG& rCount ) con "ScaleX", "ScaleY" }; - + rCount = ( GetConfigId() == SDCFG_DRAW ) ? 2 : 0; ppNames = aPropNames; } @@ -1049,9 +1049,9 @@ BOOL SdOptionsZoom::ReadData( const Any* pValues ) { INT32 x = 1, y = 1; - if( pValues[0].hasValue() ) x = ( *(sal_Int32*) pValues[ 0 ].getValue() ); - if( pValues[1].hasValue() ) y = ( *(sal_Int32*) pValues[ 1 ].getValue() ); - + if( pValues[0].hasValue() ) x = ( *(sal_Int32*) pValues[ 0 ].getValue() ); + if( pValues[1].hasValue() ) y = ( *(sal_Int32*) pValues[ 1 ].getValue() ); + SetScale( x, y ); return TRUE; @@ -1065,8 +1065,8 @@ BOOL SdOptionsZoom::WriteData( Any* pValues ) const GetScale( x, y ); - pValues[ 0 ] <<= (sal_Int32) x; - pValues[ 1 ] <<= (sal_Int32) y; + pValues[ 0 ] <<= (sal_Int32) x; + pValues[ 1 ] <<= (sal_Int32) y; return TRUE; } @@ -1078,9 +1078,9 @@ BOOL SdOptionsZoom::WriteData( Any* pValues ) const \************************************************************************/ SdOptionsGrid::SdOptionsGrid( USHORT nConfigId, BOOL bUseConfig ) : - SdOptionsGeneric( nConfigId, bUseConfig ? - ( ( SDCFG_DRAW == nConfigId ) ? - B2U( "Office.Draw/Grid" ) : + SdOptionsGeneric( nConfigId, bUseConfig ? + ( ( SDCFG_DRAW == nConfigId ) ? + B2U( "Office.Draw/Grid" ) : B2U( "Office.Impress/Grid" ) ) : OUString() ) { @@ -1117,7 +1117,7 @@ void SdOptionsGrid::SetDefaults() BOOL SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const { - return( GetFldDrawX() == rOpt.GetFldDrawX() && + return( GetFldDrawX() == rOpt.GetFldDrawX() && GetFldDivisionX() == rOpt.GetFldDivisionX() && GetFldDrawY() == rOpt.GetFldDrawY() && GetFldDivisionY() == rOpt.GetFldDivisionY() && @@ -1173,27 +1173,27 @@ void SdOptionsGrid::GetPropNameArray( const char**& ppNames, ULONG& rCount ) con BOOL SdOptionsGrid::ReadData( const Any* pValues ) { - if( pValues[0].hasValue() ) SetFldDrawX( *(sal_Int32*) pValues[ 0 ].getValue() ); - if( pValues[1].hasValue() ) SetFldDrawY( *(sal_Int32*) pValues[ 1 ].getValue() ); + if( pValues[0].hasValue() ) SetFldDrawX( *(sal_Int32*) pValues[ 0 ].getValue() ); + if( pValues[1].hasValue() ) SetFldDrawY( *(sal_Int32*) pValues[ 1 ].getValue() ); if( pValues[2].hasValue() ) { const UINT32 nDivX = FRound( *(double*) pValues[ 2 ].getValue() ); - SetFldDivisionX( SvxOptionsGrid::GetFldDrawX() / ( nDivX + 1 ) ); + SetFldDivisionX( SvxOptionsGrid::GetFldDrawX() / ( nDivX + 1 ) ); } if( pValues[3].hasValue() ) { const UINT32 nDivY = FRound( *(double*) pValues[ 3 ].getValue() ); - SetFldDivisionY( SvxOptionsGrid::GetFldDrawY() / ( nDivY + 1 ) ); + SetFldDivisionY( SvxOptionsGrid::GetFldDrawY() / ( nDivY + 1 ) ); } - if( pValues[4].hasValue() ) SetFldSnapX( *(sal_Int32*) pValues[ 4 ].getValue() ); - if( pValues[5].hasValue() ) SetFldSnapY( *(sal_Int32*) pValues[ 5 ].getValue() ); - if( pValues[6].hasValue() ) SetUseGridSnap( *(sal_Bool*) pValues[ 6 ].getValue() ); - if( pValues[7].hasValue() ) SetSynchronize( *(sal_Bool*) pValues[ 7 ].getValue() ); - if( pValues[8].hasValue() ) SetGridVisible( *(sal_Bool*) pValues[ 8 ].getValue() ); - if( pValues[9].hasValue() ) SetEqualGrid( *(sal_Bool*) pValues[ 9 ].getValue() ); + if( pValues[4].hasValue() ) SetFldSnapX( *(sal_Int32*) pValues[ 4 ].getValue() ); + if( pValues[5].hasValue() ) SetFldSnapY( *(sal_Int32*) pValues[ 5 ].getValue() ); + if( pValues[6].hasValue() ) SetUseGridSnap( *(sal_Bool*) pValues[ 6 ].getValue() ); + if( pValues[7].hasValue() ) SetSynchronize( *(sal_Bool*) pValues[ 7 ].getValue() ); + if( pValues[8].hasValue() ) SetGridVisible( *(sal_Bool*) pValues[ 8 ].getValue() ); + if( pValues[9].hasValue() ) SetEqualGrid( *(sal_Bool*) pValues[ 9 ].getValue() ); return TRUE; } @@ -1202,16 +1202,16 @@ BOOL SdOptionsGrid::ReadData( const Any* pValues ) BOOL SdOptionsGrid::WriteData( Any* pValues ) const { - pValues[ 0 ] <<= (sal_Int32) GetFldDrawX(); - pValues[ 1 ] <<= (sal_Int32) GetFldDrawY(); + pValues[ 0 ] <<= (sal_Int32) GetFldDrawX(); + pValues[ 1 ] <<= (sal_Int32) GetFldDrawY(); pValues[ 2 ] <<= ( GetFldDivisionX() ? ( (double) GetFldDrawX() / GetFldDivisionX() - 1.0 ) : (double) 0 ); pValues[ 3 ] <<= ( GetFldDivisionY() ? ( (double) GetFldDrawY() / GetFldDivisionY() - 1.0 ) : (double) 0 ); - pValues[ 4 ] <<= (sal_Int32) GetFldSnapX(); - pValues[ 5 ] <<= (sal_Int32) GetFldSnapY(); - pValues[ 6 ] <<= IsUseGridSnap(); - pValues[ 7 ] <<= IsSynchronize(); - pValues[ 8 ] <<= IsGridVisible(); - pValues[ 9 ] <<= IsEqualGrid(); + pValues[ 4 ] <<= (sal_Int32) GetFldSnapX(); + pValues[ 5 ] <<= (sal_Int32) GetFldSnapY(); + pValues[ 6 ] <<= IsUseGridSnap(); + pValues[ 7 ] <<= IsSynchronize(); + pValues[ 8 ] <<= IsGridVisible(); + pValues[ 9 ] <<= IsEqualGrid(); return TRUE; } @@ -1275,9 +1275,9 @@ void SdOptionsGridItem::SetOptions( SdOptions* pOpts ) const \************************************************************************/ SdOptionsPrint::SdOptionsPrint( USHORT nConfigId, BOOL bUseConfig ) : - SdOptionsGeneric( nConfigId, bUseConfig ? - ( ( SDCFG_DRAW == nConfigId ) ? - B2U( "Office.Draw/Print" ) : + SdOptionsGeneric( nConfigId, bUseConfig ? + ( ( SDCFG_DRAW == nConfigId ) ? + B2U( "Office.Draw/Print" ) : B2U( "Office.Impress/Print" ) ) : OUString() ), bDraw( TRUE ), @@ -1396,25 +1396,25 @@ void SdOptionsPrint::GetPropNameArray( const char**& ppNames, ULONG& rCount ) co BOOL SdOptionsPrint::ReadData( const Any* pValues ) { - if( pValues[0].hasValue() ) SetDate( *(sal_Bool*) pValues[ 0 ].getValue() ); - if( pValues[1].hasValue() ) SetTime( *(sal_Bool*) pValues[ 1 ].getValue() ); - if( pValues[2].hasValue() ) SetPagename( *(sal_Bool*) pValues[ 2 ].getValue() ); - if( pValues[3].hasValue() ) SetHiddenPages( *(sal_Bool*) pValues[ 3 ].getValue() ); - if( pValues[4].hasValue() ) SetPagesize( *(sal_Bool*) pValues[ 4 ].getValue() ); - if( pValues[5].hasValue() ) SetPagetile( *(sal_Bool*) pValues[ 5 ].getValue() ); - if( pValues[6].hasValue() ) SetBooklet( *(sal_Bool*) pValues[ 6 ].getValue() ); - if( pValues[7].hasValue() ) SetFrontPage( *(sal_Bool*) pValues[ 7 ].getValue() ); - if( pValues[8].hasValue() ) SetBackPage( *(sal_Bool*) pValues[ 8 ].getValue() ); - if( pValues[9].hasValue() ) SetPaperbin( *(sal_Bool*) pValues[ 9 ].getValue() ); - if( pValues[10].hasValue() ) SetOutputQuality( (UINT16) *(sal_Int32*) pValues[ 10 ].getValue() ); - if( pValues[11].hasValue() ) SetDraw( *(sal_Bool*) pValues[ 11 ].getValue() ); + if( pValues[0].hasValue() ) SetDate( *(sal_Bool*) pValues[ 0 ].getValue() ); + if( pValues[1].hasValue() ) SetTime( *(sal_Bool*) pValues[ 1 ].getValue() ); + if( pValues[2].hasValue() ) SetPagename( *(sal_Bool*) pValues[ 2 ].getValue() ); + if( pValues[3].hasValue() ) SetHiddenPages( *(sal_Bool*) pValues[ 3 ].getValue() ); + if( pValues[4].hasValue() ) SetPagesize( *(sal_Bool*) pValues[ 4 ].getValue() ); + if( pValues[5].hasValue() ) SetPagetile( *(sal_Bool*) pValues[ 5 ].getValue() ); + if( pValues[6].hasValue() ) SetBooklet( *(sal_Bool*) pValues[ 6 ].getValue() ); + if( pValues[7].hasValue() ) SetFrontPage( *(sal_Bool*) pValues[ 7 ].getValue() ); + if( pValues[8].hasValue() ) SetBackPage( *(sal_Bool*) pValues[ 8 ].getValue() ); + if( pValues[9].hasValue() ) SetPaperbin( *(sal_Bool*) pValues[ 9 ].getValue() ); + if( pValues[10].hasValue() ) SetOutputQuality( (UINT16) *(sal_Int32*) pValues[ 10 ].getValue() ); + if( pValues[11].hasValue() ) SetDraw( *(sal_Bool*) pValues[ 11 ].getValue() ); // just for impress if( GetConfigId() == SDCFG_IMPRESS ) { - if( pValues[12].hasValue() ) SetNotes( *(sal_Bool*) pValues[ 12 ].getValue() ); - if( pValues[13].hasValue() ) SetHandout( *(sal_Bool*) pValues[ 13 ].getValue() ); - if( pValues[14].hasValue() ) SetOutline( *(sal_Bool*) pValues[ 14 ].getValue() ); + if( pValues[12].hasValue() ) SetNotes( *(sal_Bool*) pValues[ 12 ].getValue() ); + if( pValues[13].hasValue() ) SetHandout( *(sal_Bool*) pValues[ 13 ].getValue() ); + if( pValues[14].hasValue() ) SetOutline( *(sal_Bool*) pValues[ 14 ].getValue() ); if( pValues[15].hasValue() ) SetHandoutHorizontal( *(sal_Bool*) pValues[15].getValue() ); if( pValues[16].hasValue() ) SetHandoutPages( (UINT16)*(sal_Int32*) pValues[16].getValue() ); } @@ -1426,25 +1426,25 @@ BOOL SdOptionsPrint::ReadData( const Any* pValues ) BOOL SdOptionsPrint::WriteData( Any* pValues ) const { - pValues[ 0 ] <<= IsDate(); - pValues[ 1 ] <<= IsTime(); + pValues[ 0 ] <<= IsDate(); + pValues[ 1 ] <<= IsTime(); pValues[ 2 ] <<= IsPagename(); pValues[ 3 ] <<= IsHiddenPages(); - pValues[ 4 ] <<= IsPagesize(); + pValues[ 4 ] <<= IsPagesize(); pValues[ 5 ] <<= IsPagetile(); pValues[ 6 ] <<= IsBooklet(); - pValues[ 7 ] <<= IsFrontPage(); - pValues[ 8 ] <<= IsBackPage(); + pValues[ 7 ] <<= IsFrontPage(); + pValues[ 8 ] <<= IsBackPage(); pValues[ 9 ] <<= IsPaperbin(); - pValues[ 10 ] <<= (sal_Int32) GetOutputQuality(); + pValues[ 10 ] <<= (sal_Int32) GetOutputQuality(); pValues[ 11 ] <<= IsDraw(); - + // just for impress if( GetConfigId() == SDCFG_IMPRESS ) { - pValues[ 12 ] <<= IsNotes(); - pValues[ 13 ] <<= IsHandout(); - pValues[ 14 ] <<= IsOutline(); + pValues[ 12 ] <<= IsNotes(); + pValues[ 13 ] <<= IsHandout(); + pValues[ 14 ] <<= IsOutline(); pValues[ 15 ] <<= IsHandoutHorizontal(); pValues[ 16 ] <<= GetHandoutPages(); } @@ -1459,16 +1459,16 @@ BOOL SdOptionsPrint::WriteData( Any* pValues ) const \************************************************************************/ SdOptionsPrintItem::SdOptionsPrintItem( USHORT _nWhich ) -: SfxPoolItem ( _nWhich ) -, maOptionsPrint ( 0, FALSE ) +: SfxPoolItem ( _nWhich ) +, maOptionsPrint ( 0, FALSE ) { } // ---------------------------------------------------------------------- SdOptionsPrintItem::SdOptionsPrintItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* ) -: SfxPoolItem ( _nWhich ) -, maOptionsPrint ( 0, FALSE ) +: SfxPoolItem ( _nWhich ) +, maOptionsPrint ( 0, FALSE ) { if( pOpts ) { diff --git a/sd/source/ui/app/popup.src b/sd/source/ui/app/popup.src index 54d25c998ff5..9bd30474750a 100644 --- a/sd/source/ui/app/popup.src +++ b/sd/source/ui/app/popup.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #include <svx/globlmn.hrc> #endif -#define DEFINE_SLOTID_FOR_NUMBER_BULLETS SID_OUTLINE_BULLET +#define DEFINE_SLOTID_FOR_NUMBER_BULLETS SID_OUTLINE_BULLET Menu RID_DRAW_TEXTOBJ_INSIDE_POPUP { @@ -367,7 +367,7 @@ Menu RID_MASTERPAGE_POPUP MN_TRANSFORM SEPARATOR MN_CHAR_PARAGRAPH - // MN_PRESENTATIONOBJECT + // MN_PRESENTATIONOBJECT SEPARATOR MN_POSITION }; diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src index 5ee8fb5e4d6a..6bbba0e37800 100644 --- a/sd/source/ui/app/popup2_tmpl.src +++ b/sd/source/ui/app/popup2_tmpl.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -164,7 +164,7 @@ SEPARATOR MN_STYLEDT SEPARATOR - + }; }; @@ -202,8 +202,8 @@ MN_EFFECT MN_ACTION #endif -// SEPARATOR -// MN_STYLEDT +// SEPARATOR +// MN_STYLEDT }; }; @@ -242,8 +242,8 @@ MN_EFFECT MN_ACTION #endif -// SEPARATOR -// MN_STYLEDT +// SEPARATOR +// MN_STYLEDT }; }; @@ -517,7 +517,7 @@ MN_SLIDE_MENU #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP MN_PAGE_MENU -#endif +#endif SEPARATOR MN_CAPTUREPOINT SEPARATOR @@ -698,7 +698,7 @@ MN_OBJECT_ALIGN MN_DISTRIBUTE MN_BREAK - + //-#i68101#---------------------- SEPARATOR MN_OBJECT_TITLE_DESCRIPTION diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src index 0901e53df0ed..2996640ee558 100755 --- a/sd/source/ui/app/res_bmp.src +++ b/sd/source/ui/app/res_bmp.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -426,7 +426,7 @@ SfxStyleFamilies DLG_STYLE_DESIGNER { < STR_STYLE_FILTER_ALL ; SFXSTYLEBIT_ALL ; > ; }; - }; + }; }; #define STYLE_IMAGE_LISTEF \ IdList = \ @@ -435,13 +435,13 @@ SfxStyleFamilies DLG_STYLE_DESIGNER }; \ IdCount = 2; - ImageList 1 // == BMP_COLOR_NORMAL + 1 + ImageList 1 // == BMP_COLOR_NORMAL + 1 { Prefix = "sf"; MaskColor = IMAGE_MASK_STDCOLOR; STYLE_IMAGE_LISTEF }; - ImageList 2 // == BMP_COLOR_HIGHCONTRAST + 1 + ImageList 2 // == BMP_COLOR_HIGHCONTRAST + 1 { Prefix = "sfh"; MaskColor = IMAGE_MASK_STDCOLOR_HC; diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index 02945586d013..a2c27ff2d8f6 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/app/sddll1.cxx b/sd/source/ui/app/sddll1.cxx index 53a2b4e9b1e9..c197fb8d3696 100755 --- a/sd/source/ui/app/sddll1.cxx +++ b/sd/source/ui/app/sddll1.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx index 3b576c8c668b..567edcbd974c 100755 --- a/sd/source/ui/app/sddll2.cxx +++ b/sd/source/ui/app/sddll2.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -151,7 +151,7 @@ void SdDLL::RegisterControllers() SvxStyleToolBoxControl::RegisterControl(0, pMod); SvxFontNameToolBoxControl::RegisterControl(0, pMod); -// SvxFontHeightToolBoxControl::RegisterControl(0, pMod); +// SvxFontHeightToolBoxControl::RegisterControl(0, pMod); SvxFontColorToolBoxControl::RegisterControl(0, pMod); SvxGrafFilterToolBoxControl::RegisterControl( SID_GRFFILTER, pMod ); @@ -207,6 +207,6 @@ void SdDLL::RegisterControllers() SvxFrameToolBoxControl::RegisterControl(SID_ATTR_BORDER, pMod ); SvxSubToolBoxControl::RegisterControl(SID_OPTIMIZE_TABLE, pMod); -// SdLayoutControl::RegisterControl( SID_ASSIGN_LAYOUT, pMod ); -// SdLayoutControl::RegisterControl( SID_INSERTPAGE, pMod ); +// SdLayoutControl::RegisterControl( SID_ASSIGN_LAYOUT, pMod ); +// SdLayoutControl::RegisterControl( SID_INSERTPAGE, pMod ); } diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index ccbc7c8f5665..fb36a7fc198b 100755 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,7 +99,7 @@ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 ) bWaterCan(FALSE), mpResourceContainer(new ::sd::SdGlobalResourceContainer()) { - SetName( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "StarDraw" ) ) ); // Nicht uebersetzen! + SetName( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "StarDraw" ) ) ); // Nicht uebersetzen! pSearchItem = new SvxSearchItem(SID_SEARCH_ITEM); pSearchItem->SetAppFlag(SVX_SEARCHAPP_DRAW); StartListening( *SFX_APP() ); @@ -274,13 +274,13 @@ SdOptions* SdModule::GetSdOptions(DocumentType eDocType) SvStorageStreamRef SdModule::GetOptionStream( const String& rOptionName, SdOptionStreamMode eMode ) { - ::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() ); - SvStorageStreamRef xStm; + ::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() ); + SvStorageStreamRef xStm; if( pDocSh ) { - DocumentType eType = pDocSh->GetDoc()->GetDocumentType(); - String aStmName; + DocumentType eType = pDocSh->GetDoc()->GetDocumentType(); + String aStmName; if( !xOptionStorage.Is() ) { diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 3c1abc0c7d22..2374f946b00b 100755 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -153,7 +153,7 @@ void SdModule::Execute(SfxRequest& rReq) FieldUnit eUnit = (FieldUnit)((const SfxUInt16Item*)pItem)->GetValue(); switch( eUnit ) { - case FUNIT_MM: // nur die Einheiten, die auch im Dialog stehen + case FUNIT_MM: // nur die Einheiten, die auch im Dialog stehen case FUNIT_CM: case FUNIT_INCH: case FUNIT_PICA: @@ -441,7 +441,7 @@ void SdModule::GetState(SfxItemSet& rItemSet) if ( !bOnce ) { ::sd::DrawDocShell* pDocShell = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current()); - if( pDocShell ) // Impress or Draw ? + if( pDocShell ) // Impress or Draw ? { ::sd::ViewShell* pViewShell = pDocShell->GetViewShell(); @@ -599,7 +599,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) std::auto_ptr< AbstractAssistentDlg > pPilotDlg( pFact ? pFact->CreateAssistentDlg( NULL, !bNewDocDirect ) : 0 ); // Open the Pilot - if( pPilotDlg.get() && pPilotDlg->Execute()==RET_OK ) + if( pPilotDlg.get() && pPilotDlg->Execute()==RET_OK ) { const String aDocPath( pPilotDlg->GetDocPath()); const sal_Bool bIsDocEmpty = pPilotDlg->IsDocEmpty(); diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 58aba6823d3a..5bca13cdeac1 100755 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -405,7 +405,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) DBG_ERROR("sd::SdModule::CalcFieldValueHdl(), unknown field type!"); } - if( aRepresentation.Len() == 0 ) // TODO: Edit engine doesn't handle empty fields? + if( aRepresentation.Len() == 0 ) // TODO: Edit engine doesn't handle empty fields? aRepresentation += sal_Unicode( ' ' ); pInfo->SetRepresentation( aRepresentation ); } @@ -421,7 +421,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) |* virt. Methoden fuer Optionendialog |* \************************************************************************/ -SfxItemSet* SdModule::CreateItemSet( USHORT nSlot ) +SfxItemSet* SdModule::CreateItemSet( USHORT nSlot ) { ::sd::FrameView* pFrameView = NULL; ::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() ); @@ -454,7 +454,7 @@ SfxItemSet* SdModule::CreateItemSet( USHORT nSlot ) SfxItemPool& rPool = GetPool(); rPool.SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); - SfxItemSet* pRet = new SfxItemSet( rPool, + SfxItemSet* pRet = new SfxItemSet( rPool, SID_ATTR_METRIC, SID_ATTR_METRIC, SID_ATTR_DEFTABSTOP, SID_ATTR_DEFTABSTOP, @@ -550,7 +550,7 @@ SfxItemSet* SdModule::CreateItemSet( USHORT nSlot ) } void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) { - const SfxPoolItem* pItem = NULL; + const SfxPoolItem* pItem = NULL; BOOL bNewDefTab = FALSE; BOOL bNewPrintOptions = FALSE; BOOL bMiscOptions = FALSE; @@ -657,9 +657,9 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) } SfxItemSet aPrintSet( GetPool(), - SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, - SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC, - ATTR_OPTIONS_PRINT, ATTR_OPTIONS_PRINT, + SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, + SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC, + ATTR_OPTIONS_PRINT, ATTR_OPTIONS_PRINT, 0 ); // Drucken @@ -672,7 +672,7 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) // PrintOptionsSet setzen SdOptionsPrintItem aPrintItem( ATTR_OPTIONS_PRINT, pOptions ); SfxFlagItem aFlagItem( SID_PRINTER_CHANGESTODOC ); - USHORT nFlags = 0; + USHORT nFlags = 0; nFlags = (aPrintItem.GetOptionsPrint().IsWarningSize() ? SFX_PRINTER_CHG_SIZE : 0) | (aPrintItem.GetOptionsPrint().IsWarningOrientation() ? SFX_PRINTER_CHG_ORIENTATION : 0); @@ -774,14 +774,14 @@ SfxTabPage* SdModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemS { case SID_SD_TP_CONTENTS: case SID_SI_TP_CONTENTS: - { ::CreateTabPage fnCreatePage = pFact->GetSdOptionsContentsTabPageCreatorFunc(); + { ::CreateTabPage fnCreatePage = pFact->GetSdOptionsContentsTabPageCreatorFunc(); if( fnCreatePage ) pRet = (*fnCreatePage)( pParent, rSet ); } break; case SID_SD_TP_SNAP: case SID_SI_TP_SNAP: - { ::CreateTabPage fnCreatePage = pFact->GetSdOptionsSnapTabPageCreatorFunc(); + { ::CreateTabPage fnCreatePage = pFact->GetSdOptionsSnapTabPageCreatorFunc(); if( fnCreatePage ) pRet = (*fnCreatePage)( pParent, rSet ); } diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx index 63d6fc0b195c..08eb6e06607b 100644 --- a/sd/source/ui/app/sdpopup.cxx +++ b/sd/source/ui/app/sdpopup.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,8 +52,8 @@ \************************************************************************/ SdFieldPopup::SdFieldPopup( const SvxFieldData* pInField, LanguageType eLanguage ) : - PopupMenu (), - pField ( pInField ) + PopupMenu (), + pField ( pInField ) { Fill( eLanguage ); } @@ -92,24 +92,24 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) else CheckItem( 2 ); - //SVXDATEFORMAT_APPDEFAULT, // Wird nicht benutzt - //SVXDATEFORMAT_SYSTEM, // Wird nicht benutzt + //SVXDATEFORMAT_APPDEFAULT, // Wird nicht benutzt + //SVXDATEFORMAT_SYSTEM, // Wird nicht benutzt InsertItem( nID++, String( SdResId( STR_STANDARD_SMALL ) ), nStyle ); InsertItem( nID++, String( SdResId( STR_STANDARD_BIG ) ), nStyle ); SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter(); - aDateField.SetFormat( SVXDATEFORMAT_A ); // 13.02.96 + aDateField.SetFormat( SVXDATEFORMAT_A ); // 13.02.96 InsertItem( nID++, aDateField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); - aDateField.SetFormat( SVXDATEFORMAT_B ); // 13.02.1996 + aDateField.SetFormat( SVXDATEFORMAT_B ); // 13.02.1996 InsertItem( nID++, aDateField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); - aDateField.SetFormat( SVXDATEFORMAT_C ); // 13.Feb 1996 + aDateField.SetFormat( SVXDATEFORMAT_C ); // 13.Feb 1996 InsertItem( nID++, aDateField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); - aDateField.SetFormat( SVXDATEFORMAT_D ); // 13.Februar 1996 + aDateField.SetFormat( SVXDATEFORMAT_D ); // 13.Februar 1996 InsertItem( nID++, aDateField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); - aDateField.SetFormat( SVXDATEFORMAT_E ); // Die, 13.Februar 1996 + aDateField.SetFormat( SVXDATEFORMAT_E ); // Die, 13.Februar 1996 InsertItem( nID++, aDateField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); - aDateField.SetFormat( SVXDATEFORMAT_F ); // Dienstag, 13.Februar 1996 + aDateField.SetFormat( SVXDATEFORMAT_F ); // Dienstag, 13.Februar 1996 InsertItem( nID++, aDateField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); CheckItem( (USHORT) ( pDateField->GetFormat() ) + 1 ); // - 2 + 3 ! @@ -124,27 +124,27 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) else CheckItem( 2 ); - //SVXTIMEFORMAT_APPDEFAULT, // Wird nicht benutzt - //SVXTIMEFORMAT_SYSTEM, // Wird nicht benutzt + //SVXTIMEFORMAT_APPDEFAULT, // Wird nicht benutzt + //SVXTIMEFORMAT_SYSTEM, // Wird nicht benutzt InsertItem( nID++, String( SdResId( STR_STANDARD_NORMAL ) ), nStyle ); SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter(); - aTimeField.SetFormat( SVXTIMEFORMAT_24_HM ); // 13:49 + aTimeField.SetFormat( SVXTIMEFORMAT_24_HM ); // 13:49 InsertItem( nID++, aTimeField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); - aTimeField.SetFormat( SVXTIMEFORMAT_24_HMS ); // 13:49:38 + aTimeField.SetFormat( SVXTIMEFORMAT_24_HMS ); // 13:49:38 InsertItem( nID++, aTimeField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); - aTimeField.SetFormat( SVXTIMEFORMAT_24_HMSH ); // 13:49:38.78 + aTimeField.SetFormat( SVXTIMEFORMAT_24_HMSH ); // 13:49:38.78 InsertItem( nID++, aTimeField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); - aTimeField.SetFormat( SVXTIMEFORMAT_12_HM ); // 01:49 + aTimeField.SetFormat( SVXTIMEFORMAT_12_HM ); // 01:49 InsertItem( nID++, aTimeField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); - aTimeField.SetFormat( SVXTIMEFORMAT_12_HMS ); // 01:49:38 + aTimeField.SetFormat( SVXTIMEFORMAT_12_HMS ); // 01:49:38 InsertItem( nID++, aTimeField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); - aTimeField.SetFormat( SVXTIMEFORMAT_12_HMSH ); // 01:49:38.78 + aTimeField.SetFormat( SVXTIMEFORMAT_12_HMSH ); // 01:49:38.78 InsertItem( nID++, aTimeField.GetFormatted( *pNumberFormatter, eLanguage ), nStyle ); - //SVXTIMEFORMAT_AM_HM, // 01:49 PM - //SVXTIMEFORMAT_AM_HMS, // 01:49:38 PM - //SVXTIMEFORMAT_AM_HMSH // 01:49:38.78 PM + //SVXTIMEFORMAT_AM_HM, // 01:49 PM + //SVXTIMEFORMAT_AM_HMS, // 01:49:38 PM + //SVXTIMEFORMAT_AM_HMSH // 01:49:38.78 PM CheckItem( (USHORT) ( pTimeField->GetFormat() ) + 1 ); // - 2 + 3 ! } @@ -199,7 +199,7 @@ SvxFieldData* SdFieldPopup::GetField() if( pField->ISA( SvxDateField ) ) { const SvxDateField* pDateField = (const SvxDateField*) pField; - SvxDateType eType; + SvxDateType eType; SvxDateFormat eFormat; USHORT i; @@ -232,7 +232,7 @@ SvxFieldData* SdFieldPopup::GetField() else if( pField->ISA( SvxExtTimeField ) ) { const SvxExtTimeField* pTimeField = (const SvxExtTimeField*) pField; - SvxTimeType eType; + SvxTimeType eType; SvxTimeFormat eFormat; USHORT i; @@ -266,7 +266,7 @@ SvxFieldData* SdFieldPopup::GetField() else if( pField->ISA( SvxExtFileField ) ) { const SvxExtFileField* pFileField = (const SvxExtFileField*) pField; - SvxFileType eType; + SvxFileType eType; SvxFileFormat eFormat; USHORT i; @@ -306,7 +306,7 @@ SvxFieldData* SdFieldPopup::GetField() else if( pField->ISA( SvxAuthorField ) ) { const SvxAuthorField* pAuthorField = (const SvxAuthorField*) pField; - SvxAuthorType eType; + SvxAuthorType eType; SvxAuthorFormat eFormat; USHORT i; diff --git a/sd/source/ui/app/sdresid.cxx b/sd/source/ui/app/sdresid.cxx index cc32bcb7a8d5..f5dfe11badfd 100644 --- a/sd/source/ui/app/sdresid.cxx +++ b/sd/source/ui/app/sdresid.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/app/sdstring.src b/sd/source/ui/app/sdstring.src index 1b520fb140a8..d9d399aa31ee 100644 --- a/sd/source/ui/app/sdstring.src +++ b/sd/source/ui/app/sdstring.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index ddbc0698a341..0bba7d7049a5 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -96,33 +96,33 @@ using namespace ::com::sun::star::datatransfer::clipboard; // - Defines - // ----------- -#define SDTRANSFER_OBJECTTYPE_DRAWMODEL 0x00000001 -#define SDTRANSFER_OBJECTTYPE_DRAWOLE 0x00000002 +#define SDTRANSFER_OBJECTTYPE_DRAWMODEL 0x00000001 +#define SDTRANSFER_OBJECTTYPE_DRAWOLE 0x00000002 // ------------------ // - SdTransferable - // ------------------ SdTransferable::SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, BOOL bInitOnGetData ) -: mpPageDocShell( NULL ) -, mpOLEDataHelper( NULL ) -, mpObjDesc( NULL ) -, mpSdView( pWorkView ) -, mpSdViewIntern( pWorkView ) -, mpSdDrawDocument( NULL ) -, mpSdDrawDocumentIntern( NULL ) -, mpSourceDoc( pSrcDoc ) -, mpVDev( NULL ) -, mpBookmark( NULL ) -, mpGraphic( NULL ) -, mpImageMap( NULL ) -, mbInternalMove( FALSE ) -, mbOwnDocument( FALSE ) -, mbOwnView( FALSE ) -, mbLateInit( bInitOnGetData ) -, mbPageTransferable( FALSE ) -, mbPageTransferablePersistent( FALSE ) -, mbIsUnoObj( false ) +: mpPageDocShell( NULL ) +, mpOLEDataHelper( NULL ) +, mpObjDesc( NULL ) +, mpSdView( pWorkView ) +, mpSdViewIntern( pWorkView ) +, mpSdDrawDocument( NULL ) +, mpSdDrawDocumentIntern( NULL ) +, mpSourceDoc( pSrcDoc ) +, mpVDev( NULL ) +, mpBookmark( NULL ) +, mpGraphic( NULL ) +, mpImageMap( NULL ) +, mbInternalMove( FALSE ) +, mbOwnDocument( FALSE ) +, mbOwnView( FALSE ) +, mbLateInit( bInitOnGetData ) +, mbPageTransferable( FALSE ) +, mbPageTransferablePersistent( FALSE ) +, mbIsUnoObj( false ) { if( mpSourceDoc ) StartListening( *mpSourceDoc ); @@ -229,8 +229,8 @@ void SdTransferable::CreateObjectReplacement( SdrObject* pObj ) if( !xPropSet.is() ) return; - ::com::sun::star::form::FormButtonType eButtonType; - Any aTmp( xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ButtonType" ) ) ) ); + ::com::sun::star::form::FormButtonType eButtonType; + Any aTmp( xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ButtonType" ) ) ) ); if( aTmp >>= eButtonType ) { @@ -265,7 +265,7 @@ void SdTransferable::CreateObjectReplacement( SdrObject* pObj ) } } - SdIMapInfo* pInfo = static_cast< SdDrawDocument* >( pObj->GetModel() )->GetIMapInfo( static_cast< SdrObject* >( pObj ) ); + SdIMapInfo* pInfo = static_cast< SdDrawDocument* >( pObj->GetModel() )->GetIMapInfo( static_cast< SdrObject* >( pObj ) ); if( pInfo ) mpImageMap = new ImageMap( pInfo->GetImageMap() ); @@ -318,13 +318,13 @@ void SdTransferable::CreateData() } // Groesse der Source-Seite uebernehmen - SdrPageView* pPgView = mpSdView->GetSdrPageView(); - SdPage* pOldPage = (SdPage*) pPgView->GetPage(); - SdrModel* pOldModel = mpSdView->GetModel(); - SdStyleSheetPool* pOldStylePool = (SdStyleSheetPool*) pOldModel->GetStyleSheetPool(); - SdStyleSheetPool* pNewStylePool = (SdStyleSheetPool*) mpSdDrawDocumentIntern->GetStyleSheetPool(); - SdPage* pPage = mpSdDrawDocumentIntern->GetSdPage( 0, PK_STANDARD ); - String aOldLayoutName( pOldPage->GetLayoutName() ); + SdrPageView* pPgView = mpSdView->GetSdrPageView(); + SdPage* pOldPage = (SdPage*) pPgView->GetPage(); + SdrModel* pOldModel = mpSdView->GetModel(); + SdStyleSheetPool* pOldStylePool = (SdStyleSheetPool*) pOldModel->GetStyleSheetPool(); + SdStyleSheetPool* pNewStylePool = (SdStyleSheetPool*) mpSdDrawDocumentIntern->GetStyleSheetPool(); + SdPage* pPage = mpSdDrawDocumentIntern->GetSdPage( 0, PK_STANDARD ); + String aOldLayoutName( pOldPage->GetLayoutName() ); pPage->SetSize( pOldPage->GetSize() ); pPage->SetLayoutName( aOldLayoutName ); @@ -341,12 +341,12 @@ void SdTransferable::CreateData() mpSdDrawDocumentIntern && mpSdViewIntern && mpSdDrawDocumentIntern->GetPageCount() ) { - SdPage* pPage = mpSdDrawDocumentIntern->GetSdPage( 0, PK_STANDARD ); + SdPage* pPage = mpSdDrawDocumentIntern->GetSdPage( 0, PK_STANDARD ); if( 1 == mpSdDrawDocumentIntern->GetPageCount() ) { - Point aOrigin( ( maVisArea = mpSdViewIntern->GetAllMarkedRect() ).TopLeft() ); - Size aVector( -aOrigin.X(), -aOrigin.Y() ); + Point aOrigin( ( maVisArea = mpSdViewIntern->GetAllMarkedRect() ).TopLeft() ); + Size aVector( -aOrigin.X(), -aOrigin.Y() ); for( ULONG nObj = 0, nObjCount = pPage->GetObjCount(); nObj < nObjCount; nObj++ ) { @@ -426,8 +426,8 @@ void SdTransferable::AddSupportedFormats() { AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE ); - DataFlavorExVector aVector( mpOLEDataHelper->GetDataFlavorExVector() ); - DataFlavorExVector::iterator aIter( aVector.begin() ), aEnd( aVector.end() ); + DataFlavorExVector aVector( mpOLEDataHelper->GetDataFlavorExVector() ); + DataFlavorExVector::iterator aIter( aVector.begin() ), aEnd( aVector.end() ); while( aIter != aEnd ) AddFormat( *aIter++ ); @@ -481,8 +481,8 @@ sal_Bool SdTransferable::GetData( const DataFlavor& rFlavor ) if (SD_MOD()==NULL) return sal_False; - sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor ); - sal_Bool bOK = sal_False; + sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor ); + sal_Bool bOK = sal_False; CreateData(); @@ -871,7 +871,7 @@ sal_Bool SdTransferable::SetTableRTF( SdDrawDocument* pModel, const DataFlavor& if( pTableObj ) { SvMemoryStream aMemStm( 65535, 65535 ); - sdr::table::SdrTableObj::ExportAsRTF( aMemStm, *pTableObj ); + sdr::table::SdrTableObj::ExportAsRTF( aMemStm, *pTableObj ); return SetAny( Any( Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aMemStm.GetData() ), aMemStm.Seek( STREAM_SEEK_TO_END ) ) ), rFlavor ); } } diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src index e992e7016f04..969a6738a0ef 100755 --- a/sd/source/ui/app/strings.src +++ b/sd/source/ui/app/strings.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1241,7 +1241,7 @@ String RID_ANNOTATIONS_START }; String STR_RESET_LAYOUT { - Text[ en-US ] = "Reset Slide Layout"; + Text[ en-US ] = "Reset Slide Layout"; }; String STR_INSERT_TABLE diff --git a/sd/source/ui/app/tbx_ww.src b/sd/source/ui/app/tbx_ww.src index 67e62be0f1be..91336d5a93ef 100644 --- a/sd/source/ui/app/tbx_ww.src +++ b/sd/source/ui/app/tbx_ww.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/app/tbxids_tmpl.src b/sd/source/ui/app/tbxids_tmpl.src index 90fd733434a7..4da4f604034d 100644 --- a/sd/source/ui/app/tbxids_tmpl.src +++ b/sd/source/ui/app/tbxids_tmpl.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx index 80bd3a5ac8b9..b3d234283bbf 100644 --- a/sd/source/ui/app/tbxww.cxx +++ b/sd/source/ui/app/tbxww.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ #endif #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> - + #include "sddll.hxx" #include "GraphicDocShell.hxx" @@ -63,11 +63,11 @@ SFX_IMPL_TOOLBOX_CONTROL( SdTbxControl, TbxImageItem ) SdPopupWindowTbx::SdPopupWindowTbx( USHORT nId, WindowAlign eAlign, SdResId aRIdWin, SdResId aRIdTbx, SfxBindings& rBindings ) : - SfxPopupWindow ( nId, aRIdWin, rBindings ), + SfxPopupWindow ( nId, aRIdWin, rBindings ), aTbx ( this, GetBindings(), aRIdTbx ), aSdResIdWin ( aRIdWin ), aSdResIdTbx ( aRIdTbx ), - eTbxAlign ( eAlign ) + eTbxAlign ( eAlign ) { aTbx.UseDefault(); aSelectLink = aTbx.GetToolBox().GetSelectHdl(); @@ -79,7 +79,7 @@ SdPopupWindowTbx::SdPopupWindowTbx( USHORT nId, WindowAlign eAlign, { if ( aSdResIdWin.GetId() != RID_TEXT ) aTbx.GetToolBox().SetAlign( WINDOWALIGN_LEFT ); - + SetText( String() ); } @@ -179,7 +179,7 @@ IMPL_LINK( SdPopupWindowTbx, TbxSelectHdl, ToolBox*, pBox) if ( pBox->GetModifier() & KEY_MOD1 ) { - // #99013# if selected with control key, return focus to current view + // #99013# if selected with control key, return focus to current view Window* pShellWnd = SfxViewShell::Current()->GetWindow(); if ( pShellWnd ) pShellWnd->GrabFocus(); @@ -216,7 +216,7 @@ SfxPopupWindowType SdTbxControl::GetPopupWindowType() const |* \************************************************************************/ -SfxPopupWindow* SdTbxControl::CreatePopupWindow() +SfxPopupWindow* SdTbxControl::CreatePopupWindow() { SfxPopupWindow *pWin = NULL; rtl::OUString aToolBarResStr; @@ -272,10 +272,10 @@ SfxPopupWindow* SdTbxControl::CreatePopupWindow() aToolBarResStr = aTbxResName.makeStringAndClear(); break; } - + if ( aToolBarResStr.getLength() > 0 ) createAndPositionSubToolBar( aToolBarResStr ); - + return( pWin ); } @@ -305,7 +305,7 @@ void SdTbxControl::StateChanged( USHORT nSId, { rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); aSlotURL += rtl::OUString::valueOf( sal_Int32( nImage )); - Image aImage = GetImage( m_xFrame, + Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages(), GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode() ); diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx index 039df4bbce3f..7ba048a0d01a 100644 --- a/sd/source/ui/app/tmplctrl.cxx +++ b/sd/source/ui/app/tmplctrl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,10 +52,10 @@ class TemplatePopup_Impl : public PopupMenu public: TemplatePopup_Impl(); - USHORT GetCurId() const { return nCurId; } + USHORT GetCurId() const { return nCurId; } private: - USHORT nCurId; + USHORT nCurId; virtual void Select(); }; @@ -131,13 +131,13 @@ void SdTemplateControl::Command( const CommandEvent& rCEvt ) TemplatePopup_Impl aPop; { const USHORT nMasterCount = pDoc->GetMasterSdPageCount(PK_STANDARD); - + USHORT nCount = 0; for( USHORT nPage = 0; nPage < nMasterCount; ++nPage ) { SdPage* pMaster = pDoc->GetMasterSdPage(nPage, PK_STANDARD); if( pMaster ) - aPop.InsertItem( ++nCount, pMaster->GetName() ); + aPop.InsertItem( ++nCount, pMaster->GetName() ); } aPop.Execute( &GetStatusBar(), rCEvt.GetMousePosPixel()); diff --git a/sd/source/ui/app/toolbox.src b/sd/source/ui/app/toolbox.src index a3446a2c58b4..945bb0b0aae9 100644 --- a/sd/source/ui/app/toolbox.src +++ b/sd/source/ui/app/toolbox.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/app/toolbox2_tmpl.src b/sd/source/ui/app/toolbox2_tmpl.src index d5033cef9127..c2122678f6b9 100644 --- a/sd/source/ui/app/toolbox2_tmpl.src +++ b/sd/source/ui/app/toolbox2_tmpl.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 1a9201af6555..1b71029eb759 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -23,7 +23,7 @@ * <http://www.openoffice.org/license.html> * for a copy of the LGPLv3 License. * - ************************************************************************/ + ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" @@ -136,15 +136,15 @@ static snewfoil_value_info standard[] = { {BMP_LAYOUT_EMPTY, BMP_LAYOUT_EMPTY_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE}, {BMP_LAYOUT_HEAD03, BMP_LAYOUT_HEAD03_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE}, - {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM}, + {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM}, {BMP_LAYOUT_HEAD02A, BMP_LAYOUT_HEAD02A_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT}, - {BMP_LAYOUT_HEAD01, BMP_LAYOUT_HEAD01_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE}, + {BMP_LAYOUT_HEAD01, BMP_LAYOUT_HEAD01_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE}, {BMP_LAYOUT_TEXTONLY, BMP_LAYOUT_TEXTONLY_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT}, {BMP_LAYOUT_HEAD03B, BMP_LAYOUT_HEAD03B_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT}, {BMP_LAYOUT_HEAD03C, BMP_LAYOUT_HEAD03C_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ}, - {BMP_LAYOUT_HEAD03A, BMP_LAYOUT_HEAD03A_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT}, + {BMP_LAYOUT_HEAD03A, BMP_LAYOUT_HEAD03A_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT}, {BMP_LAYOUT_HEAD02B, BMP_LAYOUT_HEAD02B_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT}, - {BMP_LAYOUT_HEAD04, BMP_LAYOUT_HEAD04_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ}, + {BMP_LAYOUT_HEAD04, BMP_LAYOUT_HEAD04_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ}, {BMP_LAYOUT_HEAD06, BMP_LAYOUT_HEAD06_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART}, {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} }; @@ -207,7 +207,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const String aTitle1( SdResId( STR_GLUE_ESCDIR_HORZ ) ); String aTitle2( SdResId( STR_GLUE_ESCDIR_VERT ) ); - + const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); SvtLanguageOptions aLanguageOptions; const bool bVerticalEnabled = aLanguageOptions.IsVerticalTextEnabled(); @@ -243,7 +243,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const if( bVerticalEnabled && (eMode == DrawViewMode_DRAW) ) { mpLayoutSet2 = new ValueSet( this, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); - // mpLayoutSet2->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); + // mpLayoutSet2->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); mpLayoutSet2->SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectHdl ) ); mpLayoutSet2->SetColCount( 4 ); diff --git a/sd/source/ui/controller/slidelayoutcontroller.hxx b/sd/source/ui/controller/slidelayoutcontroller.hxx index 5e76d3ad74c7..8d1e6aee6860 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.hxx +++ b/sd/source/ui/controller/slidelayoutcontroller.hxx @@ -23,7 +23,7 @@ * <http://www.openoffice.org/license.html> * for a copy of the LGPLv3 License. * - ************************************************************************/ + ************************************************************************/ #ifndef __SD_SLIDELAYOUTCONTROLLER_HXX_ #define __SD_SLIDELAYOUTCONTROLLER_HXX_ @@ -42,7 +42,7 @@ public: // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); using svt::PopupWindowController::createPopupWindow; private: diff --git a/sd/source/ui/dlg/AnimationChildWindow.cxx b/sd/source/ui/dlg/AnimationChildWindow.cxx index fa62b21948a8..807a4fc4f386 100644 --- a/sd/source/ui/dlg/AnimationChildWindow.cxx +++ b/sd/source/ui/dlg/AnimationChildWindow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ AnimationChildWindow::AnimationChildWindow( ::Window* _pParent, USHORT nId, SfxBindings* pBindings, - SfxChildWinInfo* pInfo ) + SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) { AnimationWindow* pAnimWin = new AnimationWindow( diff --git a/sd/source/ui/dlg/LayerDialog.src b/sd/source/ui/dlg/LayerDialog.src index 9d620d8e595f..2bf8e8b9fe18 100644 --- a/sd/source/ui/dlg/LayerDialog.src +++ b/sd/source/ui/dlg/LayerDialog.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/LayerDialogChildWindow.cxx b/sd/source/ui/dlg/LayerDialogChildWindow.cxx index 8725cfc594fd..f49a6c2a60a4 100644 --- a/sd/source/ui/dlg/LayerDialogChildWindow.cxx +++ b/sd/source/ui/dlg/LayerDialogChildWindow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,15 +55,15 @@ LayerDialogChildWindow::LayerDialogChildWindow ( ::Window* _pParent, USHORT nId, SfxBindings* pBindings, - SfxChildWinInfo* pInfo) + SfxChildWinInfo* pInfo) : SfxChildWindow (_pParent, nId) { ViewShellBase& rBase (*ViewShellBase::GetViewShellBase( pBindings->GetDispatcher()->GetFrame())); LayerDialogContent* pContent = new LayerDialogContent ( - pBindings, - this, - _pParent, + pBindings, + this, + _pParent, SdResId( FLT_WIN_LAYER_DIALOG), rBase); pWindow = pContent; diff --git a/sd/source/ui/dlg/LayerDialogContent.cxx b/sd/source/ui/dlg/LayerDialogContent.cxx index 975d277c7dff..74c5660d8fe7 100755 --- a/sd/source/ui/dlg/LayerDialogContent.cxx +++ b/sd/source/ui/dlg/LayerDialogContent.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index 29425a3bda71..7a0d8e2f525f 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ namespace sd { |* \************************************************************************/ -LayerTabBar::LayerTabBar(DrawViewShell* pViewSh, Window* pParent) +LayerTabBar::LayerTabBar(DrawViewShell* pViewSh, Window* pParent) : TabBar( pParent, WinBits( WB_BORDER | WB_3DLOOK | WB_SCROLL | WB_SIZEABLE ) ), DropTargetHelper( this ), pDrViewSh(pViewSh) @@ -76,9 +76,9 @@ LayerTabBar::LayerTabBar(DrawViewShell* pViewSh, Window* pParent) LayerTabBar::LayerTabBar ( - DrawViewShell* pViewSh, - Window* pParent, - const ResId& rResId) + DrawViewShell* pViewSh, + Window* pParent, + const ResId& rResId) : TabBar (pParent, rResId.GetWinBits()), DropTargetHelper( this ), pDrViewSh(pViewSh) @@ -167,14 +167,14 @@ sal_Int8 LayerTabBar::AcceptDrop( const AcceptDropEvent& rEvt ) { sal_Int8 nRet = DND_ACTION_NONE; - if( rEvt.mbLeaving ) + if( rEvt.mbLeaving ) EndSwitchPage(); if( !pDrViewSh->GetDocSh()->IsReadOnly() ) { - USHORT nPageId = SDRPAGE_NOTFOUND; - Point aPos( PixelToLogic( rEvt.maPosPixel ) ); - USHORT nLayerId = pDrViewSh->GetView()->GetDoc()->GetLayerAdmin().GetLayerID( GetPageText( GetPageId( aPos ) ), FALSE ); + USHORT nPageId = SDRPAGE_NOTFOUND; + Point aPos( PixelToLogic( rEvt.maPosPixel ) ); + USHORT nLayerId = pDrViewSh->GetView()->GetDoc()->GetLayerAdmin().GetLayerID( GetPageText( GetPageId( aPos ) ), FALSE ); nRet = pDrViewSh->AcceptDrop( rEvt, *this, NULL, nPageId, nLayerId ); @@ -192,9 +192,9 @@ sal_Int8 LayerTabBar::AcceptDrop( const AcceptDropEvent& rEvt ) sal_Int8 LayerTabBar::ExecuteDrop( const ExecuteDropEvent& rEvt ) { - USHORT nPageId = SDRPAGE_NOTFOUND; - USHORT nLayerId = pDrViewSh->GetView()->GetDoc()->GetLayerAdmin().GetLayerID( GetPageText( GetPageId( PixelToLogic( rEvt.maPosPixel ) ) ), FALSE ); - sal_Int8 nRet = pDrViewSh->ExecuteDrop( rEvt, *this, NULL, nPageId, nLayerId ); + USHORT nPageId = SDRPAGE_NOTFOUND; + USHORT nLayerId = pDrViewSh->GetView()->GetDoc()->GetLayerAdmin().GetLayerID( GetPageText( GetPageId( PixelToLogic( rEvt.maPosPixel ) ) ), FALSE ); + sal_Int8 nRet = pDrViewSh->ExecuteDrop( rEvt, *this, NULL, nPageId, nLayerId ); EndSwitchPage(); @@ -356,7 +356,7 @@ void LayerTabBar::ActivatePage() { if ( /*IsInSwitching*/ 1 && pDrViewSh!=NULL) { - + SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher(); pDispatcher->Execute(SID_SWITCHLAYER, SFX_CALLMODE_ASYNCHRON); } diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx b/sd/source/ui/dlg/NavigatorChildWindow.cxx index a17a4064bf6e..f09bb38befd4 100644 --- a/sd/source/ui/dlg/NavigatorChildWindow.cxx +++ b/sd/source/ui/dlg/NavigatorChildWindow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ NavigatorChildWindow::NavigatorChildWindow ( ::Window* pParent, USHORT nId, SfxBindings* pBindings, - SfxChildWinInfo* ) + SfxChildWinInfo* ) : SfxChildWindowContext( nId ) { SdNavigatorWin* pNavWin = new SdNavigatorWin( pParent, this, diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index 181fc8433c22..83c8178ce8ae 100755 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,17 +56,17 @@ SFX_IMPL_DOCKINGWINDOW( ToolPanelChildWindow, SID_TASKPANE) PaneChildWindow::PaneChildWindow ( ::Window* pParentWindow, - USHORT nId, - SfxBindings* pBindings, + USHORT nId, + SfxBindings* pBindings, SfxChildWinInfo* pInfo, const USHORT nDockWinTitleResId, const USHORT nTitleBarResId, - SfxChildAlignment eAlignment) + SfxChildAlignment eAlignment) : SfxChildWindow (pParentWindow, nId) { pWindow = new PaneDockingWindow ( - pBindings, - this, + pBindings, + this, pParentWindow, SdResId( nDockWinTitleResId ), String( SdResId( nTitleBarResId ) ) ); @@ -104,9 +104,9 @@ PaneChildWindow::~PaneChildWindow (void) LeftPaneImpressChildWindow::LeftPaneImpressChildWindow ( ::Window* pParentWindow, - USHORT nId, - SfxBindings* pBindings, - SfxChildWinInfo* pInfo) + USHORT nId, + SfxBindings* pBindings, + SfxChildWinInfo* pInfo) : PaneChildWindow( pParentWindow, nId, @@ -125,9 +125,9 @@ LeftPaneImpressChildWindow::LeftPaneImpressChildWindow ( LeftPaneDrawChildWindow::LeftPaneDrawChildWindow ( ::Window* pParentWindow, - USHORT nId, - SfxBindings* pBindings, - SfxChildWinInfo* pInfo) + USHORT nId, + SfxBindings* pBindings, + SfxChildWinInfo* pInfo) : PaneChildWindow( pParentWindow, nId, @@ -146,7 +146,7 @@ LeftPaneDrawChildWindow::LeftPaneDrawChildWindow ( //= ToolPanelChildWindow //====================================================================================================================== //---------------------------------------------------------------------------------------------------------------------- -ToolPanelChildWindow::ToolPanelChildWindow( ::Window* i_pParentWindow, USHORT i_nId, SfxBindings* i_pBindings, +ToolPanelChildWindow::ToolPanelChildWindow( ::Window* i_pParentWindow, USHORT i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pChildWindowInfo ) :PaneChildWindow( i_pParentWindow, i_nId, i_pBindings, i_pChildWindowInfo, FLT_TOOL_PANEL_DOCKING_WINDOW, STR_RIGHT_PANE_TITLE, SFX_ALIGN_RIGHT ) diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index c1dedd5d8293..e859b7ed72cb 100755 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/PaneDockingWindow.src b/sd/source/ui/dlg/PaneDockingWindow.src index 23b0d19ac79b..0b366e142bd5 100755 --- a/sd/source/ui/dlg/PaneDockingWindow.src +++ b/sd/source/ui/dlg/PaneDockingWindow.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ DockingWindow FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW { - // HelpID = SID_EFFECT_WIN ; + // HelpID = SID_EFFECT_WIN ; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -45,7 +45,7 @@ DockingWindow FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW DockingWindow FLT_LEFT_PANE_DRAW_DOCKING_WINDOW { - // HelpID = SID_EFFECT_WIN ; + // HelpID = SID_EFFECT_WIN ; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -61,7 +61,7 @@ DockingWindow FLT_LEFT_PANE_DRAW_DOCKING_WINDOW DockingWindow FLT_TOOL_PANEL_DOCKING_WINDOW { - // HelpID = SID_EFFECT_WIN ; + // HelpID = SID_EFFECT_WIN ; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx index bb1023482ea0..3b3589d66a7b 100755 --- a/sd/source/ui/dlg/PaneShells.cxx +++ b/sd/source/ui/dlg/PaneShells.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx index 7aee12f23bbd..0720283e114f 100755 --- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx +++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,9 +35,9 @@ #include <sfx2/dispatch.hxx> namespace sd{ - + SFX_IMPL_CHILDWINDOW(SpellDialogChildWindow, SID_SPELL_DIALOG) -} +} #include "ViewShell.hxx" #include "ViewShellBase.hxx" @@ -50,9 +50,9 @@ SFX_IMPL_CHILDWINDOW(SpellDialogChildWindow, SID_SPELL_DIALOG) namespace sd { SpellDialogChildWindow::SpellDialogChildWindow ( - ::Window* _pParent, + ::Window* _pParent, USHORT nId, - SfxBindings* pBindings, + SfxBindings* pBindings, SfxChildWinInfo* pInfo) : ::svx::SpellDialogChildWindow (_pParent, nId, pBindings, pInfo), mpSdOutliner (NULL), diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index 9f510f20c55d..5ba718381859 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace { +namespace { const ::rtl::OUString TITLE = ::rtl::OUString::createFromAscii ("Title"); const ::rtl::OUString TARGET_DIR_URL = ::rtl::OUString::createFromAscii ("TargetDirURL"); @@ -59,7 +59,7 @@ const ::rtl::OUString TARGET_URL = ::rtl::OUString::createFromAscii ("Targ const ::rtl::OUString DOCTEMPLATES = ::rtl::OUString::createFromAscii ("com.sun.star.frame.DocumentTemplates"); -// These strings are used to find impress templates in the tree of +// These strings are used to find impress templates in the tree of // template files. Should probably be determined dynamically. const ::rtl::OUString IMPRESS_BIN_TEMPLATE = ::rtl::OUString::createFromAscii ("application/vnd.stardivision.impress"); const ::rtl::OUString IMPRESS_XML_TEMPLATE = MIMETYPE_VND_SUN_XML_IMPRESS; @@ -127,7 +127,7 @@ int Classify (const ::rtl::OUString&, const ::rtl::OUString& rsURL) // highest priority. nPriority = 10; } - + return nPriority; } @@ -136,7 +136,7 @@ int Classify (const ::rtl::OUString&, const ::rtl::OUString& rsURL) -namespace sd +namespace sd { class TemplateScanner::FolderDescriptorList @@ -166,7 +166,7 @@ TemplateScanner::TemplateScanner (void) TemplateScanner::~TemplateScanner (void) { mpFolderDescriptors.reset(); - + // Delete all entries of the template list that have not been // transferred to another object. std::vector<TemplateDir*>::iterator I; @@ -181,7 +181,7 @@ TemplateScanner::~TemplateScanner (void) TemplateScanner::State TemplateScanner::GetTemplateRoot (void) { State eNextState (INITIALIZE_FOLDER_SCANNING); - + Reference<lang::XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory (); DBG_ASSERT (xFactory.is(), "TemplateScanner::GetTemplateRoot: xFactory is NULL"); @@ -227,7 +227,7 @@ TemplateScanner::State TemplateScanner::InitializeEntryScanning (void) } else eNextState = ERROR; - + return eNextState; } @@ -258,7 +258,7 @@ TemplateScanner::State TemplateScanner::ScanEntry (void) // first if necessary). if ( (sContentType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE) || (sContentType == IMPRESS_XML_TEMPLATE_OASIS) - || (sContentType == IMPRESS_BIN_TEMPLATE) + || (sContentType == IMPRESS_BIN_TEMPLATE) || (sContentType == IMPRESS_XML_TEMPLATE) || (sContentType == IMPRESS_XML_TEMPLATE_B)) { @@ -287,7 +287,7 @@ TemplateScanner::State TemplateScanner::ScanEntry (void) eNextState = SCAN_FOLDER; } } - + return eNextState; } @@ -310,7 +310,7 @@ TemplateScanner::State TemplateScanner::InitializeFolderScanning (void) Sequence<rtl::OUString> aProps (2); aProps[0] = TITLE; aProps[1] = TARGET_DIR_URL; - + // Create an cursor to iterate over the template folders. ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_ONLY; mxFolderResultSet = Reference<sdbc::XResultSet>( @@ -332,7 +332,7 @@ TemplateScanner::State TemplateScanner::InitializeFolderScanning (void) TemplateScanner::State TemplateScanner::GatherFolderList (void) { State eNextState (ERROR); - + Reference<com::sun::star::ucb::XContentAccess> xContentAccess (mxFolderResultSet, UNO_QUERY); if (xContentAccess.is() && mxFolderResultSet.is()) { @@ -357,7 +357,7 @@ TemplateScanner::State TemplateScanner::GatherFolderList (void) eNextState = SCAN_FOLDER; } - + return eNextState; } @@ -376,7 +376,7 @@ TemplateScanner::State TemplateScanner::ScanFolder (void) ::rtl::OUString sTitle (aDescriptor.msTitle); ::rtl::OUString sTargetDir (aDescriptor.msTargetDir); ::rtl::OUString aId (aDescriptor.msContentIdentifier); - + maFolderContent = ::ucbhelper::Content (aId, aDescriptor.mxFolderEnvironment); if (maFolderContent.isFolder()) { @@ -394,7 +394,7 @@ TemplateScanner::State TemplateScanner::ScanFolder (void) { eNextState = DONE; } - + return eNextState; } @@ -441,7 +441,7 @@ void TemplateScanner::RunNextStep (void) case INITIALIZE_ENTRY_SCAN: meState = InitializeEntryScanning(); break; - + case SCAN_ENTRY: meState = ScanEntry(); break; diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index e179a0ba9f86..ed9706aad493 100755 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include <com/sun/star/presentation/AnimationEffect.hpp> #include <com/sun/star/presentation/AnimationSpeed.hpp> -#define _ANIMATION //animation freischalten +#define _ANIMATION //animation freischalten #define _SV_BITMAPEX #include <svx/xoutbmp.hxx> @@ -55,7 +55,7 @@ #include "res_bmp.hrc" #include "ViewShell.hxx" -#ifndef _SV_SVAPP_HXX_ +#ifndef _SV_SVAPP_HXX_ #include <vcl/svapp.hxx> #endif @@ -67,7 +67,7 @@ using namespace ::com::sun::star; namespace sd { /************************************************************************* -|* SdDisplay - Control +|* SdDisplay - Control \************************************************************************/ SdDisplay::SdDisplay( Window* pWin, SdResId Id ) : @@ -135,14 +135,14 @@ void SdDisplay::DataChanged( const DataChangedEvent& rDCEvt ) { const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings(); SetBackground( Wallpaper( Color( rStyles.GetFieldColor() ) ) ); - SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() - ? ViewShell::OUTPUT_DRAWMODE_CONTRAST + SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() + ? ViewShell::OUTPUT_DRAWMODE_CONTRAST : ViewShell::OUTPUT_DRAWMODE_COLOR ); } } /************************************************************************* -|* AnimationWindow - FloatingWindow +|* AnimationWindow - FloatingWindow \************************************************************************/ AnimationWindow::AnimationWindow( SfxBindings* pInBindings, @@ -173,13 +173,13 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings, aBtnCreateGroup ( this, SdResId( BTN_CREATE_GROUP ) ), aGrpAnimation ( this, SdResId( GRP_ANIMATION_GROUP ) ), - pWin ( pParent ), - pBitmapEx ( NULL ), + pWin ( pParent ), + pBitmapEx ( NULL ), - bMovie ( FALSE ), - bAllObjects ( FALSE ), + bMovie ( FALSE ), + bAllObjects ( FALSE ), - pBindings ( pInBindings ) + pBindings ( pInBindings ) { FreeResource(); @@ -233,7 +233,7 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings, AnimationWindow::~AnimationWindow() { ULONG i, nCount; - + delete pControllerItem; // Bitmapliste bereinigen @@ -431,7 +431,7 @@ IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn ) // Code jetzt in AddObj() SfxBoolItem aItem( SID_ANIMATOR_ADD, TRUE ); - GetBindings().GetDispatcher()->Execute( + GetBindings().GetDispatcher()->Execute( SID_ANIMATOR_ADD, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L ); return( 0L ); } @@ -440,7 +440,7 @@ IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn ) IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn ) { - SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD); + SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD); SdrObject* pObject; if( pBtn == &aBtnRemoveBitmap ) @@ -535,7 +535,7 @@ IMPL_LINK( AnimationWindow, ClickCreateGroupHdl, void *, EMPTYARG ) // Code jetzt in CreatePresObj() SfxBoolItem aItem( SID_ANIMATOR_CREATE, TRUE ); - GetBindings().GetDispatcher()->Execute( + GetBindings().GetDispatcher()->Execute( SID_ANIMATOR_CREATE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L ); return( 0L ); } @@ -587,11 +587,11 @@ void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) SdrObject* pObject = (SdrObject*) pPage->GetObj( (ULONG) nListPos ); if( pObject ) { - VirtualDevice aVD; - Rectangle aObjRect( pObject->GetCurrentBoundRect() ); - Size aObjSize( aObjRect.GetSize() ); - Point aOrigin( Point( -aObjRect.Left(), -aObjRect.Top() ) ); - MapMode aMap( aVD.GetMapMode() ); + VirtualDevice aVD; + Rectangle aObjRect( pObject->GetCurrentBoundRect() ); + Size aObjSize( aObjRect.GetSize() ); + Point aOrigin( Point( -aObjRect.Left(), -aObjRect.Top() ) ); + MapMode aMap( aVD.GetMapMode() ); aMap.SetMapUnit( MAP_100TH_MM ); aMap.SetOrigin( aOrigin ); aVD.SetMapMode( aMap ); @@ -599,7 +599,7 @@ void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings(); aVD.SetBackground( Wallpaper( rStyles.GetFieldColor() ) ); aVD.SetDrawMode( rStyles.GetHighContrastMode() - ? ViewShell::OUTPUT_DRAWMODE_CONTRAST + ? ViewShell::OUTPUT_DRAWMODE_CONTRAST : ViewShell::OUTPUT_DRAWMODE_COLOR ); aVD.Erase(); pObject->SingleObjectPainter( aVD ); // #110094#-17 @@ -856,7 +856,7 @@ BOOL AnimationWindow::Close() { SfxBoolItem aItem( SID_ANIMATION_OBJECTS, FALSE ); - GetBindings().GetDispatcher()->Execute( + GetBindings().GetDispatcher()->Execute( SID_ANIMATION_OBJECTS, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); SfxDockingWindow::Close(); @@ -883,9 +883,9 @@ void AnimationWindow::AddObj (::sd::View& rView ) // Objekt(e) clonen und den/die Clone(s) in die Liste stellen const SdrMarkList& rMarkList = rView.GetMarkedObjectList(); - ULONG nMarkCount = rMarkList.GetMarkCount(); - SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD); - ULONG nCloneCount = pPage->GetObjCount(); + ULONG nMarkCount = rMarkList.GetMarkCount(); + SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD); + ULONG nCloneCount = pPage->GetObjCount(); if (nMarkCount > 0) { @@ -895,8 +895,8 @@ void AnimationWindow::AddObj (::sd::View& rView ) BOOL bAnimObj = FALSE; if( nMarkCount == 1 ) { - SdrMark* pMark = rMarkList.GetMark(0); - SdrObject* pObject = pMark->GetMarkedSdrObj(); + SdrMark* pMark = rMarkList.GetMark(0); + SdrObject* pObject = pMark->GetMarkedSdrObj(); SdAnimationInfo* pAnimInfo = rView.GetDoc()->GetAnimationInfo( pObject ); UINT32 nInv = pObject->GetObjInventor(); UINT16 nId = pObject->GetObjIdentifier(); @@ -904,8 +904,8 @@ void AnimationWindow::AddObj (::sd::View& rView ) // Animated Bitmap (GIF) if( nInv == SdrInventor && nId == OBJ_GRAF && ( (SdrGrafObj*) pObject )->IsAnimated() ) { - const SdrGrafObj* pGrafObj = (SdrGrafObj*) pObject; - Graphic aGraphic( pGrafObj->GetTransformedGraphic() ); + const SdrGrafObj* pGrafObj = (SdrGrafObj*) pObject; + Graphic aGraphic( pGrafObj->GetTransformedGraphic() ); USHORT nCount = 0; if( aGraphic.IsAnimated() ) @@ -955,7 +955,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) for( USHORT nObject = 0; nObject < pObjList->GetObjCount(); nObject++ ) { SdrObject* pSnapShot = (SdrObject*) pObjList->GetObj( (ULONG) nObject ); - + pBitmapEx = new BitmapEx( SdrExchangeView::GetObjGraphic( pSnapShot->GetModel(), pSnapShot ).GetBitmapEx() ); aBmpExList.Insert( pBitmapEx, aBmpExList.GetCurPos() + 1 ); @@ -965,7 +965,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) // Clone pPage->InsertObject( pSnapShot->Clone(), aBmpExList.GetCurPos() + 1 ); - + // Weiterschalten der BitmapListe aBmpExList.Next(); } @@ -987,9 +987,9 @@ void AnimationWindow::AddObj (::sd::View& rView ) // ein einzelnes Objekt if( nMarkCount == 1 && !bAnimObj ) { - SdrMark* pMark = rMarkList.GetMark(0); - SdrObject* pObject = pMark->GetMarkedSdrObj(); - SdrObject* pClone = pObject->Clone(); + SdrMark* pMark = rMarkList.GetMark(0); + SdrObject* pObject = pMark->GetMarkedSdrObj(); + SdrObject* pClone = pObject->Clone(); pPage->InsertObject(pClone, aBmpExList.GetCurPos() + 1); } // mehrere Objekte: die Clones zu einer Gruppe zusammenfassen @@ -1019,7 +1019,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) else { SdrObjGroup* pCloneGroup = new SdrObjGroup; - SdrObjList* pObjList = pCloneGroup->GetSubList(); + SdrObjList* pObjList = pCloneGroup->GetSubList(); for (ULONG nObject= 0; nObject < nMarkCount; nObject++) pObjList->InsertObject(rMarkList.GetMark(nObject)->GetMarkedSdrObj()->Clone(), LIST_APPEND); @@ -1052,23 +1052,23 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) DBG_ASSERT( pOutWin, "Window ist nicht vorhanden!" ); // die Fentermitte ermitteln - const MapMode aMap100( MAP_100TH_MM ); - Size aMaxSizeLog; - Size aMaxSizePix; - Size aTemp( pOutWin->GetOutputSizePixel() ); - const Point aWindowCenter( pOutWin->PixelToLogic( Point( aTemp.Width() >> 1, aTemp.Height() >> 1 ) ) ); - const OutputDevice* pDefDev = Application::GetDefaultDevice(); - const ULONG nCount = aBmpExList.Count(); - BitmapAdjustment eBA = (BitmapAdjustment) aLbAdjustment.GetSelectEntryPos(); + const MapMode aMap100( MAP_100TH_MM ); + Size aMaxSizeLog; + Size aMaxSizePix; + Size aTemp( pOutWin->GetOutputSizePixel() ); + const Point aWindowCenter( pOutWin->PixelToLogic( Point( aTemp.Width() >> 1, aTemp.Height() >> 1 ) ) ); + const OutputDevice* pDefDev = Application::GetDefaultDevice(); + const ULONG nCount = aBmpExList.Count(); + BitmapAdjustment eBA = (BitmapAdjustment) aLbAdjustment.GetSelectEntryPos(); ULONG i; // Groesste Bitmap ermitteln for( i = 0; i < nCount; i++ ) { const BitmapEx& rBmpEx = *static_cast< BitmapEx* >( aBmpExList.GetObject( i ) ); - const Graphic aGraphic( rBmpEx ); - Size aTmpSizeLog; - const Size aTmpSizePix( rBmpEx.GetSizePixel() ); + const Graphic aGraphic( rBmpEx ); + Size aTmpSizeLog; + const Size aTmpSizePix( rBmpEx.GetSizePixel() ); if ( aGraphic.GetPrefMapMode().GetMapUnit() == MAP_PIXEL ) aTmpSizeLog = pDefDev->PixelToLogic( aGraphic.GetPrefSize(), aMap100 ); @@ -1087,8 +1087,8 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) if( aRbtBitmap.IsChecked() ) { // Bitmapgruppe erzeugen (Animated GIF) - Animation aAnimation; - Point aPt; + Animation aAnimation; + Point aPt; for( i = 0; i < nCount; i++ ) { @@ -1148,7 +1148,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) AnimationBitmap aAnimBmp; long nLoopCount = 0L; USHORT nPos = aLbLoopCount.GetSelectEntryPos(); - + if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != aLbLoopCount.GetEntryCount() - 1 ) // unendlich nLoopCount = (long) aLbLoopCount.GetSelectEntry().ToInt32(); @@ -1165,7 +1165,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) } SdrGrafObj* pGrafObj = new SdrGrafObj( Graphic( aAnimation ) ); - const Point aOrg( aWindowCenter.X() - ( aMaxSizeLog.Width() >> 1 ), aWindowCenter.Y() - ( aMaxSizeLog.Height() >> 1 ) ); + const Point aOrg( aWindowCenter.X() - ( aMaxSizeLog.Width() >> 1 ), aWindowCenter.Y() - ( aMaxSizeLog.Height() >> 1 ) ); pGrafObj->SetLogicRect( Rectangle( aOrg, aMaxSizeLog ) ); rView.InsertObjectAtView( pGrafObj, *pPV, SDRINSERT_SETDEFLAYER); @@ -1286,7 +1286,7 @@ void AnimationWindow::DataChanged( const DataChangedEvent& rDCEvt ) AnimationControllerItem::AnimationControllerItem( USHORT _nId, AnimationWindow* pAnimWin, - SfxBindings* _pBindings) + SfxBindings* _pBindings) : SfxControllerItem( _nId, *_pBindings ), pAnimationWin( pAnimWin ) { diff --git a/sd/source/ui/dlg/animobjs.src b/sd/source/ui/dlg/animobjs.src index d631dcaba2b2..8387555f680e 100644 --- a/sd/source/ui/dlg/animobjs.src +++ b/sd/source/ui/dlg/animobjs.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/assclass.cxx b/sd/source/ui/dlg/assclass.cxx index 1df116f52625..969c3f4d3b3f 100644 --- a/sd/source/ui/dlg/assclass.cxx +++ b/sd/source/ui/dlg/assclass.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx index f2c69231d79e..5b98d7cd9466 100644 --- a/sd/source/ui/dlg/brkdlg.cxx +++ b/sd/source/ui/dlg/brkdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,21 +57,21 @@ namespace sd { \************************************************************************/ BreakDlg::BreakDlg( - ::Window* pWindow, - DrawView* _pDrView, + ::Window* pWindow, + DrawView* _pDrView, DrawDocShell* pShell, - ULONG nSumActionCount, - ULONG nObjCount ) + ULONG nSumActionCount, + ULONG nObjCount ) : SfxModalDialog ( pWindow, SdResId( DLG_BREAK ) ), - aFtObjInfo ( this, SdResId( FT_OBJ_INFO ) ), - aFtActInfo ( this, SdResId( FT_ACT_INFO ) ), - aFtInsInfo ( this, SdResId( FT_INS_INFO ) ), - aFiObjInfo ( this, SdResId( FI_OBJ_INFO ) ), - aFiActInfo ( this, SdResId( FI_ACT_INFO ) ), - aFiInsInfo ( this, SdResId( FI_INS_INFO ) ), - aBtnCancel ( this, SdResId( BTN_CANCEL ) ), - aLink ( LINK( this, BreakDlg, UpDate)), - mpProgress ( NULL ) + aFtObjInfo ( this, SdResId( FT_OBJ_INFO ) ), + aFtActInfo ( this, SdResId( FT_ACT_INFO ) ), + aFtInsInfo ( this, SdResId( FT_INS_INFO ) ), + aFiObjInfo ( this, SdResId( FI_OBJ_INFO ) ), + aFiActInfo ( this, SdResId( FI_ACT_INFO ) ), + aFiInsInfo ( this, SdResId( FI_INS_INFO ) ), + aBtnCancel ( this, SdResId( BTN_CANCEL ) ), + aLink ( LINK( this, BreakDlg, UpDate)), + mpProgress ( NULL ) { aBtnCancel.SetClickHdl( LINK( this, BreakDlg, CancelButtonHdl)); diff --git a/sd/source/ui/dlg/brkdlg.src b/sd/source/ui/dlg/brkdlg.src index bf9b2d29c651..73092421ccf3 100644 --- a/sd/source/ui/dlg/brkdlg.src +++ b/sd/source/ui/dlg/brkdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/celltempl.cxx b/sd/source/ui/dlg/celltempl.cxx index 4938263b97d7..416a0471386d 100644 --- a/sd/source/ui/dlg/celltempl.cxx +++ b/sd/source/ui/dlg/celltempl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/celltempl.src b/sd/source/ui/dlg/celltempl.src index 4bdd02a799c2..5236e0a1a0c9 100644 --- a/sd/source/ui/dlg/celltempl.src +++ b/sd/source/ui/dlg/celltempl.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index 6b3c04346f31..f3f132e43a79 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,10 +64,10 @@ namespace sd { \************************************************************************/ CopyDlg::CopyDlg( - ::Window* pWindow, + ::Window* pWindow, const SfxItemSet& rInAttrs, - XColorTable* pColTab, - ::sd::View* pInView ) + XColorTable* pColTab, + ::sd::View* pInView ) : SfxModalDialog ( pWindow, SdResId( DLG_COPY ) ), maFtCopies ( this, SdResId( FT_COPIES ) ), maNumFldCopies ( this, SdResId( NUM_FLD_COPIES ) ), @@ -93,10 +93,10 @@ CopyDlg::CopyDlg( maBtnCancel ( this, SdResId( BTN_CANCEL ) ), maBtnHelp ( this, SdResId( BTN_HELP ) ), maBtnSetDefault ( this, SdResId( BTN_SET_DEFAULT ) ), - mrOutAttrs ( rInAttrs ), - mpColorTab ( pColTab ), + mrOutAttrs ( rInAttrs ), + mpColorTab ( pColTab ), maUIScale(pInView->GetDoc()->GetUIScale()), - mpView ( pInView ) + mpView ( pInView ) { FreeResource(); @@ -314,7 +314,7 @@ IMPL_LINK( CopyDlg, SetViewData, void*, EMPTYARG ) maUIScale, SFX_MAPUNIT_100TH_MM); // Farb-Attribut setzen - const SfxPoolItem* pPoolItem = NULL; + const SfxPoolItem* pPoolItem = NULL; if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, TRUE, &pPoolItem ) ) { Color aColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue(); @@ -342,7 +342,7 @@ IMPL_LINK( CopyDlg, SetDefault, void*, EMPTYARG ) SetMetricValue( maMtrFldHeight, Fraction(nValue) / maUIScale, SFX_MAPUNIT_100TH_MM); // Farb-Attribut setzen - const SfxPoolItem* pPoolItem = NULL; + const SfxPoolItem* pPoolItem = NULL; if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, TRUE, &pPoolItem ) ) { Color aColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue(); diff --git a/sd/source/ui/dlg/copydlg.src b/sd/source/ui/dlg/copydlg.src index 920be5e8df70..bf4f87ec5686 100644 --- a/sd/source/ui/dlg/copydlg.src +++ b/sd/source/ui/dlg/copydlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index b8c92dee3a6e..0c098573b3f2 100755 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,22 +55,22 @@ \************************************************************************/ SdCustomShowDlg::SdCustomShowDlg( Window* pWindow, SdDrawDocument& rDrawDoc ) : - ModalDialog ( pWindow, SdResId( DLG_CUSTOMSHOW ) ), + ModalDialog ( pWindow, SdResId( DLG_CUSTOMSHOW ) ), - aLbCustomShows ( this, SdResId( LB_CUSTOMSHOWS ) ), + aLbCustomShows ( this, SdResId( LB_CUSTOMSHOWS ) ), aCbxUseCustomShow( this, SdResId( CBX_USE_CUSTOMSHOW ) ), - aBtnNew ( this, SdResId( BTN_NEW ) ), - aBtnEdit ( this, SdResId( BTN_EDIT ) ), - aBtnRemove ( this, SdResId( BTN_REMOVE ) ), - aBtnCopy ( this, SdResId( BTN_COPY ) ), + aBtnNew ( this, SdResId( BTN_NEW ) ), + aBtnEdit ( this, SdResId( BTN_EDIT ) ), + aBtnRemove ( this, SdResId( BTN_REMOVE ) ), + aBtnCopy ( this, SdResId( BTN_COPY ) ), aBtnHelp ( this, SdResId( BTN_HELP ) ), - aBtnStartShow ( this, SdResId( BTN_STARTSHOW ) ), + aBtnStartShow ( this, SdResId( BTN_STARTSHOW ) ), aBtnOK ( this, SdResId( BTN_OK ) ), - rDoc ( rDrawDoc ), - pCustomShowList ( NULL ), - pCustomShow ( NULL ), - bModified ( FALSE ) + rDoc ( rDrawDoc ), + pCustomShowList ( NULL ), + pCustomShow ( NULL ), + bModified ( FALSE ) { FreeResource(); @@ -310,23 +310,23 @@ BOOL SdCustomShowDlg::IsCustomShow() const \************************************************************************/ SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow, SdDrawDocument& rDrawDoc, SdCustomShow*& rpCS ) : - ModalDialog ( pWindow, SdResId( DLG_DEFINE_CUSTOMSHOW ) ), - - aFtName ( this, SdResId( FT_NAME ) ), - aEdtName ( this, SdResId( EDT_NAME ) ), - aFtPages ( this, SdResId( FT_PAGES ) ), - aLbPages ( this, SdResId( LB_PAGES ) ), - aBtnAdd ( this, SdResId( BTN_ADD ) ), - aBtnRemove ( this, SdResId( BTN_REMOVE ) ), - aFtCustomPages ( this, SdResId( FT_CUSTOM_PAGES ) ), - aLbCustomPages ( this, SdResId( LB_CUSTOM_PAGES ) ), + ModalDialog ( pWindow, SdResId( DLG_DEFINE_CUSTOMSHOW ) ), + + aFtName ( this, SdResId( FT_NAME ) ), + aEdtName ( this, SdResId( EDT_NAME ) ), + aFtPages ( this, SdResId( FT_PAGES ) ), + aLbPages ( this, SdResId( LB_PAGES ) ), + aBtnAdd ( this, SdResId( BTN_ADD ) ), + aBtnRemove ( this, SdResId( BTN_REMOVE ) ), + aFtCustomPages ( this, SdResId( FT_CUSTOM_PAGES ) ), + aLbCustomPages ( this, SdResId( LB_CUSTOM_PAGES ) ), aBtnOK ( this, SdResId( BTN_OK ) ), - aBtnCancel ( this, SdResId( BTN_CANCEL ) ), + aBtnCancel ( this, SdResId( BTN_CANCEL ) ), aBtnHelp ( this, SdResId( BTN_HELP ) ), - rDoc ( rDrawDoc ), - rpCustomShow ( rpCS ), - bModified ( FALSE ) + rDoc ( rDrawDoc ), + rpCustomShow ( rpCS ), + bModified ( FALSE ) { FreeResource(); diff --git a/sd/source/ui/dlg/custsdlg.src b/sd/source/ui/dlg/custsdlg.src index c8c49e9c0d48..f5e4195b5a96 100644 --- a/sd/source/ui/dlg/custsdlg.src +++ b/sd/source/ui/dlg/custsdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx index 7725dc97f1e0..3142c4c438f8 100644 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,11 +53,11 @@ SFX_IMPL_TOOLBOX_CONTROL( SdTbxCtlDiaPages, SfxUInt16Item ) // SdPagesField //======================================================================== -SdPagesField::SdPagesField( Window* pParent, - const uno::Reference< frame::XFrame >& rFrame, +SdPagesField::SdPagesField( Window* pParent, + const uno::Reference< frame::XFrame >& rFrame, WinBits nBits ) : - SvxMetricField ( pParent, rFrame, nBits ), - m_xFrame ( rFrame ) + SvxMetricField ( pParent, rFrame, nBits ), + m_xFrame ( rFrame ) { String aStr( SdResId( STR_SLIDE_PLURAL ) ); SetCustomUnitText( aStr ); @@ -118,7 +118,7 @@ void SdPagesField::Modify() rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PagesPerRow" )), aArgs ); /* - rBindings.GetDispatcher()->Execute( + rBindings.GetDispatcher()->Execute( SID_PAGES_PER_ROW, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L, 0L ); */ } @@ -163,7 +163,7 @@ void SdTbxCtlDiaPages::StateChanged( USHORT, pItem = dynamic_cast< const SfxUInt16Item* >( pState ); DBG_ASSERT( pItem, "sd::SdTbxCtlDiaPages::StateChanged(), wrong item type!" ); } - + pFld->UpdatePagesField( pItem ); } } diff --git a/sd/source/ui/dlg/dlg_char.src b/sd/source/ui/dlg/dlg_char.src index e8d09c1c3170..a04db7cc2b44 100644 --- a/sd/source/ui/dlg/dlg_char.src +++ b/sd/source/ui/dlg/dlg_char.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ TabDialog TAB_CHAR Size = MAP_APPFONT ( 289 , 176 ) ; Text [ en-US ] = "Character" ; Moveable = TRUE ; - // Closeable = TRUE; // Dieser Dialog enthaelt OK und/oder Cancel Button (KH) + // Closeable = TRUE; // Dieser Dialog enthaelt OK und/oder Cancel Button (KH) TabControl 1 { OutputSize = TRUE ; diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 1eb3a3d0cedc..6b623f583ca5 100755 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -164,16 +164,16 @@ public: /** closes the current preview docshell */ void CloseDocShell(); - /** Extract form the history list of recently used files the impress + /** Extract form the history list of recently used files the impress files and insert them into a listbox. */ - void ScanDocmenu (void); - /** Flag that is set to TRUE after the recently used files have been + void ScanDocmenu (void); + /** Flag that is set to TRUE after the recently used files have been scanned. */ BOOL mbRecentDocumentsReady; - /** When the list of templates has not been scanned already this is done + /** When the list of templates has not been scanned already this is done when this method is called. That includes requesting the whole list of templates from UCB and extracting from that list the impress templates and layouts and storing them for later use in @@ -182,7 +182,7 @@ public: */ void ProvideTemplates (void); - /** This method transfers the template folders from the template scanner + /** This method transfers the template folders from the template scanner to the internal structures of this class. On termination it sets the flag <member>mbTemplatesReady</member> to <TRUE/> to indicate that the templates are available. @@ -193,7 +193,7 @@ public: */ void TemplateScanDone (std::vector<TemplateDir*>& rTemplateFolders); - /** Flag that is set to TRUE after the impress templates have been + /** Flag that is set to TRUE after the impress templates have been scanned. */ BOOL mbTemplatesReady; @@ -219,16 +219,16 @@ public: String GetDocFileName(); String GetLayoutFileName(); - /// List of URLs of recently used impress files. + /// List of URLs of recently used impress files. std::vector<String*> maOpenFilesList; - /// List of folders containing data about impress templates. + /// List of folders containing data about impress templates. std::vector<TemplateDir*> maPresentList; - /// Currently selected template folder. + /// Currently selected template folder. TemplateDir* mpTemplateRegion; - /// Currently selected layout folder. + /// Currently selected layout folder. TemplateDir* mpLayoutRegion; // preview @@ -291,73 +291,73 @@ public: DECL_LINK( OpenButtonHdl, Button * ); // Common - Assistent maAssistentFunc; - CheckBox maPreviewFlag; - CheckBox maStartWithFlag; - HelpButton maHelpButton; - CancelButton maCancelButton; - PushButton maLastPageButton; - NextButton maNextPageButton; - OKButton maFinishButton; - SdDocPreviewWin maPreview; - - String maCreateStr; - String maOpenStr; + Assistent maAssistentFunc; + CheckBox maPreviewFlag; + CheckBox maStartWithFlag; + HelpButton maHelpButton; + CancelButton maCancelButton; + PushButton maLastPageButton; + NextButton maNextPageButton; + OKButton maFinishButton; + SdDocPreviewWin maPreview; + + String maCreateStr; + String maOpenStr; // Seite 1 - FixedBitmap* mpPage1FB; - FixedLine* mpPage1ArtFL; - RadioButton* mpPage1EmptyRB; - RadioButton* mpPage1TemplateRB; - ListBox* mpPage1RegionLB; - ListBox* mpPage1TemplateLB; - RadioButton* mpPage1OpenRB; - ListBox* mpPage1OpenLB; + FixedBitmap* mpPage1FB; + FixedLine* mpPage1ArtFL; + RadioButton* mpPage1EmptyRB; + RadioButton* mpPage1TemplateRB; + ListBox* mpPage1RegionLB; + ListBox* mpPage1TemplateLB; + RadioButton* mpPage1OpenRB; + ListBox* mpPage1OpenLB; PushButton* mpPage1OpenPB; // Seite 2 - FixedBitmap* mpPage2FB; - FixedLine* mpPage2LayoutFL; - ListBox* mpPage2RegionLB; - ListBox* mpPage2LayoutLB; - FixedLine* mpPage2OutTypesFL; - RadioButton* mpPage2Medium1RB; - RadioButton* mpPage2Medium2RB; - RadioButton* mpPage2Medium3RB; - RadioButton* mpPage2Medium4RB; - RadioButton* mpPage2Medium5RB; + FixedBitmap* mpPage2FB; + FixedLine* mpPage2LayoutFL; + ListBox* mpPage2RegionLB; + ListBox* mpPage2LayoutLB; + FixedLine* mpPage2OutTypesFL; + RadioButton* mpPage2Medium1RB; + RadioButton* mpPage2Medium2RB; + RadioButton* mpPage2Medium3RB; + RadioButton* mpPage2Medium4RB; + RadioButton* mpPage2Medium5RB; // Seite 3 - FixedBitmap* mpPage3FB; - FixedLine* mpPage3EffectFL; - FixedText* mpPage3EffectFT; - FadeEffectLB* mpPage3EffectLB; - FixedText* mpPage3SpeedFT; - ListBox* mpPage3SpeedLB; - FixedLine* mpPage3PresTypeFL; - RadioButton* mpPage3PresTypeLiveRB; - RadioButton* mpPage3PresTypeKioskRB; - FixedText* mpPage3PresTimeFT; - TimeField* mpPage3PresTimeTMF; - FixedText* mpPage3BreakFT; - TimeField* mpPage3BreakTMF; - CheckBox* mpPage3LogoCB; + FixedBitmap* mpPage3FB; + FixedLine* mpPage3EffectFL; + FixedText* mpPage3EffectFT; + FadeEffectLB* mpPage3EffectLB; + FixedText* mpPage3SpeedFT; + ListBox* mpPage3SpeedLB; + FixedLine* mpPage3PresTypeFL; + RadioButton* mpPage3PresTypeLiveRB; + RadioButton* mpPage3PresTypeKioskRB; + FixedText* mpPage3PresTimeFT; + TimeField* mpPage3PresTimeTMF; + FixedText* mpPage3BreakFT; + TimeField* mpPage3BreakTMF; + CheckBox* mpPage3LogoCB; // Seite 4 - FixedBitmap* mpPage4FB; - FixedLine* mpPage4PersonalFL; - FixedText* mpPage4AskNameFT; - Edit* mpPage4AskNameEDT; - FixedText* mpPage4AskTopicFT; - Edit* mpPage4AskTopicEDT; - FixedText* mpPage4AskInfoFT; - MultiLineEdit* mpPage4AskInfoEDT; + FixedBitmap* mpPage4FB; + FixedLine* mpPage4PersonalFL; + FixedText* mpPage4AskNameFT; + Edit* mpPage4AskNameEDT; + FixedText* mpPage4AskTopicFT; + Edit* mpPage4AskTopicEDT; + FixedText* mpPage4AskInfoFT; + MultiLineEdit* mpPage4AskInfoEDT; // Seite 5 - FixedBitmap* mpPage5FB; - FixedText* mpPage5PageListFT; - SdPageListControl* mpPage5PageListCT; - CheckBox* mpPage5SummaryCB; + FixedBitmap* mpPage5FB; + FixedText* mpPage5PageListFT; + SdPageListControl* mpPage5PageListCT; + CheckBox* mpPage5SummaryCB; }; @@ -466,7 +466,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, mpPage1OpenLB->SetSelectHdl(LINK(this,AssistentDlgImpl,SelectFileHdl)); mpPage1OpenLB->SetDoubleClickHdl(rFinishLink); mpPage1OpenPB->SetClickHdl(LINK(this,AssistentDlgImpl,OpenButtonHdl)); - // mpPage1OpenLB->InsertEntry(String(SdResId(STR_WIZARD_POSITION))); + // mpPage1OpenLB->InsertEntry(String(SdResId(STR_WIZARD_POSITION))); // Seite 2 maAssistentFunc.InsertControl(2, &maPreview ); @@ -532,7 +532,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, mpPage3LogoCB = new CheckBox( pWindow, SdResId( CB_PAGE3_LOGO) )); mpPage3EffectLB->Fill(); -// mpPage3EffectLB->SelectEffect( presentation::FadeEffect_NONE ); +// mpPage3EffectLB->SelectEffect( presentation::FadeEffect_NONE ); mpPage3EffectLB->SetSelectHdl( LINK(this,AssistentDlgImpl,SelectEffectHdl )); mpPage3EffectLB->SetDropDownLineCount( 12 ); @@ -643,11 +643,11 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, TemplateDir* pStandardTemplateDir = 0; TemplateEntry* pStandardTemplateEntry = 0; - std::vector<TemplateDir*>::iterator I; + std::vector<TemplateDir*>::iterator I; for (I=maPresentList.begin(); I!=maPresentList.end(); I++) { TemplateDir* pDir = *I; - std::vector<TemplateEntry*>::iterator J; + std::vector<TemplateEntry*>::iterator J; for (J=pDir->maEntries.begin(); J!=pDir->maEntries.end(); J++) { TemplateEntry* pEntry = *J; @@ -682,9 +682,9 @@ AssistentDlgImpl::~AssistentDlgImpl() DeletePassords(); - // Delete the template file infos. - std::vector<TemplateDir*>::iterator I; - std::vector<TemplateEntry*>::iterator J; + // Delete the template file infos. + std::vector<TemplateDir*>::iterator I; + std::vector<TemplateEntry*>::iterator J; for (I=maPresentList.begin(); I!=maPresentList.end(); I++) { for (J=(*I)->maEntries.begin(); J!=(*I)->maEntries.end(); J++) @@ -747,8 +747,8 @@ AssistentDlgImpl::~AssistentDlgImpl() delete mpPage5PageListCT; delete mpPage5SummaryCB; - // Delete the file history list. - std::vector<String*>::iterator I2; + // Delete the file history list. + std::vector<String*>::iterator I2; for (I2=maOpenFilesList.begin(); I2!=maOpenFilesList.end(); I2++) delete *I2; } @@ -782,7 +782,7 @@ void AssistentDlgImpl::EndDialog( long ) -void AssistentDlgImpl::ScanDocmenu (void) +void AssistentDlgImpl::ScanDocmenu (void) { if( mbRecentDocumentsReady ) return; @@ -801,12 +801,12 @@ void AssistentDlgImpl::ScanDocmenu (void) sal_uInt32 nCount = aHistory.getLength(); for (sal_uInt32 nItem=0; nItem<nCount; ++nItem) { - // Get the current history item's properties. + // Get the current history item's properties. uno::Sequence<beans::PropertyValue> aPropertySet = aHistory[nItem]; - rtl::OUString sURL; - rtl::OUString sFilter; - rtl::OUString sTitle; - rtl::OUString sPassword; + rtl::OUString sURL; + rtl::OUString sFilter; + rtl::OUString sTitle; + rtl::OUString sPassword; sal_uInt32 nPropertyCount = aPropertySet.getLength(); for (sal_uInt32 nProperty=0; nProperty<nPropertyCount; ++nProperty) if (aPropertySet[nProperty].Name == HISTORY_PROPERTYNAME_URL) @@ -818,8 +818,8 @@ void AssistentDlgImpl::ScanDocmenu (void) else if (aPropertySet[nProperty].Name == HISTORY_PROPERTYNAME_PASSWORD) aPropertySet[nProperty].Value >>= sPassword; - // If the entry is an impress file then insert it into the - // history list and the list box. + // If the entry is an impress file then insert it into the + // history list and the list box. uno::Sequence< beans::PropertyValue > lProps; if (xFilterFactory->hasByName(sFilter)) { @@ -888,17 +888,17 @@ void AssistentDlgImpl::ProvideTemplates (void) void AssistentDlgImpl::TemplateScanDone ( std::vector<TemplateDir*>& rTemplateFolder) { - // This method is called from a thread. Therefore we get the solar mutex. + // This method is called from a thread. Therefore we get the solar mutex. ::vos::OGuard aGuard (Application::GetSolarMutex()); // Copy the contents of the given template folders to a local list. maPresentList.swap (rTemplateFolder); - // Fill in the list box on the first page. + // Fill in the list box on the first page. int nFirstEntry = 0; mpPage1RegionLB->Clear(); - std::vector<TemplateDir*>::iterator I; - int i; + std::vector<TemplateDir*>::iterator I; + int i; for (i=0,I=maPresentList.begin(); I!=maPresentList.end(); I++,i++) { TemplateDir* pDir = *I; @@ -921,7 +921,7 @@ void AssistentDlgImpl::TemplateScanDone ( mpPage1RegionLB->Update(); SelectTemplateRegion (mpPage1RegionLB->GetSelectEntry()); - // Fill in the list box on the second page. + // Fill in the list box on the second page. nFirstEntry = 0; mpPage2RegionLB->Clear(); for (i=0,I=maPresentList.begin(); I!=maPresentList.end(); I++,i++) @@ -946,7 +946,7 @@ void AssistentDlgImpl::TemplateScanDone ( mpPage2RegionLB->Update(); SelectLayoutRegion (mpPage2RegionLB->GetSelectEntry()); - // Make the changes visible. + // Make the changes visible. mbTemplatesReady = TRUE; if (mpWindow) UpdatePage(); @@ -1044,8 +1044,8 @@ String AssistentDlgImpl::GetLayoutFileName() SfxObjectShellLock AssistentDlgImpl::GetDocument() { -// mbPreview = FALSE; // Document nicht anzeigen - UpdatePreview(FALSE); // aber komplett laden +// mbPreview = FALSE; // Document nicht anzeigen + UpdatePreview(FALSE); // aber komplett laden UpdatePageList(); SfxObjectShell* pShell = xDocShell; @@ -1086,7 +1086,7 @@ SfxObjectShellLock AssistentDlgImpl::GetDocument() { // diese Seite loeschen pDoc->DeletePage( (nPgRelNum << 1) + 2 ); // Notizseite loeschen - pDoc->DeletePage( (nPgRelNum << 1) + 1 ); // Seite loeschen + pDoc->DeletePage( (nPgRelNum << 1) + 1 ); // Seite loeschen } nPgAbsNum++; @@ -1380,14 +1380,14 @@ IMPL_LINK( AssistentDlgImpl, UpdateUserDataHdl, Edit*, EMPTYARG ) void AssistentDlgImpl::SelectTemplateRegion( const String& rRegion ) { mpPage1TemplateLB->Clear(); - std::vector<TemplateDir*>::iterator I; + std::vector<TemplateDir*>::iterator I; for (I=maPresentList.begin(); I!=maPresentList.end(); I++) { TemplateDir * pDir = *I; mpTemplateRegion = *I; if (pDir->msRegion.Equals( rRegion ) ) { - std::vector<TemplateEntry*>::iterator J; + std::vector<TemplateEntry*>::iterator J; for (J=pDir->maEntries.begin(); J!=pDir->maEntries.end(); J++) mpPage1TemplateLB->InsertEntry ((*J)->msTitle); mpPage1TemplateLB->Update(); @@ -1405,7 +1405,7 @@ void AssistentDlgImpl::SelectLayoutRegion( const String& rRegion ) { mpPage2LayoutLB->Clear(); mpPage2LayoutLB->InsertEntry(String(SdResId(STR_WIZARD_ORIGINAL))); - std::vector<TemplateDir*>::iterator I; + std::vector<TemplateDir*>::iterator I; for (I=maPresentList.begin(); I!=maPresentList.end(); I++) { TemplateDir * pDir = *I; @@ -1413,7 +1413,7 @@ void AssistentDlgImpl::SelectLayoutRegion( const String& rRegion ) if (pDir->msRegion.Equals (rRegion)) { - std::vector<TemplateEntry*>::iterator J; + std::vector<TemplateEntry*>::iterator J; for (J=pDir->maEntries.begin(); J!=pDir->maEntries.end(); J++) mpPage2LayoutLB->InsertEntry ((*J)->msTitle); mpPage2LayoutLB->Update(); @@ -1741,8 +1741,8 @@ void AssistentDlgImpl::DeletePassords() BOOL AssistentDlgImpl::IsOwnFormat( const String& rPath ) { - INetURLObject aURL( rPath ); - String aExt( aURL.GetFileExtension() ); + INetURLObject aURL( rPath ); + String aExt( aURL.GetFileExtension() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); diff --git a/sd/source/ui/dlg/dlgass.src b/sd/source/ui/dlg/dlgass.src index b4c146eb0df2..2e3e0e3de643 100644 --- a/sd/source/ui/dlg/dlgass.src +++ b/sd/source/ui/dlg/dlgass.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -530,7 +530,7 @@ ModalDialog DLG_ASS TabStop = TRUE ; Text [ en-US ] = "~Create" ; }; - + String STR_OPEN { Text [ en-US ] = "~Open"; diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index f9dcf5046189..2e944ee32c08 100755 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,7 +95,7 @@ SvLBoxEntry* SdPageListControl::InsertPage( const String& rPageName ) pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, m_pCheckButton)); - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! pEntry->AddItem( new SvLBoxString( pEntry, 0, rPageName ) ); GetModel()->Insert( pEntry ); @@ -107,7 +107,7 @@ void SdPageListControl::InsertTitle( SvLBoxEntry* pParent, const String& rTitle { SvLBoxEntry* pEntry = new SvLBoxEntry; pEntry->AddItem( new SvLBoxString( pEntry, 0, String() ) ); - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! pEntry->AddItem( new SvLBoxString( pEntry, 0, rTitle ) ); GetModel()->Insert( pEntry,pParent ); } @@ -134,7 +134,7 @@ void SdPageListControl::Fill( SdDrawDocument* pDoc ) for (ULONG nObject = 0; nObject < nObjectCount; nObject++) { SdrObject* pObject = pPage->GetObj(nObject); - if (pObject->GetObjInventor() == SdrInventor && pObject->GetObjIdentifier() == OBJ_OUTLINETEXT) + if (pObject->GetObjInventor() == SdrInventor && pObject->GetObjIdentifier() == OBJ_OUTLINETEXT) { pTO = (SdrTextObj*)pObject; break; diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx index 35bbd41de448..ee68c66a9279 100755 --- a/sd/source/ui/dlg/dlgassim.hxx +++ b/sd/source/ui/dlg/dlgassim.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ class SdPageListControl : public SvTreeListBox { private: - SvLBoxButtonData* m_pCheckButton; + SvLBoxButtonData* m_pCheckButton; SvLBoxEntry* InsertPage( const String& rPageName ); void InsertTitle( SvLBoxEntry* pEntry, const String& rTitle ); @@ -63,8 +63,8 @@ DECLARE_LIST( TemplateCacheInfoList, TemplateCacheInfo * ) class TemplateCacheDirEntry { public: - String m_aPath; - TemplateCacheInfoList m_aFiles; + String m_aPath; + TemplateCacheInfoList m_aFiles; }; DECLARE_LIST( TemplateCacheDirEntryList, TemplateCacheDirEntry * ) diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx index d0c412ca6f10..14db955a934e 100644 --- a/sd/source/ui/dlg/dlgchar.cxx +++ b/sd/source/ui/dlg/dlgchar.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,8 +52,8 @@ SdCharDlg::SdCharDlg( Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell ) : SfxTabDialog ( pParent, SdResId( TAB_CHAR ), pAttr ), - rOutAttrs ( *pAttr ), - rDocShell ( *pDocShell ) + rOutAttrs ( *pAttr ), + rDocShell ( *pDocShell ) { FreeResource(); diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx index 1a5a612d37ad..6522ab87c56e 100755 --- a/sd/source/ui/dlg/dlgctrls.cxx +++ b/sd/source/ui/dlg/dlgctrls.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,8 +45,8 @@ struct FadeEffectLBImpl std::vector< TransitionPresetPtr > maPresets; }; -FadeEffectLB::FadeEffectLB( Window* pParent, SdResId Id ) -: ListBox( pParent, Id ), +FadeEffectLB::FadeEffectLB( Window* pParent, SdResId Id ) +: ListBox( pParent, Id ), mpImpl( new FadeEffectLBImpl ) { } diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index 6778f073aaa9..9b175cd128b6 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,18 +61,18 @@ SdModifyFieldDlg::SdModifyFieldDlg( Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) : ModalDialog ( pWindow, SdResId( DLG_FIELD_MODIFY ) ), - aRbtFix ( this, SdResId( RBT_FIX ) ), - aRbtVar ( this, SdResId( RBT_VAR ) ), - aGrpType ( this, SdResId( GRP_TYPE ) ), + aRbtFix ( this, SdResId( RBT_FIX ) ), + aRbtVar ( this, SdResId( RBT_VAR ) ), + aGrpType ( this, SdResId( GRP_TYPE ) ), maFtLanguage( this, SdResId( FT_LANGUAGE ) ), maLbLanguage( this, SdResId( LB_LANGUAGE ) ), - aFtFormat ( this, SdResId( FT_FORMAT ) ), - aLbFormat ( this, SdResId( LB_FORMAT ) ), + aFtFormat ( this, SdResId( FT_FORMAT ) ), + aLbFormat ( this, SdResId( LB_FORMAT ) ), aBtnOK ( this, SdResId( BTN_OK ) ), aBtnCancel ( this, SdResId( BTN_CANCEL ) ), aBtnHelp ( this, SdResId( BTN_HELP ) ), - maInputSet ( rSet ), - pField ( pInField ) + maInputSet ( rSet ), + pField ( pInField ) { FreeResource(); @@ -99,7 +99,7 @@ SvxFieldData* SdModifyFieldDlg::GetField() if( pField->ISA( SvxDateField ) ) { const SvxDateField* pDateField = (const SvxDateField*) pField; - SvxDateType eType; + SvxDateType eType; SvxDateFormat eFormat; if( aRbtFix.IsChecked() ) @@ -116,7 +116,7 @@ SvxFieldData* SdModifyFieldDlg::GetField() else if( pField->ISA( SvxExtTimeField ) ) { const SvxExtTimeField* pTimeField = (const SvxExtTimeField*) pField; - SvxTimeType eType; + SvxTimeType eType; SvxTimeFormat eFormat; if( aRbtFix.IsChecked() ) @@ -133,7 +133,7 @@ SvxFieldData* SdModifyFieldDlg::GetField() else if( pField->ISA( SvxExtFileField ) ) { const SvxExtFileField* pFileField = (const SvxExtFileField*) pField; - SvxFileType eType; + SvxFileType eType; SvxFileFormat eFormat; if( aRbtFix.IsChecked() ) @@ -162,7 +162,7 @@ SvxFieldData* SdModifyFieldDlg::GetField() } else if( pField->ISA( SvxAuthorField ) ) { - SvxAuthorType eType; + SvxAuthorType eType; SvxAuthorFormat eFormat; if( aRbtFix.IsChecked() ) @@ -200,23 +200,23 @@ void SdModifyFieldDlg::FillFormatList() const SvxDateField* pDateField = (const SvxDateField*) pField; SvxDateField aDateField( *pDateField ); - //SVXDATEFORMAT_APPDEFAULT, // Wird nicht benutzt - //SVXDATEFORMAT_SYSTEM, // Wird nicht benutzt + //SVXDATEFORMAT_APPDEFAULT, // Wird nicht benutzt + //SVXDATEFORMAT_SYSTEM, // Wird nicht benutzt aLbFormat.InsertEntry( String( SdResId( STR_STANDARD_SMALL ) ) ); aLbFormat.InsertEntry( String( SdResId( STR_STANDARD_BIG ) ) ); SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter(); - aDateField.SetFormat( SVXDATEFORMAT_A ); // 13.02.96 + aDateField.SetFormat( SVXDATEFORMAT_A ); // 13.02.96 aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); - aDateField.SetFormat( SVXDATEFORMAT_B ); // 13.02.1996 + aDateField.SetFormat( SVXDATEFORMAT_B ); // 13.02.1996 aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); - aDateField.SetFormat( SVXDATEFORMAT_C ); // 13.Feb 1996 + aDateField.SetFormat( SVXDATEFORMAT_C ); // 13.Feb 1996 aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); - aDateField.SetFormat( SVXDATEFORMAT_D ); // 13.Februar 1996 + aDateField.SetFormat( SVXDATEFORMAT_D ); // 13.Februar 1996 aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); - aDateField.SetFormat( SVXDATEFORMAT_E ); // Die, 13.Februar 1996 + aDateField.SetFormat( SVXDATEFORMAT_E ); // Die, 13.Februar 1996 aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); - aDateField.SetFormat( SVXDATEFORMAT_F ); // Dienstag, 13.Februar 1996 + aDateField.SetFormat( SVXDATEFORMAT_F ); // Dienstag, 13.Februar 1996 aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); aLbFormat.SelectEntryPos( (USHORT) ( pDateField->GetFormat() - 2 ) ); @@ -226,26 +226,26 @@ void SdModifyFieldDlg::FillFormatList() const SvxExtTimeField* pTimeField = (const SvxExtTimeField*) pField; SvxExtTimeField aTimeField( *pTimeField ); - //SVXTIMEFORMAT_APPDEFAULT, // Wird nicht benutzt - //SVXTIMEFORMAT_SYSTEM, // Wird nicht benutzt + //SVXTIMEFORMAT_APPDEFAULT, // Wird nicht benutzt + //SVXTIMEFORMAT_SYSTEM, // Wird nicht benutzt aLbFormat.InsertEntry( String( SdResId( STR_STANDARD_NORMAL ) ) ); SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter(); - aTimeField.SetFormat( SVXTIMEFORMAT_24_HM ); // 13:49 + aTimeField.SetFormat( SVXTIMEFORMAT_24_HM ); // 13:49 aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); - aTimeField.SetFormat( SVXTIMEFORMAT_24_HMS ); // 13:49:38 + aTimeField.SetFormat( SVXTIMEFORMAT_24_HMS ); // 13:49:38 aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); - aTimeField.SetFormat( SVXTIMEFORMAT_24_HMSH ); // 13:49:38.78 + aTimeField.SetFormat( SVXTIMEFORMAT_24_HMSH ); // 13:49:38.78 aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); - aTimeField.SetFormat( SVXTIMEFORMAT_12_HM ); // 01:49 + aTimeField.SetFormat( SVXTIMEFORMAT_12_HM ); // 01:49 aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); - aTimeField.SetFormat( SVXTIMEFORMAT_12_HMS ); // 01:49:38 + aTimeField.SetFormat( SVXTIMEFORMAT_12_HMS ); // 01:49:38 aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); - aTimeField.SetFormat( SVXTIMEFORMAT_12_HMSH ); // 01:49:38.78 + aTimeField.SetFormat( SVXTIMEFORMAT_12_HMSH ); // 01:49:38.78 aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); - //SVXTIMEFORMAT_AM_HM, // 01:49 PM - //SVXTIMEFORMAT_AM_HMS, // 01:49:38 PM - //SVXTIMEFORMAT_AM_HMSH // 01:49:38.78 PM + //SVXTIMEFORMAT_AM_HM, // 01:49 PM + //SVXTIMEFORMAT_AM_HMS, // 01:49:38 PM + //SVXTIMEFORMAT_AM_HMSH // 01:49:38.78 PM aLbFormat.SelectEntryPos( (USHORT) ( pTimeField->GetFormat() - 2 ) ); } diff --git a/sd/source/ui/dlg/dlgfield.src b/sd/source/ui/dlg/dlgfield.src index 5abcd9e8b9b7..679c21fffc77 100644 --- a/sd/source/ui/dlg/dlgfield.src +++ b/sd/source/ui/dlg/dlgfield.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index bbd32f6bd807..02803f2ced45 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,10 +75,10 @@ OutlineBulletDlg::OutlineBulletDlg( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) - : SfxTabDialog ( pParent, SdResId(TAB_OUTLINEBULLET) ), - aInputSet ( *pAttr ), - bTitle ( FALSE ), - pSdView ( pView ) + : SfxTabDialog ( pParent, SdResId(TAB_OUTLINEBULLET) ), + aInputSet ( *pAttr ), + bTitle ( FALSE ), + pSdView ( pView ) { FreeResource(); @@ -169,8 +169,8 @@ OutlineBulletDlg::OutlineBulletDlg( AddTabPage( RID_SVXPAGE_PICK_BULLET ); AddTabPage( RID_SVXPAGE_PICK_BMP ); - AddTabPage(RID_SVXPAGE_NUM_OPTIONS ); - AddTabPage(RID_SVXPAGE_NUM_POSITION ); + AddTabPage(RID_SVXPAGE_NUM_OPTIONS ); + AddTabPage(RID_SVXPAGE_NUM_POSITION ); } diff --git a/sd/source/ui/dlg/dlgolbul.src b/sd/source/ui/dlg/dlgolbul.src index 0f35c8b44d98..70b1f1070401 100644 --- a/sd/source/ui/dlg/dlgolbul.src +++ b/sd/source/ui/dlg/dlgolbul.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx index f2dea0f67e2f..d38314675a5b 100644 --- a/sd/source/ui/dlg/dlgpage.cxx +++ b/sd/source/ui/dlg/dlgpage.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,8 +57,8 @@ SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, BOOL bAreaPage ) : SfxTabDialog ( pParent, SdResId( TAB_PAGE ), pAttr ), - mrOutAttrs ( *pAttr ), - mpDocShell ( pDocSh ) + mrOutAttrs ( *pAttr ), + mpDocShell ( pDocSh ) { SvxColorTableItem aColorTableItem(*( (const SvxColorTableItem*) ( mpDocShell->GetItem( SID_COLOR_TABLE ) ) ) ); diff --git a/sd/source/ui/dlg/dlgpage.src b/sd/source/ui/dlg/dlgpage.src index ea0c0e024f05..5cd4337995cf 100644 --- a/sd/source/ui/dlg/dlgpage.src +++ b/sd/source/ui/dlg/dlgpage.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index 6cd220d5a5bc..938341dd029e 100755 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,9 +53,9 @@ \************************************************************************/ SdSnapLineDlg::SdSnapLineDlg( - ::Window* pWindow, + ::Window* pWindow, const SfxItemSet& rInAttrs, - ::sd::View* pView) + ::sd::View* pView) : ModalDialog (pWindow, SdResId(DLG_SNAPLINE)), aFlPos (this, SdResId(FL_POSITION)), aFtX (this, SdResId(FT_X)), @@ -97,7 +97,7 @@ SdSnapLineDlg::SdSnapLineDlg( SfxMapUnit ePoolUnit = pPool->GetMetric( SID_ATTR_FILL_HATCH ); // #i48497# Consider page origin - SdrPageView* pPV = pView->GetSdrPageView(); + SdrPageView* pPV = pView->GetSdrPageView(); Point aLeftTop(aWorkArea.Left()+1, aWorkArea.Top()+1); pPV->LogicToPagePos(aLeftTop); Point aRightBottom(aWorkArea.Right()-2, aWorkArea.Bottom()-2); @@ -149,9 +149,9 @@ SdSnapLineDlg::SdSnapLineDlg( IMPL_LINK( SdSnapLineDlg, ClickHdl, Button *, pBtn ) { - if ( pBtn == &aRbPoint ) SetInputFields(TRUE, TRUE); - else if ( pBtn == &aRbHorz ) SetInputFields(FALSE, TRUE); - else if ( pBtn == &aRbVert ) SetInputFields(TRUE, FALSE); + if ( pBtn == &aRbPoint ) SetInputFields(TRUE, TRUE); + else if ( pBtn == &aRbHorz ) SetInputFields(FALSE, TRUE); + else if ( pBtn == &aRbVert ) SetInputFields(TRUE, FALSE); else if ( pBtn == &aBtnDelete ) EndDialog(RET_SNAP_DELETE); return 0; @@ -167,9 +167,9 @@ void SdSnapLineDlg::GetAttr(SfxItemSet& rOutAttrs) { SnapKind eKind; - if ( aRbHorz.IsChecked() ) eKind = SK_HORIZONTAL; + if ( aRbHorz.IsChecked() ) eKind = SK_HORIZONTAL; else if ( aRbVert.IsChecked() ) eKind = SK_VERTICAL; - else eKind = SK_POINT; + else eKind = SK_POINT; nXValue = Fraction( GetCoreValue( aMtrFldX, SFX_MAPUNIT_100TH_MM) ) * aUIScale; nYValue = Fraction( GetCoreValue( aMtrFldY, SFX_MAPUNIT_100TH_MM) ) * aUIScale; diff --git a/sd/source/ui/dlg/dlgsnap.src b/sd/source/ui/dlg/dlgsnap.src index 631034dd5879..43bdb414e63e 100644 --- a/sd/source/ui/dlg/dlgsnap.src +++ b/sd/source/ui/dlg/dlgsnap.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index a42ce43a2c6d..09815503115a 100755 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -144,8 +144,8 @@ void SdDocPreviewWin::Paint( const Rectangle& rRect ) { SvtAccessibilityOptions aAccOptions; bool bUseContrast = aAccOptions.GetIsForPagePreviews() && Application::GetSettings().GetStyleSettings().GetHighContrastMode(); - SetDrawMode( bUseContrast - ? ::sd::ViewShell::OUTPUT_DRAWMODE_CONTRAST + SetDrawMode( bUseContrast + ? ::sd::ViewShell::OUTPUT_DRAWMODE_CONTRAST : ::sd::ViewShell::OUTPUT_DRAWMODE_COLOR ); ImpPaint( pMetaFile, (VirtualDevice*)this ); @@ -171,7 +171,7 @@ void SdDocPreviewWin::startPreview() { if( !mxSlideShow.is() ) mxSlideShow = sd::SlideShow::Create( pDoc ); - + Reference< XDrawPage > xDrawPage( pPage->getUnoPage(), UNO_QUERY ); Reference< XAnimationNode > xAnimationNode; @@ -230,10 +230,10 @@ void SdDocPreviewWin::updateViewSettings() pMtf = new GDIMetaFile; - VirtualDevice aVDev; + VirtualDevice aVDev; - const Fraction aFrac( pDoc->GetScaleFraction() ); - const MapMode aMap( pDoc->GetScaleUnit(), Point(), aFrac, aFrac ); + const Fraction aFrac( pDoc->GetScaleFraction() ); + const MapMode aMap( pDoc->GetScaleUnit(), Point(), aFrac, aFrac ); aVDev.SetMapMode( aMap ); @@ -251,11 +251,11 @@ void SdDocPreviewWin::updateViewSettings() pView->SetPageVisible( FALSE ); pView->ShowSdrPage( pPage ); - const Point aNewOrg( pPage->GetLftBorder(), pPage->GetUppBorder() ); + const Point aNewOrg( pPage->GetLftBorder(), pPage->GetUppBorder() ); const Size aNewSize( aSize.Width() - pPage->GetLftBorder() - pPage->GetRgtBorder(), aSize.Height() - pPage->GetUppBorder() - pPage->GetLwrBorder() ); const Rectangle aClipRect( aNewOrg, aNewSize ); - MapMode aVMap( aMap ); + MapMode aVMap( aMap ); aVDev.Push(); aVMap.SetOrigin( Point( -aNewOrg.X(), -aNewOrg.Y() ) ); diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index 71fad02f24a7..1acdb9a8250f 100755 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ namespace css = ::com::sun::star; // -------------------------------------------------------------------- -// ----------- SdFileDialog_Imp --------------------------- +// ----------- SdFileDialog_Imp --------------------------- // -------------------------------------------------------------------- class SdFileDialog_Imp : public sfx2::FileDialogHelper { @@ -71,29 +71,29 @@ private: friend class SdOpenSoundFileDialog; - css::uno::Reference< css::ui::dialogs::XFilePickerControlAccess > mxControlAccess; + css::uno::Reference< css::ui::dialogs::XFilePickerControlAccess > mxControlAccess; css::uno::Reference< css::media::XPlayer > mxPlayer; ULONG mnPlaySoundEvent; - BOOL mbUsableSelection; - BOOL mbLabelPlaying; - - void CheckSelectionState(); + BOOL mbUsableSelection; + BOOL mbLabelPlaying; + void CheckSelectionState(); + DECL_LINK( PlayMusicHdl, void * ); Timer maUpdateTimer; DECL_LINK( IsMusicStoppedHdl, void * ); - + public: - SdFileDialog_Imp( const short nDialogType, sal_Bool bUsableSelection ); + SdFileDialog_Imp( const short nDialogType, sal_Bool bUsableSelection ); ~SdFileDialog_Imp(); - ErrCode Execute(); + ErrCode Execute(); // overwritten from FileDialogHelper, to receive user feedback - virtual void SAL_CALL ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent ); + virtual void SAL_CALL ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent ); }; // ------------------------------------------------------------------------ @@ -101,7 +101,7 @@ void SAL_CALL SdFileDialog_Imp::ControlStateChanged( const css::ui::dialogs::Fil { ::vos::OGuard aGuard( Application::GetSolarMutex() ); - switch( aEvent.ElementId ) + switch( aEvent.ElementId ) { case css::ui::dialogs::CommonFilePickerElementIds::LISTBOX_FILTER: CheckSelectionState(); @@ -110,7 +110,7 @@ void SAL_CALL SdFileDialog_Imp::ControlStateChanged( const css::ui::dialogs::Fil case css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY: if( mxControlAccess.is() ) { - if( mnPlaySoundEvent ) + if( mnPlaySoundEvent ) Application::RemoveUserEvent( mnPlaySoundEvent ); mnPlaySoundEvent = Application::PostUserEvent( LINK( this, SdFileDialog_Imp, PlayMusicHdl ) ); @@ -126,7 +126,7 @@ IMPL_LINK( SdFileDialog_Imp, PlayMusicHdl, void *, EMPTYARG ) mnPlaySoundEvent = 0; if (mxPlayer.is()) - { + { if (mxPlayer->isPlaying()) mxPlayer->stop(); mxPlayer.clear(); @@ -136,9 +136,9 @@ IMPL_LINK( SdFileDialog_Imp, PlayMusicHdl, void *, EMPTYARG ) { try { - mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, + mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, String( SdResId( STR_PLAY ) ) ); - + mbLabelPlaying = FALSE; } catch( css::lang::IllegalArgumentException ) @@ -170,9 +170,9 @@ IMPL_LINK( SdFileDialog_Imp, PlayMusicHdl, void *, EMPTYARG ) { try { - mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, + mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, String( SdResId( STR_STOP ) ) ); - + mbLabelPlaying = TRUE; } catch( css::lang::IllegalArgumentException ) @@ -194,7 +194,7 @@ IMPL_LINK( SdFileDialog_Imp, IsMusicStoppedHdl, void *, EMPTYARG ) ::vos::OGuard aGuard( Application::GetSolarMutex() ); if ( - mxPlayer.is() && mxPlayer->isPlaying() && + mxPlayer.is() && mxPlayer->isPlaying() && mxPlayer->getMediaTime() < mxPlayer->getDuration() ) { @@ -207,7 +207,7 @@ IMPL_LINK( SdFileDialog_Imp, IsMusicStoppedHdl, void *, EMPTYARG ) { try { - mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, + mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, String( SdResId( STR_PLAY ) ) ); mbLabelPlaying = FALSE; } @@ -227,7 +227,7 @@ void SdFileDialog_Imp::CheckSelectionState() { if( mbUsableSelection && mxControlAccess.is() ) { - String aCurrFilter( GetCurrentFilter() ); + String aCurrFilter( GetCurrentFilter() ); try { @@ -246,8 +246,8 @@ void SdFileDialog_Imp::CheckSelectionState() } //----------------------------------------------------------------------------- -SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, - sal_Bool bUsableSelection ) : +SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, + sal_Bool bUsableSelection ) : FileDialogHelper( nDialogType, 0 ), mnPlaySoundEvent( 0 ), mbUsableSelection( bUsableSelection ), @@ -267,7 +267,7 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, { try { - mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, + mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, String( SdResId( STR_PLAY ) ) ); } catch( css::lang::IllegalArgumentException ) @@ -297,21 +297,21 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, // ------------------------------------------------------------------------ SdFileDialog_Imp::~SdFileDialog_Imp() { - if( mnPlaySoundEvent ) + if( mnPlaySoundEvent ) Application::RemoveUserEvent( mnPlaySoundEvent ); } // ------------------------------------------------------------------------ ErrCode SdFileDialog_Imp::Execute() { - // make sure selection checkbox is disabled if + // make sure selection checkbox is disabled if // HTML is current filter! CheckSelectionState(); return FileDialogHelper::Execute(); } // -------------------------------------------------------------------- -// ----------- SdOpenSoundFileDialog ----------------------- +// ----------- SdOpenSoundFileDialog ----------------------- // -------------------------------------------------------------------- // these are simple forwarders diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx index 5a23262c57c0..0355c91d67d6 100644 --- a/sd/source/ui/dlg/gluectrl.cxx +++ b/sd/source/ui/dlg/gluectrl.cxx @@ -1,7 +1,7 @@ #/************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,13 +57,13 @@ static UINT16 aEscDirArray[] = SDRESC_RIGHT, SDRESC_TOP, SDRESC_BOTTOM, -// SDRESC_LO, -// SDRESC_LU, -// SDRESC_RO, -// SDRESC_RU, -// SDRESC_HORZ, -// SDRESC_VERT, -// SDRESC_ALL +// SDRESC_LO, +// SDRESC_LU, +// SDRESC_RO, +// SDRESC_RU, +// SDRESC_HORZ, +// SDRESC_VERT, +// SDRESC_ALL }; @@ -91,7 +91,7 @@ GlueEscDirLB::GlueEscDirLB( Window* pParent, const Reference< XFrame >& rFrame ) /************************************************************************* |* -|* Dtor +|* Dtor |* \************************************************************************/ @@ -157,7 +157,7 @@ void GlueEscDirLB::Fill() |* \************************************************************************/ -SdTbxCtlGlueEscDir::SdTbxCtlGlueEscDir( +SdTbxCtlGlueEscDir::SdTbxCtlGlueEscDir( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index b48a1682bba6..c2a371e39420 100755 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ namespace sd class PresLayoutPreview : public Control { private: - SdPage* mpMaster; + SdPage* mpMaster; HeaderFooterSettings maSettings; Size maPageSize; Rectangle maOutRect; @@ -135,45 +135,45 @@ int nDateTimeFormats[nDateTimeFormatsCount] = class HeaderFooterTabPage : public TabPage { private: - FixedLine maFLIncludeOnPage; + FixedLine maFLIncludeOnPage; - CheckBox maCBHeader; - FixedText maFTHeader; - Edit maTBHeader; + CheckBox maCBHeader; + FixedText maFTHeader; + Edit maTBHeader; - FixedLine maFLDateTime; - CheckBox maCBDateTime; - RadioButton maRBDateTimeFixed; + FixedLine maFLDateTime; + CheckBox maCBDateTime; + RadioButton maRBDateTimeFixed; RadioButton maRBDateTimeAutomatic; - Edit maTBDateTimeFixed; - ListBox maCBDateTimeFormat; - FixedText maFTDateTimeLanguage; - SvxLanguageBox maCBDateTimeLanguage; + Edit maTBDateTimeFixed; + ListBox maCBDateTimeFormat; + FixedText maFTDateTimeLanguage; + SvxLanguageBox maCBDateTimeLanguage; - FixedLine maFLFooter; - CheckBox maCBFooter; - FixedText maFTFooter; - Edit maTBFooter; + FixedLine maFLFooter; + CheckBox maCBFooter; + FixedText maFTFooter; + Edit maTBFooter; - FixedLine maFLSlideNumber; - CheckBox maCBSlideNumber; + FixedLine maFLSlideNumber; + CheckBox maCBSlideNumber; - FixedLine maFLNotOnTitle; - CheckBox maCBNotOnTitle; + FixedLine maFLNotOnTitle; + CheckBox maCBNotOnTitle; - PushButton maPBApplyToAll; - PushButton maPBApply; - CancelButton maPBCancel; - HelpButton maPBHelp; + PushButton maPBApplyToAll; + PushButton maPBApply; + CancelButton maPBCancel; + HelpButton maPBHelp; - PresLayoutPreview maCTPreview; + PresLayoutPreview maCTPreview; - SdPage* mpCurrentPage; - SdDrawDocument * mpDoc; + SdPage* mpCurrentPage; + SdDrawDocument * mpDoc; HeaderFooterDialog* mpDialog; - LanguageType meOldLanguage; + LanguageType meOldLanguage; - bool mbHandoutMode; + bool mbHandoutMode; DECL_LINK( UpdateOnClickHdl, void * ); @@ -192,11 +192,11 @@ public: ~HeaderFooterTabPage(); static SfxTabPage* Create( ::Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static USHORT* GetRanges(); - void init( const HeaderFooterSettings& rSettings, bool bNotOnTitle, bool bHasApply ); - void getData( HeaderFooterSettings& rSettings, bool& rNotOnTitle ); - void update(); + void init( const HeaderFooterSettings& rSettings, bool bNotOnTitle, bool bHasApply ); + void getData( HeaderFooterSettings& rSettings, bool& rNotOnTitle ); + void update(); }; } @@ -236,7 +236,7 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent mpCurrentPage = NULL; } -// maTabCtrl.SetHelpId( HID_XML_FILTER_TABPAGE_CTRL ); +// maTabCtrl.SetHelpId( HID_XML_FILTER_TABPAGE_CTRL ); maTabCtrl.Show(); mpSlideTabPage = new HeaderFooterTabPage( this, &maTabCtrl, pDoc, pSlide, false ); diff --git a/sd/source/ui/dlg/headerfooterdlg.src b/sd/source/ui/dlg/headerfooterdlg.src index df42ff9b7551..b2e4fb25c870 100644 --- a/sd/source/ui/dlg/headerfooterdlg.src +++ b/sd/source/ui/dlg/headerfooterdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,11 +29,11 @@ #include "dialogs.hrc" #include "headerfooterdlg.hrc" -#define TAB_WIDTH 290 -#define TAB_HEIGHT 186 +#define TAB_WIDTH 290 +#define TAB_HEIGHT 186 -#define DLG_WIDTH TAB_WIDTH + 6 -#define DLG_HEIGHT TAB_HEIGHT + 6 +#define DLG_WIDTH TAB_WIDTH + 6 +#define DLG_HEIGHT TAB_HEIGHT + 6 TabDialog RID_SD_DLG_HEADERFOOTER { @@ -68,38 +68,38 @@ TabDialog RID_SD_DLG_HEADERFOOTER }; }; -#define SPACE_Y 3 -#define SPACE_X 3 +#define SPACE_Y 3 +#define SPACE_X 3 -#define C1 (RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) +#define C1 (RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) #define C2 (RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + RSC_SP_CHK_TEXTINDENT) -#define C3 (RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 2 * RSC_SP_CHK_TEXTINDENT) -#define W1 (TAB_WIDTH - PUSHBUTTON_WIDTH - 10 * SPACE_X) -#define W2 (60) -#define W3 (W1 - C2 - W2 - SPACE_X) -#define W4 ((W1 - C3 - SPACE_X) / 2) +#define C3 (RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 2 * RSC_SP_CHK_TEXTINDENT) +#define W1 (TAB_WIDTH - PUSHBUTTON_WIDTH - 10 * SPACE_X) +#define W2 (60) +#define W3 (W1 - C2 - W2 - SPACE_X) +#define W4 ((W1 - C3 - SPACE_X) / 2) -#define C4 (C2 + W2 + SPACE_X) +#define C4 (C2 + W2 + SPACE_X) -#define PUSHBUTTON_WIDTH 80 +#define PUSHBUTTON_WIDTH 80 TabPage RID_SD_TABPAGE_HEADERFOOTER { -// HelpID = SID_ANIMATION_EFFECTS ; +// HelpID = SID_ANIMATION_EFFECTS ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( TAB_WIDTH , TAB_HEIGHT ) ; Hide = TRUE; -#define Y0 (RSC_SP_TBPG_INNERBORDER_TOP ) - +#define Y0 (RSC_SP_TBPG_INNERBORDER_TOP ) + FixedLine FL_INCLUDE_ON_PAGE { Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT, Y0 ) ; Size = MAP_APPFONT ( W1 - RSC_SP_TBPG_INNERBORDER_LEFT , RSC_CD_FIXEDLINE_HEIGHT ) ; Text [ en-US ] = "Include on slide"; - }; - -#define Y1 (Y0 + RSC_CD_FIXEDLINE_HEIGHT + SPACE_Y) + }; + +#define Y1 (Y0 + RSC_CD_FIXEDLINE_HEIGHT + SPACE_Y) CheckBox CB_HEADER { @@ -108,7 +108,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER TabStop = TRUE ; Text [ en-US ] = "Header"; }; - + FixedText FT_HEADER { Pos = MAP_APPFONT ( C2, Y1 + SPACE_Y + RSC_CD_CHECKBOX_HEIGHT + 1 ); @@ -116,7 +116,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER TabStop = TRUE ; Text [ en-US ] = "Header text"; }; - + Edit TB_HEADER_FIXED { Pos = MAP_APPFONT ( C4, Y1 + SPACE_Y + RSC_CD_CHECKBOX_HEIGHT ); @@ -124,7 +124,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER TabStop = TRUE ; Border = TRUE ; }; - + #define Y2 (Y1 + 2 * SPACE_Y + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT) FixedLine FL_DATETIME @@ -140,7 +140,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER TabStop = TRUE ; Text [ en-US ] = "~Date and time"; }; - + RadioButton RB_DATETIME_FIXED { Pos = MAP_APPFONT ( C2, Y2 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + 1 ); @@ -148,31 +148,31 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER TabStop = TRUE ; Text [ en-US ] = "Fi~xed"; }; - + Edit TB_DATETIME_FIXED { Pos = MAP_APPFONT ( C4, Y2 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT ); Size = MAP_APPFONT ( W3, RSC_CD_TEXTBOX_HEIGHT ); TabStop = TRUE ; Border = TRUE ; - }; - + }; + RadioButton RB_DATETIME_AUTOMATIC { Pos = MAP_APPFONT ( C2, Y2 + 3 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT ); Size = MAP_APPFONT ( 80, RSC_CD_RADIOBUTTON_HEIGHT ); TabStop = TRUE ; - Text [ en-US ] = "~Variable"; + Text [ en-US ] = "~Variable"; }; - + ListBox CB_DATETIME_FORMAT { Pos = MAP_APPFONT ( C3, Y2 + 4 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT + RSC_CD_RADIOBUTTON_HEIGHT ); Size = MAP_APPFONT ( W4, 80 ); TabStop = TRUE ; DropDown = TRUE ; - }; - + }; + FixedText FT_DATETIME_LANGUAGE { Pos = MAP_APPFONT ( C3 + W4 + SPACE_X, Y2 + 3 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT + 1 ); @@ -180,23 +180,23 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER TabStop = TRUE ; Text [ en-US ] = "~Language:"; }; - + ListBox CB_DATETIME_LANGUAGE { Pos = MAP_APPFONT ( C3 + W4 + SPACE_X, Y2 + 4 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT + RSC_CD_RADIOBUTTON_HEIGHT ); Size = MAP_APPFONT ( W4, 80 ); TabStop = TRUE ; - DropDown = TRUE ; - }; - -#define Y3 (Y2 + 5 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT + RSC_CD_RADIOBUTTON_HEIGHT + RSC_CD_DROPDOWN_HEIGHT ) + DropDown = TRUE ; + }; + +#define Y3 (Y2 + 5 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT + RSC_CD_RADIOBUTTON_HEIGHT + RSC_CD_DROPDOWN_HEIGHT ) FixedLine FL_FOOTER { Pos = MAP_APPFONT ( C1, Y3 ); Size = MAP_APPFONT ( W1 - C1, RSC_CD_FIXEDLINE_HEIGHT ); }; - + CheckBox CB_FOOTER { Pos = MAP_APPFONT ( C1, Y3 + SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT ); @@ -204,7 +204,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER TabStop = TRUE ; Text [ en-US ] = "Footer"; }; - + FixedText FT_FOOTER { Pos = MAP_APPFONT ( C2, Y3 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + 1 ); @@ -212,7 +212,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER TabStop = TRUE ; Text [ en-US ] = "Footer text"; }; - + Edit TB_FOOTER_FIXED { Pos = MAP_APPFONT ( C4, Y3 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT ); @@ -221,14 +221,14 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER Border = TRUE ; }; -#define Y4 (Y3 + 3 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT ) +#define Y4 (Y3 + 3 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT ) FixedLine FL_SLIDENUMBER { Pos = MAP_APPFONT ( C1, Y4 ); Size = MAP_APPFONT ( W1 - C1, RSC_CD_FIXEDLINE_HEIGHT ); }; - + CheckBox CB_SLIDENUMBER { Pos = MAP_APPFONT ( C1, Y4 + SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT ); @@ -236,15 +236,15 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER TabStop = TRUE ; Text [ en-US ] = "Slide number"; }; - -#define Y5 (Y4 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT ) + +#define Y5 (Y4 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT ) FixedLine FL_NOTONTITLE { Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT, Y5 ) ; Size = MAP_APPFONT ( W1 - RSC_SP_TBPG_INNERBORDER_LEFT, RSC_CD_FIXEDLINE_HEIGHT ); }; - + CheckBox CB_NOTONTITLE { Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT, Y5 + SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT ); @@ -282,18 +282,18 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER Size = MAP_APPFONT ( PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); TabStop = TRUE ; }; - + Control CT_PREVIEW { Pos = MAP_APPFONT ( TAB_WIDTH - 7 * SPACE_X - PUSHBUTTON_WIDTH, TAB_HEIGHT - 6*SPACE_Y - PUSHBUTTON_WIDTH ); - Size = MAP_APPFONT ( PUSHBUTTON_WIDTH, PUSHBUTTON_WIDTH ); + Size = MAP_APPFONT ( PUSHBUTTON_WIDTH, PUSHBUTTON_WIDTH ); }; String STR_PAGE_NUMBER { Text [ en-US ] = "Page number"; }; - + String STR_INCLUDE_ON_PAGE { Text [ en-US ] = "Include on page"; diff --git a/sd/source/ui/dlg/ins_paste.cxx b/sd/source/ui/dlg/ins_paste.cxx index c0079d5eee77..12514ab4ec34 100644 --- a/sd/source/ui/dlg/ins_paste.cxx +++ b/sd/source/ui/dlg/ins_paste.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/ins_paste.src b/sd/source/ui/dlg/ins_paste.src index 0b066f096f87..aec49d36b90a 100644 --- a/sd/source/ui/dlg/ins_paste.src +++ b/sd/source/ui/dlg/ins_paste.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index 5d260367f383..069e74a59070 100755 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ /************************************************************************* |* -|* Ctor +|* Ctor |* \************************************************************************/ @@ -62,9 +62,9 @@ SdInsertPagesObjsDlg::SdInsertPagesObjsDlg( aBtnOk ( this, SdResId( BTN_OK ) ), aBtnCancel ( this, SdResId( BTN_CANCEL ) ), aBtnHelp ( this, SdResId( BTN_HELP ) ), - pMedium ( pSfxMedium ), - mpDoc ( pInDoc ), - rName ( rFileName ) + pMedium ( pSfxMedium ), + mpDoc ( pInDoc ), + rName ( rFileName ) { FreeResource(); @@ -81,7 +81,7 @@ SdInsertPagesObjsDlg::SdInsertPagesObjsDlg( /************************************************************************* |* -|* Dtor +|* Dtor |* \************************************************************************/ @@ -91,8 +91,8 @@ SdInsertPagesObjsDlg::~SdInsertPagesObjsDlg() /************************************************************************* |* -|* Fuellt die TreeLB in Abhaengigkeit des Mediums. Ist kein Medium -|* vorhanden, handelt es sich um ein Text- und kein Drawdokument +|* Fuellt die TreeLB in Abhaengigkeit des Mediums. Ist kein Medium +|* vorhanden, handelt es sich um ein Text- und kein Drawdokument |* \************************************************************************/ @@ -122,9 +122,9 @@ void SdInsertPagesObjsDlg::Reset() /************************************************************************* |* -|* Liefert die Liste zurueck -|* nType == 0 -> Seiten -|* nType == 1 -> Objekte +|* Liefert die Liste zurueck +|* nType == 0 -> Seiten +|* nType == 1 -> Objekte |* \************************************************************************/ @@ -149,7 +149,7 @@ List* SdInsertPagesObjsDlg::GetList( USHORT nType ) /************************************************************************* |* -|* Ist Verknuepfung gechecked +|* Ist Verknuepfung gechecked |* \************************************************************************/ @@ -160,7 +160,7 @@ BOOL SdInsertPagesObjsDlg::IsLink() /************************************************************************* |* -|* Ist Verknuepfung gechecked +|* Ist Verknuepfung gechecked |* \************************************************************************/ diff --git a/sd/source/ui/dlg/inspagob.src b/sd/source/ui/dlg/inspagob.src index 4eae011a9ba2..b4fbaad9fe0d 100644 --- a/sd/source/ui/dlg/inspagob.src +++ b/sd/source/ui/dlg/inspagob.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/layeroptionsdlg.cxx b/sd/source/ui/dlg/layeroptionsdlg.cxx index ddfe92879188..9a5f42c71895 100644 --- a/sd/source/ui/dlg/layeroptionsdlg.cxx +++ b/sd/source/ui/dlg/layeroptionsdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/layeroptionsdlg.src b/sd/source/ui/dlg/layeroptionsdlg.src index cd50a810d3fd..c199107515ce 100644 --- a/sd/source/ui/dlg/layeroptionsdlg.src +++ b/sd/source/ui/dlg/layeroptionsdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -107,7 +107,7 @@ ModalDialog DLG_INSERT_LAYER Text [ en-US ] = "~Locked" ; TabStop = TRUE ; }; - + // divider FixedLine FL_SEPARATOR_B { diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx b/sd/source/ui/dlg/masterlayoutdlg.cxx index 601b1d1cf72c..3930875fb4cd 100644 --- a/sd/source/ui/dlg/masterlayoutdlg.cxx +++ b/sd/source/ui/dlg/masterlayoutdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ using namespace ::sd; MasterLayoutDialog::MasterLayoutDialog( Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) -: ModalDialog( pParent, SdResId( RID_SD_DLG_MASTER_LAYOUT ) ), +: ModalDialog( pParent, SdResId( RID_SD_DLG_MASTER_LAYOUT ) ), mpDoc( pDoc ), mpCurrentPage( pCurrentPage ), maFLPlaceholders( this, SdResId( FL_PLACEHOLDERS ) ), @@ -75,21 +75,21 @@ MasterLayoutDialog::MasterLayoutDialog( Window* pParent, SdDrawDocument* pDoc, S { case PK_STANDARD: { - // aTitle = String( SdResId( STR_MASTER_LAYOUT_TITLE ) ); + // aTitle = String( SdResId( STR_MASTER_LAYOUT_TITLE ) ); maCBHeader.Enable( FALSE ); String aSlideNumberStr( SdResId( STR_SLIDE_NUMBER ) ); maCBPageNumber.SetText( aSlideNumberStr ); break; } case PK_NOTES: - // aTitle = String( SdResId( STR_NOTES_MASTER_LAYOUT_TITLE ) ); + // aTitle = String( SdResId( STR_NOTES_MASTER_LAYOUT_TITLE ) ); break; case PK_HANDOUT: - // aTitle = String( SdResId( STR_HANDOUT_TEMPLATE_LAYOUT_TITLE ) ); + // aTitle = String( SdResId( STR_HANDOUT_TEMPLATE_LAYOUT_TITLE ) ); break; } String aTitle (SdResId( STR_MASTER_LAYOUT_TITLE ) ); - + SetText( aTitle ); FreeResource(); @@ -151,7 +151,7 @@ void MasterLayoutDialog::applyChanges() else create( PRESOBJ_SLIDENUMBER ); } - + mpDoc->EndUndo(); } diff --git a/sd/source/ui/dlg/masterlayoutdlg.src b/sd/source/ui/dlg/masterlayoutdlg.src index 1e862b63cec6..a886555b616c 100644 --- a/sd/source/ui/dlg/masterlayoutdlg.src +++ b/sd/source/ui/dlg/masterlayoutdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,8 +51,8 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT TabStop = TRUE; Text [ en-US ] = "Header"; - }; - + }; + CheckBox CB_DATE { Pos = MAP_APPFONT( 6, 29 ); @@ -61,7 +61,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT Text [ en-US ] = "Date/time"; }; - + CheckBox CB_FOOTER { Pos = MAP_APPFONT( 6, 42 ); @@ -69,7 +69,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT TabStop = TRUE; Text [ en-US ] = "Footer"; - }; + }; CheckBox CB_PAGE_NUMBER { @@ -93,7 +93,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT Size = MAP_APPFONT( 40 , 14 ); TabStop = TRUE; }; - + String STR_SLIDE_NUMBER { Text [ en-US ] = "Slide number"; diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index 47780b0f8233..a9d34aaf94c8 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,11 +53,11 @@ namespace sd { /******************************************************************************/ -#define FADE_STEP "FadeSteps" -#define FADE_ATTRIB "FadeAttributes" -#define FADE_ORIENT "FadeOrientation" -#define FADE_TRUE "true" -#define FADE_FALSE "false" +#define FADE_STEP "FadeSteps" +#define FADE_ATTRIB "FadeAttributes" +#define FADE_ORIENT "FadeOrientation" +#define FADE_TRUE "true" +#define FADE_FALSE "false" /******************************************************************************/ @@ -83,17 +83,17 @@ MorphDlg::MorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* FreeResource(); LoadSettings(); - SfxItemPool* pPool = (SfxItemPool*) pObj1->GetObjectItemPool(); - SfxItemSet aSet1( *pPool ); - SfxItemSet aSet2( *pPool ); + SfxItemPool* pPool = (SfxItemPool*) pObj1->GetObjectItemPool(); + SfxItemSet aSet1( *pPool ); + SfxItemSet aSet2( *pPool ); aSet1.Put(pObj1->GetMergedItemSet()); aSet2.Put(pObj2->GetMergedItemSet()); - const XLineStyle eLineStyle1 = ( (const XLineStyleItem&) aSet1.Get( XATTR_LINESTYLE ) ).GetValue(); - const XLineStyle eLineStyle2 = ( (const XLineStyleItem&) aSet2.Get( XATTR_LINESTYLE ) ).GetValue(); - const XFillStyle eFillStyle1 = ( (const XFillStyleItem&) aSet1.Get( XATTR_FILLSTYLE ) ).GetValue(); - const XFillStyle eFillStyle2 = ( (const XFillStyleItem&) aSet2.Get( XATTR_FILLSTYLE ) ).GetValue(); + const XLineStyle eLineStyle1 = ( (const XLineStyleItem&) aSet1.Get( XATTR_LINESTYLE ) ).GetValue(); + const XLineStyle eLineStyle2 = ( (const XLineStyleItem&) aSet2.Get( XATTR_LINESTYLE ) ).GetValue(); + const XFillStyle eFillStyle1 = ( (const XFillStyleItem&) aSet1.Get( XATTR_FILLSTYLE ) ).GetValue(); + const XFillStyle eFillStyle2 = ( (const XFillStyleItem&) aSet2.Get( XATTR_FILLSTYLE ) ).GetValue(); if ( ( ( eLineStyle1 == XLINE_NONE ) || ( eLineStyle2 == XLINE_NONE ) ) && ( ( eFillStyle1 != XFILL_SOLID ) || ( eFillStyle2 != XFILL_SOLID ) ) ) @@ -122,11 +122,11 @@ MorphDlg::~MorphDlg() void MorphDlg::LoadSettings() { - SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( UniString::CreateFromAscii( - RTL_CONSTASCII_STRINGPARAM( SD_OPTION_MORPHING ) ), + SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( UniString::CreateFromAscii( + RTL_CONSTASCII_STRINGPARAM( SD_OPTION_MORPHING ) ), SD_OPTION_LOAD ) ); - UINT16 nSteps; - BOOL bOrient, bAttrib; + UINT16 nSteps; + BOOL bOrient, bAttrib; if( xIStm.Is() ) { @@ -149,8 +149,8 @@ void MorphDlg::LoadSettings() void MorphDlg::SaveSettings() const { - SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream( UniString::CreateFromAscii( - RTL_CONSTASCII_STRINGPARAM( SD_OPTION_MORPHING ) ), + SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream( UniString::CreateFromAscii( + RTL_CONSTASCII_STRINGPARAM( SD_OPTION_MORPHING ) ), SD_OPTION_STORE ) ); if( xOStm.Is() ) diff --git a/sd/source/ui/dlg/morphdlg.src b/sd/source/ui/dlg/morphdlg.src index 64e63a33cd59..13e82785a26e 100644 --- a/sd/source/ui/dlg/morphdlg.src +++ b/sd/source/ui/dlg/morphdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 294aa6feb65a..1a89d954a7bf 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ static const sal_uInt16 nShowAllShapesFilter=2; } /************************************************************************* -|* SdNavigatorWin - FloatingWindow +|* SdNavigatorWin - FloatingWindow \************************************************************************/ SdNavigatorWin::SdNavigatorWin( @@ -77,17 +77,17 @@ SdNavigatorWin::SdNavigatorWin( ::sd::NavigatorChildWindow* pChWinCtxt, const SdResId& rSdResId, SfxBindings* pInBindings ) -: ::Window( pParent, rSdResId ) -, maToolbox ( this, SdResId( 1 ) ) -, maTlbObjects( this, SdResId( TLB_OBJECTS ) ) -, maLbDocs ( this, SdResId( LB_DOCS ) ) -, mpChildWinContext( pChWinCtxt ) -, mbDocImported ( FALSE ) +: ::Window( pParent, rSdResId ) +, maToolbox ( this, SdResId( 1 ) ) +, maTlbObjects( this, SdResId( TLB_OBJECTS ) ) +, maLbDocs ( this, SdResId( LB_DOCS ) ) +, mpChildWinContext( pChWinCtxt ) +, mbDocImported ( FALSE ) // Bei Aenderung des DragTypes: SelectionMode der TLB anpassen! -, meDragType ( NAVIGATOR_DRAGTYPE_EMBEDDED ) -, mpBindings ( pInBindings ) -, maImageList ( SdResId( IL_NAVIGATR ) ) -, maImageListH ( SdResId( ILH_NAVIGATR ) ) +, meDragType ( NAVIGATOR_DRAGTYPE_EMBEDDED ) +, mpBindings ( pInBindings ) +, maImageList ( SdResId( IL_NAVIGATR ) ) +, maImageListH ( SdResId( ILH_NAVIGATR ) ) { maTlbObjects.SetViewFrame( mpBindings->GetDispatcher()->GetFrame() ); @@ -109,7 +109,7 @@ SdNavigatorWin::SdNavigatorWin( // Shape filter drop down menu. maToolbox.SetItemBits(TBI_SHAPE_FILTER, maToolbox.GetItemBits(TBI_SHAPE_FILTER) | TIB_DROPDOWNONLY); - + // TreeListBox // set position below toolbox long nListboxYPos = maToolbox.GetPosPixel().Y() + maToolbox.GetSizePixel().Height() + 4; @@ -187,7 +187,7 @@ void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc ) maToolbox.EnableItem(TBI_SHAPE_FILTER, FALSE); else maToolbox.EnableItem(TBI_SHAPE_FILTER); - + if( !maTlbObjects.IsEqualToDoc( pDoc ) ) { String aDocName = pDocShell->GetMedium()->GetName(); @@ -203,7 +203,7 @@ void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc ) maLbDocs.SelectEntry( aDocShName ); // auskommentiert um 30246 zu fixen -// if( maLbDocs.GetSelectEntryCount() == 0 ) +// if( maLbDocs.GetSelectEntryCount() == 0 ) { RefreshDocumentLB(); maLbDocs.SelectEntry( aDocShName ); @@ -340,7 +340,7 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) //pBox->Invalidate(); } break; - + case TBI_SHAPE_FILTER: { PopupMenu *pMenu = new PopupMenu; @@ -534,7 +534,7 @@ IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu ) } } } - + return 0; } @@ -580,8 +580,8 @@ void SdNavigatorWin::Resize() BOOL SdNavigatorWin::InsertFile(const String& rFileName) { - INetURLObject aURL( rFileName ); - BOOL bReturn = TRUE; + INetURLObject aURL( rFileName ); + BOOL bReturn = TRUE; if( aURL.GetProtocol() == INET_PROT_NOT_VALID ) { @@ -622,7 +622,7 @@ BOOL SdNavigatorWin::InsertFile(const String& rFileName) // ersteinmal nachgeschaut, ob es einen Storage enthaelt SfxMedium* pMedium = new SfxMedium( aFileName, STREAM_READ | STREAM_NOCREATE, - TRUE); // Download + TRUE); // Download if (pMedium->IsStorage()) { @@ -778,7 +778,7 @@ NavDocInfo* SdNavigatorWin::GetDocInfo() long SdNavigatorWin::Notify(NotifyEvent& rNEvt) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); - long nOK = FALSE; + long nOK = FALSE; if( pKEvt ) { @@ -879,7 +879,7 @@ void SdNavigatorWin::ApplyImageList() SdNavigatorControllerItem::SdNavigatorControllerItem( USHORT _nId, SdNavigatorWin* pNavWin, - SfxBindings* _pBindings) : + SfxBindings* _pBindings) : SfxControllerItem( _nId, *_pBindings ), pNavigatorWin( pNavWin ) { @@ -965,7 +965,7 @@ void SdNavigatorControllerItem::StateChanged( USHORT nSId, SdPageNameControllerItem::SdPageNameControllerItem( USHORT _nId, SdNavigatorWin* pNavWin, - SfxBindings* _pBindings) : + SfxBindings* _pBindings) : SfxControllerItem( _nId, *_pBindings ), pNavigatorWin( pNavWin ) { diff --git a/sd/source/ui/dlg/navigatr.src b/sd/source/ui/dlg/navigatr.src index 4d4499d3226d..5592d086065c 100644 --- a/sd/source/ui/dlg/navigatr.src +++ b/sd/source/ui/dlg/navigatr.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -133,12 +133,12 @@ Window FLT_NAVIGATOR #define NAVIGATR_IDLIST \ IdList = \ { \ - TBI_PEN ; \ - TBI_FIRST ; \ - TBI_PREVIOUS ; \ - TBI_NEXT ; \ - TBI_LAST ; \ - TBI_EMBEDDED ; \ + TBI_PEN ; \ + TBI_FIRST ; \ + TBI_PREVIOUS ; \ + TBI_NEXT ; \ + TBI_LAST ; \ + TBI_EMBEDDED ; \ TBI_LINK ; \ TBI_HYPERLINK ; \ }; \ @@ -154,7 +154,7 @@ Window FLT_NAVIGATOR }; ImageList ILH_NAVIGATR { - Prefix = "nvh"; + Prefix = "nvh"; MaskColor = IMAGE_STDBTN_COLOR ; NAVIGATR_IDLIST }; diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index e407efc5d443..a3f81f2ae22c 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,16 +55,16 @@ public: SdParagraphNumTabPage(Window* pParent, const SfxItemSet& rSet ); ~SdParagraphNumTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); private: - TriStateBox maNewStartCB; + TriStateBox maNewStartCB; TriStateBox maNewStartNumberCB; - NumericField maNewStartNF; + NumericField maNewStartNF; bool mbModified; DECL_LINK( ImplNewStartHdl, CheckBox* ); diff --git a/sd/source/ui/dlg/paragr.src b/sd/source/ui/dlg/paragr.src index 041a4524a705..2db4939726e3 100644 --- a/sd/source/ui/dlg/paragr.src +++ b/sd/source/ui/dlg/paragr.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ TabDialog TAB_PARAGRAPH PageResID = RID_SVXPAGE_PARA_ASIAN ; Text [ en-US ] = "Asian Typography"; }; - PageItem + PageItem { Identifier = RID_TABPAGE_PARA_NUMBERING; Text = "Numbering"; diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index 473d2f4b452b..8de4cb7a4a3a 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,12 +63,12 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, aLbDias ( this, SdResId( LB_DIAS ) ), aLbCustomshow ( this, SdResId( LB_CUSTOMSHOW ) ), - aGrpKind ( this, SdResId( GRP_KIND ) ), - aRbtStandard ( this, SdResId( RBT_STANDARD ) ), - aRbtWindow ( this, SdResId( RBT_WINDOW ) ), - aRbtAuto ( this, SdResId( RBT_AUTO ) ), - aTmfPause ( this, SdResId( TMF_PAUSE ) ), - aCbxAutoLogo ( this, SdResId( CBX_AUTOLOGO ) ), + aGrpKind ( this, SdResId( GRP_KIND ) ), + aRbtStandard ( this, SdResId( RBT_STANDARD ) ), + aRbtWindow ( this, SdResId( RBT_WINDOW ) ), + aRbtAuto ( this, SdResId( RBT_AUTO ) ), + aTmfPause ( this, SdResId( TMF_PAUSE ) ), + aCbxAutoLogo ( this, SdResId( CBX_AUTOLOGO ) ), aGrpOptions ( this, SdResId( GRP_OPTIONS ) ), aCbxManuel ( this, SdResId( CBX_MANUEL ) ), @@ -79,17 +79,17 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, aCbxChangePage ( this, SdResId( CBX_CHANGE_PAGE ) ), aCbxAlwaysOnTop ( this, SdResId( CBX_ALWAYS_ON_TOP ) ), - maGrpMonitor ( this, SdResId( GRP_MONITOR ) ), - maFtMonitor ( this, SdResId( FT_MONITOR ) ), - maLBMonitor ( this, SdResId( LB_MONITOR ) ), + maGrpMonitor ( this, SdResId( GRP_MONITOR ) ), + maFtMonitor ( this, SdResId( FT_MONITOR ) ), + maLBMonitor ( this, SdResId( LB_MONITOR ) ), aBtnOK ( this, SdResId( BTN_OK ) ), aBtnCancel ( this, SdResId( BTN_CANCEL ) ), aBtnHelp ( this, SdResId( BTN_HELP ) ), - pCustomShowList ( pCSList ), + pCustomShowList ( pCSList ), rOutAttrs ( rInAttrs ), - mnMonitors ( 0 ), + mnMonitors ( 0 ), msPrimaryMonitor( SdResId(STR_PRIMARY_MONITOR ) ), msMonitor( SdResId( STR_MONITOR ) ), @@ -154,9 +154,9 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, aCbxChangePage.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_CHANGE_PAGE ) ).GetValue() ); aCbxAlwaysOnTop.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ALWAYS_ON_TOP ) ).GetValue() ); - const BOOL bEndless = ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ENDLESS ) ).GetValue(); - const BOOL bWindow = !( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_FULLSCREEN ) ).GetValue(); - const long nPause = ( ( const SfxUInt32Item& ) rOutAttrs.Get( ATTR_PRESENT_PAUSE_TIMEOUT ) ).GetValue(); + const BOOL bEndless = ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ENDLESS ) ).GetValue(); + const BOOL bWindow = !( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_FULLSCREEN ) ).GetValue(); + const long nPause = ( ( const SfxUInt32Item& ) rOutAttrs.Get( ATTR_PRESENT_PAUSE_TIMEOUT ) ).GetValue(); aTmfPause.SetTime( Time( 0, 0, nPause ) ); // set cursor in timefield @@ -223,7 +223,7 @@ void SdStartPresentationDlg::InitMonitorSettings() maLBMonitor.InsertEntry( aName ); } - if( !bMultiscreen ) + if( !bMultiscreen ) maLBMonitor.InsertEntry( msAllMonitors ); sal_Int32 nSelected = ( ( const SfxInt32Item& ) rOutAttrs.Get( ATTR_PRESENT_DISPLAY ) ).GetValue(); diff --git a/sd/source/ui/dlg/present.src b/sd/source/ui/dlg/present.src index 830e320ca4ba..bdf5b12ecd77 100644 --- a/sd/source/ui/dlg/present.src +++ b/sd/source/ui/dlg/present.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,8 +28,8 @@ #include <svx/svxids.hrc> #include "present.hrc" -#define DISTANCE 23 -#define DISTANCE2 ((DISTANCE) + 81) +#define DISTANCE 23 +#define DISTANCE2 ((DISTANCE) + 81) ModalDialog DLG_START_PRESENTATION { @@ -229,7 +229,7 @@ ModalDialog DLG_START_PRESENTATION TabStop = TRUE ; Text [ en-US ] = "Presentation always ~on top" ; }; - + FixedLine GRP_MONITOR { Pos = MAP_APPFONT ( 6, 174 ) ; @@ -258,12 +258,12 @@ ModalDialog DLG_START_PRESENTATION DropDown = TRUE ; ClipChildren = TRUE; }; - + String STR_PRIMARY_MONITOR { Text [ en-US ] = "Display %1 (primary)"; }; - + String STR_MONITOR { Text [ en-US ] = "Display %1"; diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 98667c3362cf..e40008e570eb 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,12 +74,12 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, SfxStyleSheetBase& rStyleBase, PresentationObjects _ePO, SfxStyleSheetBasePool* pSSPool ) : - SfxTabDialog ( pParent, DlgId ), - mpDocShell ( pDocSh ), - ePO ( _ePO ), - aInputSet ( *rStyleBase.GetItemSet().GetPool(), SID_PARAM_NUM_PRESET, SID_PARAM_CUR_NUM_LEVEL ), - pOutSet ( NULL ), - pOrgSet ( &rStyleBase.GetItemSet() ) + SfxTabDialog ( pParent, DlgId ), + mpDocShell ( pDocSh ), + ePO ( _ePO ), + aInputSet ( *rStyleBase.GetItemSet().GetPool(), SID_PARAM_NUM_PRESET, SID_PARAM_CUR_NUM_LEVEL ), + pOutSet ( NULL ), + pOrgSet ( &rStyleBase.GetItemSet() ) { if( IS_OUTLINE(ePO)) { @@ -171,7 +171,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, AddTabPage( RID_SVXPAGE_PICK_BULLET ); AddTabPage( RID_SVXPAGE_PICK_SINGLE_NUM ); AddTabPage( RID_SVXPAGE_PICK_BMP ); - AddTabPage( RID_SVXPAGE_NUM_OPTIONS ); + AddTabPage( RID_SVXPAGE_NUM_OPTIONS ); AddTabPage( RID_SVXPAGE_TABULATOR ); } break; @@ -256,7 +256,7 @@ SdPresLayoutTemplateDlg::~SdPresLayoutTemplateDlg() // ----------------------------------------------------------------------- void SdPresLayoutTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) -{ SfxAllItemSet aSet(*(aInputSet.GetPool())); +{ SfxAllItemSet aSet(*(aInputSet.GetPool())); switch( nId ) { case RID_SVXPAGE_LINE: diff --git a/sd/source/ui/dlg/prltempl.src b/sd/source/ui/dlg/prltempl.src index d7251c084c3d..02ad8b373162 100644 --- a/sd/source/ui/dlg/prltempl.src +++ b/sd/source/ui/dlg/prltempl.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -112,7 +112,7 @@ TabDialog TAB_PRES_LAYOUT_TEMPLATE Identifier = RID_SVXPAGE_NUM_OPTIONS ; PageResID = RID_SVXPAGE_NUM_OPTIONS ; Text [ en-US ] = "Customize" ; - }; + }; PageItem { Identifier = RID_SVXPAGE_ALIGN_PARAGRAPH ; @@ -124,13 +124,13 @@ TabDialog TAB_PRES_LAYOUT_TEMPLATE Identifier = RID_SVXPAGE_PARA_ASIAN ; PageResID = RID_SVXPAGE_PARA_ASIAN ; Text[ en-US ] = "Asian Typography"; - }; + }; PageItem { Identifier = RID_SVXPAGE_TABULATOR ; PageResID = RID_SVXPAGE_TABULATOR ; Text [ en-US ] = "Tabs" ; - }; + }; }; }; }; diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index 3c9aad38c332..56f67da928ca 100755 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ /************************************************************************* |* -|* Dialog zum Aendern der Print-Optionen +|* Dialog zum Aendern der Print-Optionen |* \************************************************************************/ @@ -80,7 +80,7 @@ SdPrintOptions::SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs ) : aCbxPaperbin ( this, SdResId( CBX_PAPERBIN ) ), - rOutAttrs ( rInAttrs ) + rOutAttrs ( rInAttrs ) { FreeResource(); @@ -181,7 +181,7 @@ void SdPrintOptions::Reset( const SfxItemSet& rAttrs ) aRbtBooklet.Check( pPrintOpts->GetOptionsPrint().IsBooklet() ); aCbxFront.Check( pPrintOpts->GetOptionsPrint().IsFrontPage() ); aCbxBack.Check( pPrintOpts->GetOptionsPrint().IsBackPage() ); - aCbxPaperbin.Check( pPrintOpts->GetOptionsPrint().IsPaperbin() ); + aCbxPaperbin.Check( pPrintOpts->GetOptionsPrint().IsPaperbin() ); if( !aRbtPagesize.IsChecked() && !aRbtPagetile.IsChecked() && @@ -290,8 +290,8 @@ void SdPrintOptions::SetDrawMode() } } -void SdPrintOptions::PageCreated (SfxAllItemSet -#ifdef QUARTZ +void SdPrintOptions::PageCreated (SfxAllItemSet +#ifdef QUARTZ aSet #endif ) diff --git a/sd/source/ui/dlg/prntopts.src b/sd/source/ui/dlg/prntopts.src index dd2ed2e3f63b..2644d6e59fc9 100644 --- a/sd/source/ui/dlg/prntopts.src +++ b/sd/source/ui/dlg/prntopts.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx index c177d7e7eec9..f0c6d816a885 100644 --- a/sd/source/ui/dlg/sdabstdlg.cxx +++ b/sd/source/ui/dlg/sdabstdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index aa0bb5ce9f27..9f746cd38707 100755 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -232,7 +232,7 @@ SvxFieldData* AbstractSdModifyFieldDlg_Impl::GetField() { return pDlg->GetField(); } -SfxItemSet AbstractSdModifyFieldDlg_Impl::GetItemSet() +SfxItemSet AbstractSdModifyFieldDlg_Impl::GetItemSet() { return pDlg->GetItemSet(); } @@ -243,7 +243,7 @@ void AbstractSdSnapLineDlg_Impl::GetAttr(SfxItemSet& rOutAttrs) { pDlg->GetAttr(rOutAttrs); } -void AbstractSdSnapLineDlg_Impl::HideRadioGroup() +void AbstractSdSnapLineDlg_Impl::HideRadioGroup() { pDlg->HideRadioGroup(); } @@ -381,11 +381,11 @@ void AbstractHeaderFooterDialog_Impl::Cancel( TabPage* pPage ) //-------------- SdAbstractDialogFactory implementation-------------- //add for BreakDlg begin -VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateBreakDlg( - ::Window* pWindow, - ::sd::DrawView* pDrView, - ::sd::DrawDocShell* pShell, - ULONG nSumActionCount, +VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateBreakDlg( + ::Window* pWindow, + ::sd::DrawView* pDrView, + ::sd::DrawDocShell* pShell, + ULONG nSumActionCount, ULONG nObjCount ) //add for BreakDlg { return new VclAbstractDialog_Impl( new ::sd::BreakDlg( pWindow, pDrView, pShell, nSumActionCount, nObjCount ) ); @@ -419,7 +419,7 @@ SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabPageDialog( ::W { return new AbstractTabDialog_Impl( new SdPageDlg( pDocShell, pParent, pAttr, bAreaPage ) ); } -// add for SdCharDlg end +// add for SdCharDlg end //add for AssistentDlg begin AbstractAssistentDlg * SdAbstractDialogFactory_Impl::CreateAssistentDlg( ::Window* pParent, BOOL bAutoPilot) @@ -443,7 +443,7 @@ AbstractSdSnapLineDlg * SdAbstractDialogFactory_Impl::CreateSdSnapLineDlg( ::Win //add for SdSnapLineDlg end //add for SdInsertLayerDlg begin -AbstractSdInsertLayerDlg * SdAbstractDialogFactory_Impl::CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, String aStr ) //add for SdInsertLayerDlg +AbstractSdInsertLayerDlg * SdAbstractDialogFactory_Impl::CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, String aStr ) //add for SdInsertLayerDlg { return new AbstractSdInsertLayerDlg_Impl( new SdInsertLayerDlg( pWindow, rInAttrs, bDeletable, aStr ) ); } @@ -480,14 +480,14 @@ SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdParagraphTabDlg( : { return new AbstractTabDialog_Impl( new SdParagraphDlg( pParent, pAttr ) ); } -// add for OutlineBulletDlg end +// add for OutlineBulletDlg end // add for SdStartPresentationDlg begin AbstractSdStartPresDlg * SdAbstractDialogFactory_Impl::CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, List& rPageNames, List* pCSList ) { return new AbstractSdStartPresDlg_Impl( new SdStartPresentationDlg( pWindow, rInAttrs, rPageNames, pCSList ) ); } -// add for SdStartPresentationDlg end +// add for SdStartPresentationDlg end // add for SdPresLayoutTemplateDlg begin SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) @@ -497,17 +497,17 @@ SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdPresLayoutTemplate // add for SdPresLayoutDlg begin AbstractSdPresLayoutDlg * SdAbstractDialogFactory_Impl::CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs) -{ +{ return new AbstractSdPresLayoutDlg_Impl( new SdPresLayoutDlg( pDocShell, pViewShell, pWindow, rInAttrs ) ); } -// add for SdPresLayoutDlg end +// add for SdPresLayoutDlg end // add for SdTabTemplateDlg begin SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) { return new AbstractTabDialog_Impl( new SdTabTemplateDlg( pParent, pDocShell, rStyleBase, pModel, pView ) ); } -// add for SdTabTemplateDlg end +// add for SdTabTemplateDlg end SfxAbstractDialog* SdAbstractDialogFactory_Impl::CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) { @@ -519,14 +519,14 @@ AbstractSdVectorizeDlg * SdAbstractDialogFactory_Impl::CreateSdVectorizeDlg( :: { return new AbstractSdVectorizeDlg_Impl( new SdVectorizeDlg( pParent, rBmp, pDocShell ) ); } -// add for SdVectorizeDlg end +// add for SdVectorizeDlg end // add for SdPublishingDlg begin AbstractSdPublishingDlg * SdAbstractDialogFactory_Impl::CreateSdPublishingDlg( ::Window* pWindow, DocumentType eDocType) { return new AbstractSdPublishingDlg_Impl( new SdPublishingDlg( pWindow, eDocType ) ); } -// add for SdPublishingDlg end +// add for SdPublishingDlg end // Factories for TabPages CreateTabPage SdAbstractDialogFactory_Impl::GetSdOptionsContentsTabPageCreatorFunc() @@ -549,13 +549,13 @@ CreateTabPage SdAbstractDialogFactory_Impl::GetSdOptionsSnapTabPageCreatorFunc() return SdTpOptionsSnap::Create; } -VclAbstractDialog* SdAbstractDialogFactory_Impl::CreateMasterLayoutDialog( ::Window* pParent, +VclAbstractDialog* SdAbstractDialogFactory_Impl::CreateMasterLayoutDialog( ::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) { return new VclAbstractDialog_Impl( new ::sd::MasterLayoutDialog( pParent, pDoc, pCurrentPage )); } -AbstractHeaderFooterDialog* SdAbstractDialogFactory_Impl::CreateHeaderFooterDialog( ViewShell* pViewShell, +AbstractHeaderFooterDialog* SdAbstractDialogFactory_Impl::CreateHeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) { return new AbstractHeaderFooterDialog_Impl( new ::sd::HeaderFooterDialog( (::sd::ViewShell*)pViewShell, pParent, pDoc, pCurrentPage )); diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index fa5e53ebac54..aa3312a779a5 100755 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,26 +28,26 @@ #define _SD_DLGFACT_HXX // include --------------------------------------------------------------- -#include "sdabstdlg.hxx" +#include "sdabstdlg.hxx" #include <sfx2/basedlgs.hxx> -#define DECL_ABSTDLG_BASE(Class,DialogClass) \ - DialogClass* pDlg; \ -public: \ - Class( DialogClass* p) \ - : pDlg(p) \ +#define DECL_ABSTDLG_BASE(Class,DialogClass) \ + DialogClass* pDlg; \ +public: \ + Class( DialogClass* p) \ + : pDlg(p) \ {} \ - virtual ~Class(); \ - virtual short Execute() ; + virtual ~Class(); \ + virtual short Execute() ; -#define IMPL_ABSTDLG_BASE(Class) \ -Class::~Class() \ +#define IMPL_ABSTDLG_BASE(Class) \ +Class::~Class() \ { \ - delete pDlg; \ -} \ + delete pDlg; \ +} \ short Class::Execute() \ { \ - return pDlg->Execute(); \ + return pDlg->Execute(); \ } namespace sd { @@ -69,7 +69,7 @@ class VclAbstractDialog_Impl : public VclAbstractDialog class AbstractCopyDlg_Impl : public AbstractCopyDlg { DECL_ABSTDLG_BASE(AbstractCopyDlg_Impl,::sd::CopyDlg) - virtual void GetAttr( SfxItemSet& rOutAttrs ); + virtual void GetAttr( SfxItemSet& rOutAttrs ); }; // add for SdCustomShowDlg @@ -77,8 +77,8 @@ class SdCustomShowDlg; class AbstractSdCustomShowDlg_Impl : public AbstractSdCustomShowDlg { DECL_ABSTDLG_BASE(AbstractSdCustomShowDlg_Impl,SdCustomShowDlg) - virtual BOOL IsModified() const ; - virtual BOOL IsCustomShow() const ; + virtual BOOL IsModified() const ; + virtual BOOL IsCustomShow() const ; }; //add for SdCharDlg begin @@ -86,13 +86,13 @@ class SfxTabDialog; class AbstractTabDialog_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog ) - virtual void SetCurPageId( USHORT nId ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); - virtual void SetInputSet( const SfxItemSet* pInSet ); + virtual void SetCurPageId( USHORT nId ); + virtual const SfxItemSet* GetOutputItemSet() const; + virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); + virtual void SetInputSet( const SfxItemSet* pInSet ); //From class Window. - virtual void SetText( const XubString& rStr ); - virtual String GetText() const; + virtual void SetText( const XubString& rStr ); + virtual String GetText() const; }; //add for SdCharDlg end @@ -102,13 +102,13 @@ class SfxTabDialog; class AbstractBulletDialog_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( AbstractBulletDialog_Impl,SfxTabDialog ) - virtual void SetCurPageId( USHORT nId ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); - virtual void SetInputSet( const SfxItemSet* pInSet ); + virtual void SetCurPageId( USHORT nId ); + virtual const SfxItemSet* GetOutputItemSet() const; + virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); + virtual void SetInputSet( const SfxItemSet* pInSet ); //From class Window. - virtual void SetText( const XubString& rStr ); - virtual String GetText() const; + virtual void SetText( const XubString& rStr ); + virtual String GetText() const; }; //add for OutlineBulletDlg end @@ -116,13 +116,13 @@ class SdPresLayoutTemplateDlg; class SdPresLayoutTemplateDlg_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( SdPresLayoutTemplateDlg_Impl,SdPresLayoutTemplateDlg ) - virtual void SetCurPageId( USHORT nId ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); - virtual void SetInputSet( const SfxItemSet* pInSet ); + virtual void SetCurPageId( USHORT nId ); + virtual const SfxItemSet* GetOutputItemSet() const; + virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); + virtual void SetInputSet( const SfxItemSet* pInSet ); //From class Window. - virtual void SetText( const XubString& rStr ); - virtual String GetText() const; + virtual void SetText( const XubString& rStr ); + virtual String GetText() const; }; // add for AssistentDlg @@ -145,8 +145,8 @@ class SdModifyFieldDlg; class AbstractSdModifyFieldDlg_Impl : public AbstractSdModifyFieldDlg { DECL_ABSTDLG_BASE(AbstractSdModifyFieldDlg_Impl,SdModifyFieldDlg) - virtual SvxFieldData* GetField(); - virtual SfxItemSet GetItemSet(); + virtual SvxFieldData* GetField(); + virtual SfxItemSet GetItemSet(); }; // add for SdSnapLineDlg @@ -167,7 +167,7 @@ class SdInsertLayerDlg; class AbstractSdInsertLayerDlg_Impl : public AbstractSdInsertLayerDlg { DECL_ABSTDLG_BASE(AbstractSdInsertLayerDlg_Impl,SdInsertLayerDlg) - virtual void GetAttr( SfxItemSet& rOutAttrs ) ; + virtual void GetAttr( SfxItemSet& rOutAttrs ) ; //from class Window virtual void SetHelpId( ULONG nHelpId ) ; }; @@ -177,7 +177,7 @@ class SdInsertPasteDlg; class AbstractSdInsertPasteDlg_Impl : public AbstractSdInsertPasteDlg { DECL_ABSTDLG_BASE(AbstractSdInsertPasteDlg_Impl,SdInsertPasteDlg) - virtual BOOL IsInsertBefore() const; + virtual BOOL IsInsertBefore() const; }; // add for SdInsertPagesObjsDlg @@ -185,20 +185,20 @@ class SdInsertPagesObjsDlg; class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg { DECL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl,SdInsertPagesObjsDlg) - virtual ::Window * GetWindow(); //this method is added for return a Window type pointer - virtual List* GetList( USHORT nType ); - virtual BOOL IsLink(); - virtual BOOL IsRemoveUnnessesaryMasterPages() const; + virtual ::Window * GetWindow(); //this method is added for return a Window type pointer + virtual List* GetList( USHORT nType ); + virtual BOOL IsLink(); + virtual BOOL IsRemoveUnnessesaryMasterPages() const; }; // add for MorphDlg class AbstractMorphDlg_Impl : public AbstractMorphDlg { DECL_ABSTDLG_BASE(AbstractMorphDlg_Impl,::sd::MorphDlg) - virtual void SaveSettings() const; - virtual USHORT GetFadeSteps() const; - virtual BOOL IsAttributeFade() const ; - virtual BOOL IsOrientationFade() const ; + virtual void SaveSettings() const; + virtual USHORT GetFadeSteps() const; + virtual BOOL IsAttributeFade() const ; + virtual BOOL IsOrientationFade() const ; }; // add for SdStartPresentationDlg @@ -206,7 +206,7 @@ class SdStartPresentationDlg; class AbstractSdStartPresDlg_Impl : public AbstractSdStartPresDlg { DECL_ABSTDLG_BASE(AbstractSdStartPresDlg_Impl,SdStartPresentationDlg) - virtual void GetAttr( SfxItemSet& rOutAttrs ); + virtual void GetAttr( SfxItemSet& rOutAttrs ); }; // add for SdPresLayoutDlg @@ -214,29 +214,29 @@ class SdPresLayoutDlg; class AbstractSdPresLayoutDlg_Impl : public AbstractSdPresLayoutDlg { DECL_ABSTDLG_BASE(AbstractSdPresLayoutDlg_Impl,SdPresLayoutDlg) - virtual void GetAttr(SfxItemSet& rOutAttrs); + virtual void GetAttr(SfxItemSet& rOutAttrs); }; // add for SdActionDlg -class SfxSingleTabDialog; -class AbstractSfxDialog_Impl : public SfxAbstractDialog +class SfxSingleTabDialog; +class AbstractSfxDialog_Impl : public SfxAbstractDialog { DECL_ABSTDLG_BASE(AbstractSfxDialog_Impl,SfxModalDialog) - virtual const SfxItemSet* GetOutputItemSet() const; - virtual void SetText( const XubString& rStr ); - virtual String GetText() const; + virtual const SfxItemSet* GetOutputItemSet() const; + virtual void SetText( const XubString& rStr ); + virtual String GetText() const; }; // add for SdVectorizeDlg -class SdVectorizeDlg; +class SdVectorizeDlg; class AbstractSdVectorizeDlg_Impl :public AbstractSdVectorizeDlg { DECL_ABSTDLG_BASE(AbstractSdVectorizeDlg_Impl,SdVectorizeDlg) - virtual const GDIMetaFile& GetGDIMetaFile() const ; + virtual const GDIMetaFile& GetGDIMetaFile() const ; }; // add for SdPublishingDlg -class SdPublishingDlg; +class SdPublishingDlg; class AbstractSdPublishingDlg_Impl :public AbstractSdPublishingDlg { DECL_ABSTDLG_BASE(AbstractSdPublishingDlg_Impl,SdPublishingDlg) @@ -258,42 +258,42 @@ class SdAbstractDialogFactory_Impl : public SdAbstractDialogFactory { public: - virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, ULONG nSumActionCount, ULONG nObjCount ); - virtual AbstractCopyDlg* CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, XColorTable* pColTab, ::sd::View* pView ); - virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ); - virtual SfxAbstractTabDialog* CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ); - virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, BOOL bAreaPage = TRUE ); - virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, BOOL bAutoPilot); - virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( ::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ); - virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView); - virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, String aStr ); - virtual AbstractSdInsertPasteDlg* CreateSdInsertPasteDlg( ::Window* pWindow ); + virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, ULONG nSumActionCount, ULONG nObjCount ); + virtual AbstractCopyDlg* CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, XColorTable* pColTab, ::sd::View* pView ); + virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ); + virtual SfxAbstractTabDialog* CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ); + virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, BOOL bAreaPage = TRUE ); + virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, BOOL bAutoPilot); + virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( ::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ); + virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView); + virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, String aStr ); + virtual AbstractSdInsertPasteDlg* CreateSdInsertPasteDlg( ::Window* pWindow ); virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg( ::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const String& rFileName ); - virtual AbstractMorphDlg* CreateMorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2); - virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ); - virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( ::Window* pParent, const SfxItemSet* pAttr ); - virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, List& rPageNames, List* pCSList ); - virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ); - virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs); - virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ); - virtual SfxAbstractDialog* CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ); - virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ); - virtual AbstractSdPublishingDlg* CreateSdPublishingDlg( ::Window* pWindow, DocumentType eDocType); + virtual AbstractMorphDlg* CreateMorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2); + virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ); + virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( ::Window* pParent, const SfxItemSet* pAttr ); + virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, List& rPageNames, List* pCSList ); + virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ); + virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs); + virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ); + virtual SfxAbstractDialog* CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ); + virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ); + virtual AbstractSdPublishingDlg* CreateSdPublishingDlg( ::Window* pWindow, DocumentType eDocType); - virtual VclAbstractDialog* CreateMasterLayoutDialog( ::Window* pParent, + virtual VclAbstractDialog* CreateMasterLayoutDialog( ::Window* pParent, SdDrawDocument* pDoc, SdPage* ); // add for MasterLayoutDialog - virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( ViewShell* pViewShell, - ::Window* pParent, - SdDrawDocument* pDoc, + virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( ViewShell* pViewShell, + ::Window* pParent, + SdDrawDocument* pDoc, SdPage* pCurrentPage ); // add for HeaderFooterDialog // For TabPage - virtual CreateTabPage GetSdOptionsContentsTabPageCreatorFunc(); - virtual CreateTabPage GetSdPrintOptionsTabPageCreatorFunc(); - virtual CreateTabPage GetSdOptionsMiscTabPageCreatorFunc(); - virtual CreateTabPage GetSdOptionsSnapTabPageCreatorFunc(); + virtual CreateTabPage GetSdOptionsContentsTabPageCreatorFunc(); + virtual CreateTabPage GetSdPrintOptionsTabPageCreatorFunc(); + virtual CreateTabPage GetSdOptionsMiscTabPageCreatorFunc(); + virtual CreateTabPage GetSdOptionsSnapTabPageCreatorFunc(); }; #endif diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index c1d81bc073b9..49c511d27389 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,9 +57,9 @@ \************************************************************************/ SdPresLayoutDlg::SdPresLayoutDlg( - ::sd::DrawDocShell* pDocShell, - ::sd::ViewShell* pViewShell, - ::Window* pWindow, + ::sd::DrawDocShell* pDocShell, + ::sd::ViewShell* pViewShell, + ::Window* pWindow, const SfxItemSet& rInAttrs ): ModalDialog (pWindow, SdResId(DLG_PRESLT)), mpDocSh ( pDocShell ), @@ -69,11 +69,11 @@ SdPresLayoutDlg::SdPresLayoutDlg( maBtnOK (this, SdResId(BTN_OK)), maBtnCancel (this, SdResId(BTN_CANCEL)), maBtnHelp (this, SdResId(BTN_HELP)), - maCbxMasterPage (this, SdResId(CBX_MASTER_PAGE)), - maCbxCheckMasters (this, SdResId(CBX_CHECK_MASTERS)), + maCbxMasterPage (this, SdResId(CBX_MASTER_PAGE)), + maCbxCheckMasters (this, SdResId(CBX_CHECK_MASTERS)), maBtnLoad (this, SdResId(BTN_LOAD)), mrOutAttrs (rInAttrs), - maStrNone ( SdResId( STR_NULL ) ) + maStrNone ( SdResId( STR_NULL ) ) { FreeResource(); @@ -87,7 +87,7 @@ SdPresLayoutDlg::SdPresLayoutDlg( /************************************************************************* |* -|* Dtor +|* Dtor |* *************************************************************************/ @@ -105,7 +105,7 @@ SdPresLayoutDlg::~SdPresLayoutDlg() /************************************************************************* |* -|* Initialisierung +|* Initialisierung |* *************************************************************************/ @@ -146,7 +146,7 @@ void SdPresLayoutDlg::Reset() /************************************************************************* |* -|* Fuellt uebergebenen Item-Set mit Dialogbox-Attributen +|* Fuellt uebergebenen Item-Set mit Dialogbox-Attributen |* *************************************************************************/ @@ -308,7 +308,7 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG) { ::sd::DrawDocShell* pTemplDocSh= pTemplDoc->GetDocSh(); -/* SdPage* pMaster = pTemplDoc->GetMasterSdPage( 0, PK_STANDARD ); +/* SdPage* pMaster = pTemplDoc->GetMasterSdPage( 0, PK_STANDARD ); mpLayoutNames->Insert( new String( maName ), LIST_APPEND ); Bitmap aBitmap( pTemplDocSh->GetPagePreviewBitmap( pMaster, 90 ) ); diff --git a/sd/source/ui/dlg/sdpreslt.src b/sd/source/ui/dlg/sdpreslt.src index 3aad51674a46..f1d18adfe99e 100644 --- a/sd/source/ui/dlg/sdpreslt.src +++ b/sd/source/ui/dlg/sdpreslt.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 275d39af4ea5..79d2300cb390 100755 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ #include <svtools/embedtransfer.hxx> #include <tools/diagnose_ex.h> #include <ViewShell.hxx> - + using namespace com::sun::star; class SdPageObjsTLB::IconProvider @@ -87,8 +87,8 @@ public: BOOL SD_DLLPRIVATE SdPageObjsTLB::bIsInDrag = FALSE; BOOL SdPageObjsTLB::IsInDrag() -{ - return bIsInDrag; +{ + return bIsInDrag; } sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::mnListBoxDropFormatId = SAL_MAX_UINT32; @@ -97,8 +97,8 @@ sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::mnListBoxDropFormatId = SAL_MA // - SdPageObjsTLB::SdPageObjsTransferable - // ----------------------------------------- -SdPageObjsTLB::SdPageObjsTransferable::SdPageObjsTransferable( - SdPageObjsTLB& rParent, +SdPageObjsTLB::SdPageObjsTransferable::SdPageObjsTransferable( + SdPageObjsTLB& rParent, const INetBookmark& rBookmark, ::sd::DrawDocShell& rDocShell, NavigatorDragType eDragType, @@ -110,7 +110,7 @@ SdPageObjsTLB::SdPageObjsTransferable::SdPageObjsTransferable( meDragType( eDragType ), maTreeListBoxData( rTreeListBoxData ) { -} +} @@ -122,7 +122,7 @@ SdPageObjsTLB::SdPageObjsTransferable::~SdPageObjsTransferable() // ----------------------------------------------------------------------------- void SdPageObjsTLB::SdPageObjsTransferable::AddSupportedFormats() -{ +{ AddFormat(SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK); AddFormat(SOT_FORMATSTR_ID_TREELISTBOX); AddFormat(GetListBoxDropFormatId()); @@ -240,19 +240,19 @@ sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::GetListBoxDropFormatId (void) |* \************************************************************************/ -SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId ) -: SvTreeListBox ( pParentWin, rSdResId ) -, mpParent ( pParentWin ) -, mpDoc ( NULL ) -, mpBookmarkDoc ( NULL ) -, mpMedium ( NULL ) -, mpOwnMedium ( NULL ) -, maImgOle ( BitmapEx( SdResId( BMP_OLE ) ) ) -, maImgGraphic ( BitmapEx( SdResId( BMP_GRAPHIC ) ) ) -, maImgOleH ( BitmapEx( SdResId( BMP_OLE_H ) ) ) -, maImgGraphicH ( BitmapEx( SdResId( BMP_GRAPHIC_H ) ) ) -, mbLinkableSelected ( FALSE ) -, mpDropNavWin ( NULL ) +SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId ) +: SvTreeListBox ( pParentWin, rSdResId ) +, mpParent ( pParentWin ) +, mpDoc ( NULL ) +, mpBookmarkDoc ( NULL ) +, mpMedium ( NULL ) +, mpOwnMedium ( NULL ) +, maImgOle ( BitmapEx( SdResId( BMP_OLE ) ) ) +, maImgGraphic ( BitmapEx( SdResId( BMP_GRAPHIC ) ) ) +, maImgOleH ( BitmapEx( SdResId( BMP_OLE_H ) ) ) +, maImgGraphicH ( BitmapEx( SdResId( BMP_GRAPHIC_H ) ) ) +, mbLinkableSelected ( FALSE ) +, mpDropNavWin ( NULL ) , mbShowAllShapes ( false ) , mbShowAllPages ( false ) @@ -403,7 +403,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, BOOL bAllPages, mbShowAllPages = (bAllPages == TRUE); mpMedium = NULL; - SdPage* pPage = NULL; + SdPage* pPage = NULL; IconProvider aIconProvider; @@ -633,10 +633,10 @@ BOOL SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc ) if( !mpDoc ) return( FALSE ); - SdrObject* pObj = NULL; - SdPage* pPage = NULL; + SdrObject* pObj = NULL; + SdPage* pPage = NULL; SvLBoxEntry* pEntry = First(); - String aName; + String aName; // Alle Pages incl. Objekte vergleichen USHORT nPage = 0; @@ -709,7 +709,7 @@ String SdPageObjsTLB::GetSelectEntry() List* SdPageObjsTLB::GetSelectEntryList( USHORT nDepth ) { - List* pList = NULL; + List* pList = NULL; SvLBoxEntry* pEntry = FirstSelected(); while( pEntry ) @@ -741,8 +741,8 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry ) { if( GetBookmarkDoc() ) { - SdrObject* pObj = NULL; - SdPage* pPage = NULL; + SdrObject* pObj = NULL; + SdPage* pPage = NULL; SvLBoxEntry* pPageEntry = NULL; Image aImgPage=Image( BitmapEx( SdResId( BMP_PAGE ) ) ); @@ -824,8 +824,8 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry ) /************************************************************************* |* -|* Prueft, ob es sich um eine Draw-Datei handelt und oeffnet anhand des -|* uebergebenen Docs das BookmarkDoc +|* Prueft, ob es sich um eine Draw-Datei handelt und oeffnet anhand des +|* uebergebenen Docs das BookmarkDoc |* \************************************************************************/ @@ -976,10 +976,10 @@ void SdPageObjsTLB::StartDrag( sal_Int8 nAction, const Point& rPosPixel) { (void)nAction; (void)rPosPixel; - + SdNavigatorWin* pNavWin = NULL; SvLBoxEntry* pEntry = GetEntry(rPosPixel); - + if( mpFrame->HasChildWindow( SID_NAVIGATOR ) ) pNavWin = (SdNavigatorWin*) ( mpFrame->GetChildWindow( SID_NAVIGATOR )->GetContextWindow( SD_MOD() ) ); @@ -1038,16 +1038,16 @@ void SdPageObjsTLB::DoDrag() { ::sd::DrawDocShell* pDocShell = mpDoc->GetDocSh(); String aURL = INetURLObject( pDocShell->GetMedium()->GetPhysicalName(), INET_PROT_FILE ).GetMainURL( INetURLObject::NO_DECODE ); - NavigatorDragType eDragType = mpDropNavWin->GetNavigatorDragType(); + NavigatorDragType eDragType = mpDropNavWin->GetNavigatorDragType(); aURL.Append( '#' ); aURL.Append( GetSelectEntry() ); - INetBookmark aBookmark( aURL, GetSelectEntry() ); - sal_Int8 nDNDActions = DND_ACTION_COPYMOVE; + INetBookmark aBookmark( aURL, GetSelectEntry() ); + sal_Int8 nDNDActions = DND_ACTION_COPYMOVE; if( eDragType == NAVIGATOR_DRAGTYPE_LINK ) - nDNDActions = DND_ACTION_LINK; // #93240# Either COPY *or* LINK, never both! + nDNDActions = DND_ACTION_LINK; // #93240# Either COPY *or* LINK, never both! SvTreeListBox::ReleaseMouse(); @@ -1061,7 +1061,7 @@ void SdPageObjsTLB::DoDrag() ::com::sun::star::uno::Sequence<sal_Int8> aSequence (sizeof(SvLBoxDDInfo)); memcpy(aSequence.getArray(), (sal_Char*)&aDDInfo, sizeof(SvLBoxDDInfo)); ::com::sun::star::uno::Any aTreeListBoxData (aSequence); - + // object is destroyed by internal reference mechanism SdTransferable* pTransferable = new SdPageObjsTLB::SdPageObjsTransferable( *this, aBookmark, *pDocShell, eDragType, aTreeListBoxData); @@ -1142,7 +1142,7 @@ void SdPageObjsTLB::OnDragFinished( sal_uInt8 ) sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent) { sal_Int8 nResult (DND_ACTION_NONE); - + if ( !bIsInDrag && IsDropFormatSupported( FORMAT_FILE ) ) { nResult = rEvent.mnAction; @@ -1171,11 +1171,11 @@ sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent) } } } - + // Hide emphasis when there is no valid drop action. if (nResult == DND_ACTION_NONE) ImplShowTargetEmphasis(pTargetEntry, FALSE); - + return nResult; } @@ -1194,16 +1194,16 @@ sal_Int8 SdPageObjsTLB::ExecuteDrop( const ExecuteDropEvent& rEvt ) if( !bIsInDrag ) { SdNavigatorWin* pNavWin = NULL; - USHORT nId = SID_NAVIGATOR; - + USHORT nId = SID_NAVIGATOR; + if( mpFrame->HasChildWindow( nId ) ) pNavWin = (SdNavigatorWin*)( mpFrame->GetChildWindow( nId )->GetContextWindow( SD_MOD() ) ); - + if( pNavWin && ( pNavWin == mpParent ) ) { - TransferableDataHelper aDataHelper( rEvt.maDropEvent.Transferable ); - String aFile; - + TransferableDataHelper aDataHelper( rEvt.maDropEvent.Transferable ); + String aFile; + if( aDataHelper.GetString( FORMAT_FILE, aFile ) && ( (SdNavigatorWin*) mpParent)->InsertFile( aFile ) ) { @@ -1232,8 +1232,8 @@ sal_Int8 SdPageObjsTLB::ExecuteDrop( const ExecuteDropEvent& rEvt ) IMPL_STATIC_LINK(SdPageObjsTLB, ExecDragHdl, void*, EMPTYARG) { - // als Link, damit asynchron ohne ImpMouseMoveMsg auf dem Stack auch der - // Navigator geloescht werden darf + // als Link, damit asynchron ohne ImpMouseMoveMsg auf dem Stack auch der + // Navigator geloescht werden darf pThis->DoDrag(); return 0; } @@ -1336,7 +1336,7 @@ SvLBoxEntry* SdPageObjsTLB::GetDropTarget (const Point& rLocation) if (pEntry == NULL) return NULL; - OSL_TRACE("entry is %s", + OSL_TRACE("entry is %s", ::rtl::OUStringToOString(GetEntryText(pEntry), RTL_TEXTENCODING_UTF8).getStr()); if (GetParent(pEntry) == NULL) { @@ -1360,7 +1360,7 @@ SvLBoxEntry* SdPageObjsTLB::GetDropTarget (const Point& rLocation) else break; } - OSL_TRACE("returning %s", + OSL_TRACE("returning %s", ::rtl::OUStringToOString(GetEntryText(pEntry), RTL_TEXTENCODING_UTF8).getStr()); } @@ -1374,7 +1374,7 @@ bool SdPageObjsTLB::IsDropAllowed (SvLBoxEntry* pEntry) { if (pEntry == NULL) return false; - + if ( ! IsDropFormatSupported(SdPageObjsTransferable::GetListBoxDropFormatId())) return false; @@ -1426,7 +1426,7 @@ void SdPageObjsTLB::AddShapeToTransferable ( Point aDragPos (rObject.GetCurrentBoundRect().Center()); //Point aDragPos (0,0); aObjectDescriptor.maDragStartPos = aDragPos; - // aObjectDescriptor.maSize = GetAllMarkedRect().GetSize(); + // aObjectDescriptor.maSize = GetAllMarkedRect().GetSize(); if (pDocShell != NULL) aObjectDescriptor.maDisplayName = pDocShell->GetMedium()->GetURLObject().GetURLNoPass(); else diff --git a/sd/source/ui/dlg/sduiexp.cxx b/sd/source/ui/dlg/sduiexp.cxx index 60c40929344a..6f94ff85324b 100644 --- a/sd/source/ui/dlg/sduiexp.cxx +++ b/sd/source/ui/dlg/sduiexp.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx index 5fd9af68eee0..7fc511e18d68 100644 --- a/sd/source/ui/dlg/tabtempl.cxx +++ b/sd/source/ui/dlg/tabtempl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,14 +71,14 @@ SdTabTemplateDlg::SdTabTemplateDlg( Window* pParent, SdrModel* pModel, SdrView* pView ) : SfxStyleDialog ( pParent, SdResId( TAB_TEMPLATE ), rStyleBase, FALSE ), - rDocShell ( *pDocShell ), - pSdrView ( pView ), - pColorTab ( pModel->GetColorTable() ), - pGradientList ( pModel->GetGradientList() ), - pHatchingList ( pModel->GetHatchList() ), - pBitmapList ( pModel->GetBitmapList() ), - pDashList ( pModel->GetDashList() ), - pLineEndList ( pModel->GetLineEndList() ) + rDocShell ( *pDocShell ), + pSdrView ( pView ), + pColorTab ( pModel->GetColorTable() ), + pGradientList ( pModel->GetGradientList() ), + pHatchingList ( pModel->GetHatchList() ), + pBitmapList ( pModel->GetBitmapList() ), + pDashList ( pModel->GetDashList() ), + pLineEndList ( pModel->GetLineEndList() ) { FreeResource(); diff --git a/sd/source/ui/dlg/tabtempl.src b/sd/source/ui/dlg/tabtempl.src index 5ff92235036c..558fd38114cb 100644 --- a/sd/source/ui/dlg/tabtempl.src +++ b/sd/source/ui/dlg/tabtempl.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -120,7 +120,7 @@ TabDialog TAB_TEMPLATE Identifier = RID_SVXPAGE_PARA_ASIAN ; PageResID = RID_SVXPAGE_PARA_ASIAN ; Text[ en-US ] = "Asian Typography"; - }; + }; PageItem { Identifier = RID_SVXPAGE_TABULATOR ; diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index af2668fc9dad..b65e3c119061 100755 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #undef SD_DLLIMPLEMENTATION #endif -#include <svx/svxids.hrc> +#include <svx/svxids.hrc> #include <com/sun/star/presentation/AnimationEffect.hpp> #include <com/sun/star/presentation/ClickAction.hpp> #include <com/sun/star/presentation/AnimationSpeed.hpp> @@ -96,8 +96,8 @@ using namespace com::sun::star::lang; SdActionDlg::SdActionDlg ( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) : - SfxSingleTabDialog ( pParent, *pAttr, TP_ANIMATION_ACTION ), - rOutAttrs ( *pAttr ) + SfxSingleTabDialog ( pParent, *pAttr, TP_ANIMATION_ACTION ), + rOutAttrs ( *pAttr ) { // FreeResource(); SfxTabPage* pNewPage = SdTPAction::Create( this, rOutAttrs ); @@ -117,32 +117,32 @@ SdActionDlg::SdActionDlg ( /************************************************************************* |* -|* Action-TabPage +|* Action-TabPage |* \************************************************************************/ SdTPAction::SdTPAction( Window* pWindow, const SfxItemSet& rInAttrs ) : - SfxTabPage ( pWindow, SdResId( TP_ANIMATION ), rInAttrs ), - - aFtAction ( this, SdResId( FT_ACTION ) ), - aLbAction ( this, SdResId( LB_ACTION ) ), - aFtTree ( this, SdResId( FT_TREE ) ), - aLbTree ( this, SdResId( LB_TREE ) ), - aLbTreeDocument ( this, SdResId( LB_TREE_DOCUMENT ) ), - aLbOLEAction ( this, SdResId( LB_OLE_ACTION ) ), - aFlSeparator ( this, SdResId( FL_SEPARATOR ) ), - aEdtSound ( this, SdResId( EDT_SOUND ) ), - aEdtBookmark ( this, SdResId( EDT_BOOKMARK ) ), - aEdtDocument ( this, SdResId( EDT_DOCUMENT ) ), + SfxTabPage ( pWindow, SdResId( TP_ANIMATION ), rInAttrs ), + + aFtAction ( this, SdResId( FT_ACTION ) ), + aLbAction ( this, SdResId( LB_ACTION ) ), + aFtTree ( this, SdResId( FT_TREE ) ), + aLbTree ( this, SdResId( LB_TREE ) ), + aLbTreeDocument ( this, SdResId( LB_TREE_DOCUMENT ) ), + aLbOLEAction ( this, SdResId( LB_OLE_ACTION ) ), + aFlSeparator ( this, SdResId( FL_SEPARATOR ) ), + aEdtSound ( this, SdResId( EDT_SOUND ) ), + aEdtBookmark ( this, SdResId( EDT_BOOKMARK ) ), + aEdtDocument ( this, SdResId( EDT_DOCUMENT ) ), aEdtProgram ( this, SdResId( EDT_PROGRAM ) ), aEdtMacro ( this, SdResId( EDT_MACRO ) ), - aBtnSearch ( this, SdResId( BTN_SEARCH ) ), - aBtnSeek ( this, SdResId( BTN_SEEK ) ), + aBtnSearch ( this, SdResId( BTN_SEARCH ) ), + aBtnSeek ( this, SdResId( BTN_SEEK ) ), - rOutAttrs ( rInAttrs ), - mpView ( NULL ), - mpDoc ( NULL ), - bTreeUpdated ( FALSE ) + rOutAttrs ( rInAttrs ), + mpView ( NULL ), + mpDoc ( NULL ), + bTreeUpdated ( FALSE ) { FreeResource(); @@ -226,11 +226,11 @@ void SdTPAction::Construct() { pGrafObj = (SdrGrafObj*) pObj; } -// // VCXControl ? -// else if( pObj->IsA( TYPE( VCSbxDrawObject ) ) ) -// { -// bDisableAll = TRUE; -// } +// // VCXControl ? +// else if( pObj->IsA( TYPE( VCSbxDrawObject ) ) ) +// { +// bDisableAll = TRUE; +// } } } if( pGrafObj ) @@ -344,7 +344,7 @@ BOOL SdTPAction::FillItemSet( SfxItemSet& rAttrs ) void SdTPAction::Reset( const SfxItemSet& rAttrs ) { presentation::ClickAction eCA = presentation::ClickAction_NONE; - String aFileName; + String aFileName; // aLbAction if( rAttrs.GetItemState( ATTR_ACTION ) != SFX_ITEM_DONTCARE ) @@ -447,7 +447,7 @@ void SdTPAction::OpenFileDialog() if (bSound) { - SdOpenSoundFileDialog aFileDialog; + SdOpenSoundFileDialog aFileDialog; if( !aFile.Len() ) aFile = SvtPathOptions().GetGraphicPath(); @@ -709,7 +709,7 @@ IMPL_LINK( SdTPAction, CheckFileHdl, void *, EMPTYARG ) // Ueberpruefen, ob es eine gueltige Draw-Datei ist SfxMedium aMedium( aFile, STREAM_READ | STREAM_NOCREATE, - TRUE ); // Download + TRUE ); // Download if( aMedium.IsStorage() ) { @@ -774,8 +774,8 @@ void SdTPAction::SetActualClickAction( presentation::ClickAction eCA ) void SdTPAction::SetEditText( String const & rStr ) { - presentation::ClickAction eCA = GetActualClickAction(); - String aText(rStr); + presentation::ClickAction eCA = GetActualClickAction(); + String aText(rStr); // possibly convert URI back to system path switch( eCA ) @@ -794,7 +794,7 @@ void SdTPAction::SetEditText( String const & rStr ) String aTmpStr(aURL.getFSysPath(INetURLObject::FSYS_DETECT)); if( aTmpStr.Len() ) - aText = aTmpStr; // was a system path + aText = aTmpStr; // was a system path } break; default: @@ -915,8 +915,8 @@ USHORT SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA ) case presentation::ClickAction_DOCUMENT: return STR_CLICK_ACTION_DOCUMENT; case presentation::ClickAction_PROGRAM: return STR_CLICK_ACTION_PROGRAM; case presentation::ClickAction_MACRO: return STR_CLICK_ACTION_MACRO; - case presentation::ClickAction_SOUND: return STR_CLICK_ACTION_SOUND; - case presentation::ClickAction_VERB: return STR_CLICK_ACTION_VERB; + case presentation::ClickAction_SOUND: return STR_CLICK_ACTION_SOUND; + case presentation::ClickAction_VERB: return STR_CLICK_ACTION_VERB; case presentation::ClickAction_STOPPRESENTATION: return STR_CLICK_ACTION_STOPPRESENTATION; default: DBG_ERROR( "Keine StringResource fuer ClickAction vorhanden!" ); } diff --git a/sd/source/ui/dlg/tpaction.src b/sd/source/ui/dlg/tpaction.src index fa951644c580..118f4eda4c7a 100644 --- a/sd/source/ui/dlg/tpaction.src +++ b/sd/source/ui/dlg/tpaction.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,8 +37,8 @@ TabPage TP_ANIMATION Size = MAP_APPFONT ( 260 , 164 ) ; Hide = TRUE; // always visible --------------------------------------------------------------------- -#define MA_ACTIONLB_TOP (RSC_SP_DLG_INNERBORDER_TOP + (2*RSC_CD_PUSHBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y - RSC_CD_DROPDOWN_HEIGHT) / 2) -#define MA_ACTIONLB_LEFT (103) +#define MA_ACTIONLB_TOP (RSC_SP_DLG_INNERBORDER_TOP + (2*RSC_CD_PUSHBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y - RSC_CD_DROPDOWN_HEIGHT) / 2) +#define MA_ACTIONLB_LEFT (103) FixedText FT_ACTION { Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_ACTIONLB_TOP + 1 ) ; @@ -72,7 +72,7 @@ TabPage TP_ANIMATION TabStop = TRUE ; Hide = TRUE ; }; - + // Es ist schon wichtig, daß Durchsuchen (search) und Suchen (seek/find) unter- // schiedlich heissen, da sie eben auch eine unterschiedliche Bedeutung haben PushButton BTN_SEARCH diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index bdb4cc230537..ae6a44a12fd1 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ using namespace ::com::sun::star::uno; /************************************************************************* |* -|* TabPage zum Einstellen der Fang-Optionen +|* TabPage zum Einstellen der Fang-Optionen |* \************************************************************************/ @@ -157,7 +157,7 @@ SfxTabPage* SdTpOptionsSnap::Create( Window* pWindow, /************************************************************************* |* -|* TabPage zum Einstellen der Inhalte-Optionen +|* TabPage zum Einstellen der Inhalte-Optionen |* \************************************************************************/ @@ -185,10 +185,10 @@ BOOL SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs ) BOOL bModified = FALSE; if( aCbxRuler.GetSavedValue() != aCbxRuler.IsChecked() || - aCbxMoveOutline.GetSavedValue() != aCbxMoveOutline.IsChecked() || - aCbxDragStripes.GetSavedValue() != aCbxDragStripes.IsChecked() || - //aCbxHelplines.GetSavedValue() != aCbxHelplines.IsChecked() || - aCbxHandlesBezier.GetSavedValue() != aCbxHandlesBezier.IsChecked() ) + aCbxMoveOutline.GetSavedValue() != aCbxMoveOutline.IsChecked() || + aCbxDragStripes.GetSavedValue() != aCbxDragStripes.IsChecked() || + //aCbxHelplines.GetSavedValue() != aCbxHelplines.IsChecked() || + aCbxHandlesBezier.GetSavedValue() != aCbxHandlesBezier.IsChecked() ) { SdOptionsLayoutItem aOptsItem( ATTR_OPTIONS_LAYOUT ); @@ -237,7 +237,7 @@ SfxTabPage* SdTpOptionsContents::Create( Window* pWindow, /************************************************************************* |* -|* TabPage zum Einstellen der Sonstige-Optionen +|* TabPage zum Einstellen der Sonstige-Optionen |* \************************************************************************/ #define TABLE_COUNT 12 @@ -264,9 +264,9 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ) aTxtTabstop ( this, SdResId( FT_TABSTOP ) ), aMtrFldTabstop ( this, SdResId( MTR_FLD_TABSTOP ) ), - aCbxStartWithActualPage ( this, SdResId( CBX_START_WITH_ACTUAL_PAGE ) ), + aCbxStartWithActualPage ( this, SdResId( CBX_START_WITH_ACTUAL_PAGE ) ), aGrpStartWithActualPage ( this, SdResId( GRP_START_WITH_ACTUAL_PAGE ) ), - aTxtCompatibility ( this, SdResId( FT_COMPATIBILITY ) ), + aTxtCompatibility ( this, SdResId( FT_COMPATIBILITY ) ), aCbxUsePrinterMetrics ( this, SdResId( CB_USE_PRINTER_METRICS ) ), aCbxCompatibility ( this, SdResId( CB_MERGE_PARA_DIST ) ), aGrpScale ( this, SdResId( GRP_SCALE ) ), @@ -423,15 +423,15 @@ BOOL SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) { BOOL bModified = FALSE; - if( aCbxStartWithTemplate.GetSavedValue() != aCbxStartWithTemplate.IsChecked() || + if( aCbxStartWithTemplate.GetSavedValue() != aCbxStartWithTemplate.IsChecked() || aCbxMarkedHitMovesAlways.GetSavedValue()!= aCbxMarkedHitMovesAlways.IsChecked() || - aCbxCrookNoContortion.GetSavedValue() != aCbxCrookNoContortion.IsChecked() || - aCbxQuickEdit.GetSavedValue() != aCbxQuickEdit.IsChecked() || - aCbxPickThrough.GetSavedValue() != aCbxPickThrough.IsChecked() || - aCbxMasterPageCache.GetSavedValue() != aCbxMasterPageCache.IsChecked() || - aCbxCopy.GetSavedValue() != aCbxCopy.IsChecked() || + aCbxCrookNoContortion.GetSavedValue() != aCbxCrookNoContortion.IsChecked() || + aCbxQuickEdit.GetSavedValue() != aCbxQuickEdit.IsChecked() || + aCbxPickThrough.GetSavedValue() != aCbxPickThrough.IsChecked() || + aCbxMasterPageCache.GetSavedValue() != aCbxMasterPageCache.IsChecked() || + aCbxCopy.GetSavedValue() != aCbxCopy.IsChecked() || aCbxStartWithActualPage.GetSavedValue() != aCbxStartWithActualPage.IsChecked() || - aCbxCompatibility.GetSavedValue() != aCbxCompatibility.IsChecked() || + aCbxCompatibility.GetSavedValue() != aCbxCompatibility.IsChecked() || aCbxUsePrinterMetrics.GetSavedValue() != aCbxUsePrinterMetrics.IsChecked() ) { SdOptionsMiscItem aOptsItem( ATTR_OPTIONS_MISC ); @@ -446,7 +446,7 @@ BOOL SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) aOptsItem.GetOptionsMisc().SetStartWithActualPage( aCbxStartWithActualPage.IsChecked() ); aOptsItem.GetOptionsMisc().SetSummationOfParagraphs( aCbxCompatibility.IsChecked() ); aOptsItem.GetOptionsMisc().SetPrinterIndependentLayout ( - aCbxUsePrinterMetrics.IsChecked() + aCbxUsePrinterMetrics.IsChecked() ? ::com::sun::star::document::PrinterIndependentLayout::DISABLED : ::com::sun::star::document::PrinterIndependentLayout::ENABLED); rAttrs.Put( aOptsItem ); @@ -620,7 +620,7 @@ void SdTpOptionsMisc::SetImpressMode (void) - aCbxQuickEdit.GetPosPixel().Y(); // Put both "Text objects" check boxes side by side. - lcl_MoveWin (aCbxPickThrough, + lcl_MoveWin (aCbxPickThrough, nDialogWidth/2 - aCbxPickThrough.GetPosPixel().X(), -nLineHeight); @@ -828,7 +828,7 @@ void SdTpOptionsMisc::UpdateCompatibilityControls (void) break; } } - + } while (false); // One 'loop'. } @@ -837,7 +837,7 @@ void SdTpOptionsMisc::UpdateCompatibilityControls (void) // When there is an exception then simply use the default value of // bIsEnabled and disable the controls. } - + aTxtCompatibility.Enable (bIsEnabled); aCbxCompatibility.Enable(bIsEnabled); aCbxUsePrinterMetrics.Enable (bIsEnabled); diff --git a/sd/source/ui/dlg/tpoption.src b/sd/source/ui/dlg/tpoption.src index 96149d4e6a1f..b5f5ae0883a5 100644 --- a/sd/source/ui/dlg/tpoption.src +++ b/sd/source/ui/dlg/tpoption.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx index e04b4547fc66..227e2d2652b0 100644 --- a/sd/source/ui/dlg/unchss.cxx +++ b/sd/source/ui/dlg/unchss.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index 7cd0be451c4b..a78fafa21d78 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,29 +60,29 @@ // - SdVectorizeDlg - // ------------------ -SdVectorizeDlg::SdVectorizeDlg( +SdVectorizeDlg::SdVectorizeDlg( Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) : ModalDialog ( pParent, SdResId( DLG_VECTORIZE ) ), mpDocSh ( pDocShell ), aGrpSettings ( this, SdResId( GRP_SETTINGS ) ), - aFtLayers ( this, SdResId( FT_LAYERS ) ), - aNmLayers ( this, SdResId( NM_LAYERS ) ), - aFtReduce ( this, SdResId( FT_REDUCE ) ), - aMtReduce ( this, SdResId( MT_REDUCE ) ), - aFtFillHoles ( this, SdResId( FT_FILLHOLES ) ), - aMtFillHoles ( this, SdResId( MT_FILLHOLES ) ), - aCbFillHoles ( this, SdResId( CB_FILLHOLES ) ), - aFtOriginal ( this, SdResId( FT_ORIGINAL ) ), - aBmpWin ( this, SdResId( CTL_BMP ) ), - aFtVectorized ( this, SdResId( FT_VECTORIZED ) ), - aMtfWin ( this, SdResId( CTL_WMF ) ), - aGrpPrgs ( this, SdResId( GRP_PRGS ) ), - aPrgs ( this, SdResId( WND_PRGS ) ), + aFtLayers ( this, SdResId( FT_LAYERS ) ), + aNmLayers ( this, SdResId( NM_LAYERS ) ), + aFtReduce ( this, SdResId( FT_REDUCE ) ), + aMtReduce ( this, SdResId( MT_REDUCE ) ), + aFtFillHoles ( this, SdResId( FT_FILLHOLES ) ), + aMtFillHoles ( this, SdResId( MT_FILLHOLES ) ), + aCbFillHoles ( this, SdResId( CB_FILLHOLES ) ), + aFtOriginal ( this, SdResId( FT_ORIGINAL ) ), + aBmpWin ( this, SdResId( CTL_BMP ) ), + aFtVectorized ( this, SdResId( FT_VECTORIZED ) ), + aMtfWin ( this, SdResId( CTL_WMF ) ), + aGrpPrgs ( this, SdResId( GRP_PRGS ) ), + aPrgs ( this, SdResId( WND_PRGS ) ), aBtnOK ( this, SdResId( BTN_OK ) ), aBtnCancel ( this, SdResId( BTN_CANCEL ) ), aBtnHelp ( this, SdResId( BTN_HELP ) ), - aBtnPreview ( this, SdResId( BTN_PREVIEW ) ), - aBmp ( rBmp ) + aBtnPreview ( this, SdResId( BTN_PREVIEW ) ), + aBmp ( rBmp ) { FreeResource(); @@ -115,7 +115,7 @@ Rectangle SdVectorizeDlg::GetRect( const Size& rDispSize, const Size& rBmpSize ) if( rBmpSize.Width() && rBmpSize.Height() && rDispSize.Width() && rDispSize.Height() ) { - Size aBmpSize( rBmpSize ); + Size aBmpSize( rBmpSize ); const double fGrfWH = (double) aBmpSize.Width() / aBmpSize.Height(); const double fWinWH = (double) rDispSize.Width() / rDispSize.Height(); @@ -154,8 +154,8 @@ void SdVectorizeDlg::InitPreviewBmp() Bitmap SdVectorizeDlg::GetPreparedBitmap( Bitmap& rBmp, Fraction& rScale ) { - Bitmap aNew( rBmp ); - const Size aSizePix( aNew.GetSizePixel() ); + Bitmap aNew( rBmp ); + const Size aSizePix( aNew.GetSizePixel() ); if( aSizePix.Width() > VECTORIZE_MAX_EXTENT || aSizePix.Height() > VECTORIZE_MAX_EXTENT ) { @@ -178,8 +178,8 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ) mpDocSh->SetWaitCursor( TRUE ); aPrgs.SetValue( 0 ); - Fraction aScale; - Bitmap aTmp( GetPreparedBitmap( rBmp, aScale ) ); + Fraction aScale; + Bitmap aTmp( GetPreparedBitmap( rBmp, aScale ) ); if( !!aTmp ) { @@ -188,19 +188,19 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ) if( aCbFillHoles.IsChecked() ) { - GDIMetaFile aNewMtf; - BitmapReadAccess* pRAcc = aTmp.AcquireReadAccess(); + GDIMetaFile aNewMtf; + BitmapReadAccess* pRAcc = aTmp.AcquireReadAccess(); if( pRAcc ) { - const long nWidth = pRAcc->Width(); - const long nHeight = pRAcc->Height(); - const long nTileX = static_cast<long>(aMtFillHoles.GetValue()); - const long nTileY = static_cast<long>(aMtFillHoles.GetValue()); - const long nCountX = nWidth / nTileX; - const long nCountY = nHeight / nTileY; - const long nRestX = nWidth % nTileX; - const long nRestY = nHeight % nTileY; + const long nWidth = pRAcc->Width(); + const long nHeight = pRAcc->Height(); + const long nTileX = static_cast<long>(aMtFillHoles.GetValue()); + const long nTileY = static_cast<long>(aMtFillHoles.GetValue()); + const long nCountX = nWidth / nTileX; + const long nCountY = nHeight / nTileY; + const long nRestX = nWidth % nTileX; + const long nRestY = nHeight % nTileY; MapMode aMap( rMtf.GetPrefMapMode() ); aNewMtf.SetPrefSize( rMtf.GetPrefSize() ); @@ -251,10 +251,10 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ) void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, long nPosX, long nPosY, long nWidth, long nHeight ) { - ULONG nSumR = 0UL, nSumG = 0UL, nSumB = 0UL; - const long nRight = nPosX + nWidth - 1L; - const long nBottom = nPosY + nHeight - 1L; - const double fMult = 1.0 / ( nWidth * nHeight ); + ULONG nSumR = 0UL, nSumG = 0UL, nSumB = 0UL; + const long nRight = nPosX + nWidth - 1L; + const long nBottom = nPosY + nHeight - 1L; + const double fMult = 1.0 / ( nWidth * nHeight ); for( long nY = nPosY; nY <= nBottom; nY++ ) { @@ -272,8 +272,8 @@ void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, (BYTE) FRound( nSumG * fMult ), (BYTE) FRound( nSumB * fMult ) ); - Rectangle aRect( Point( nPosX, nPosY ), Size( nWidth + 1, nHeight + 1 ) ); - const Size& rMaxSize = rMtf.GetPrefSize(); + Rectangle aRect( Point( nPosX, nPosY ), Size( nWidth + 1, nHeight + 1 ) ); + const Size& rMaxSize = rMtf.GetPrefSize(); aRect = PixelToLogic( aRect, rMtf.GetPrefMapMode() ); @@ -352,14 +352,14 @@ IMPL_LINK( SdVectorizeDlg, ModifyHdl, void*, EMPTYARG ) void SdVectorizeDlg::LoadSettings() { - SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( + SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( SD_OPTION_VECTORIZE ) ), SD_OPTION_LOAD ) ); - UINT16 nLayers; - UINT16 nReduce; - UINT16 nFillHoles; - BOOL bFillHoles; + UINT16 nLayers; + UINT16 nReduce; + UINT16 nFillHoles; + BOOL bFillHoles; if( xIStm.Is() ) { diff --git a/sd/source/ui/dlg/vectdlg.src b/sd/source/ui/dlg/vectdlg.src index 53b77ad49eab..70b5701c13a0 100644 --- a/sd/source/ui/dlg/vectdlg.src +++ b/sd/source/ui/dlg/vectdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index 841018aa9444..7ff7ec4f7f5f 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -149,18 +149,18 @@ void DrawDocShell::Draw(OutputDevice* pOut, const JobSetup&, USHORT nAspect) // // if( pMtf ) // { -// String aURLStr; +// String aURLStr; // -// if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( String( RTL_CONSTASCII_USTRINGPARAM( "d:\\gdi.mtf" ) ), aURLStr ) ) -// { -// SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aURLStr, STREAM_WRITE | STREAM_TRUNC ); +// if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( String( RTL_CONSTASCII_USTRINGPARAM( "d:\\gdi.mtf" ) ), aURLStr ) ) +// { +// SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aURLStr, STREAM_WRITE | STREAM_TRUNC ); // -// if( pOStm ) -// { -// *pOStm << *pMtf; -// delete pOStm; -// } -// } +// if( pOStm ) +// { +// *pOStm << *pMtf; +// delete pOStm; +// } +// } // } } @@ -265,16 +265,16 @@ Size DrawDocShell::GetFirstPageSize() Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage, USHORT nMaxEdgePixel) { - MapMode aMapMode( MAP_100TH_MM ); - const Size aSize( pPage->GetSize() ); - const Point aNullPt; - VirtualDevice aVDev( *Application::GetDefaultDevice() ); + MapMode aMapMode( MAP_100TH_MM ); + const Size aSize( pPage->GetSize() ); + const Point aNullPt; + VirtualDevice aVDev( *Application::GetDefaultDevice() ); aVDev.SetMapMode( aMapMode ); - const Size aPixSize( aVDev.LogicToPixel( aSize ) ); - const ULONG nMaxEdgePix = Max( aPixSize.Width(), aPixSize.Height() ); - Fraction aFrac( nMaxEdgePixel, nMaxEdgePix ); + const Size aPixSize( aVDev.LogicToPixel( aSize ) ); + const ULONG nMaxEdgePix = Max( aPixSize.Width(), aPixSize.Height() ); + Fraction aFrac( nMaxEdgePixel, nMaxEdgePix ); aMapMode.SetScaleX( aFrac ); aMapMode.SetScaleY( aFrac ); @@ -287,8 +287,8 @@ Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage, USHORT nMaxEdgePixel) aMapMode.SetScaleY( aFrac ); aVDev.SetMapMode( aMapMode ); - ClientView* pView = new ClientView( this, &aVDev, NULL ); - FrameView* pFrameView = GetFrameView(); + ClientView* pView = new ClientView( this, &aVDev, NULL ); + FrameView* pFrameView = GetFrameView(); pView->ShowSdrPage( pPage ); if ( GetFrameView() ) @@ -331,7 +331,7 @@ Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage, USHORT nMaxEdgePixel) if ( pPageView->GetLockedLayers() != pFrameView->GetLockedLayers() ) pPageView->SetLockedLayers( pFrameView->GetLockedLayers() ); - // if ( pPageView->GetHelpLines() != pFrameView->GetHelpLines() ) + // if ( pPageView->GetHelpLines() != pFrameView->GetHelpLines() ) pPageView->SetHelpLines( pFrameView->GetStandardHelpLines() ); } diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index 6bcdbe76accf..f1509af1e681 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,9 +75,9 @@ using namespace ::com::sun::star::uno; namespace sd { -#define POOL_BUFFER_SIZE (USHORT)32768 -#define BASIC_BUFFER_SIZE (USHORT)8192 -#define DOCUMENT_BUFFER_SIZE (USHORT)32768 +#define POOL_BUFFER_SIZE (USHORT)32768 +#define BASIC_BUFFER_SIZE (USHORT)8192 +#define DOCUMENT_BUFFER_SIZE (USHORT)32768 /************************************************************************* |* @@ -194,7 +194,7 @@ void DrawDocShell::Execute( SfxRequest& rReq ) case SID_GET_COLORTABLE: { - // passende ColorTable ist per PutItem gesetzt worden + // passende ColorTable ist per PutItem gesetzt worden SvxColorTableItem* pColItem = (SvxColorTableItem*) GetItem( SID_COLOR_TABLE ); XColorTable* pTable = pColItem->GetColorTable(); rReq.SetReturnValue( OfaPtrItem( SID_GET_COLORTABLE, pTable ) ); diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index a033661e7c85..39ed73c5ab2d 100755 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -116,15 +116,15 @@ SfxPrinter* DrawDocShell::GetPrinter(BOOL bCreate) { // ItemSet mit speziellem Poolbereich anlegen SfxItemSet* pSet = new SfxItemSet( GetPool(), - SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, - SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC, - ATTR_OPTIONS_PRINT, ATTR_OPTIONS_PRINT, + SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, + SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC, + ATTR_OPTIONS_PRINT, ATTR_OPTIONS_PRINT, 0 ); // PrintOptionsSet setzen SdOptionsPrintItem aPrintItem( ATTR_OPTIONS_PRINT, SD_MOD()->GetSdOptions(mpDoc->GetDocumentType())); SfxFlagItem aFlagItem( SID_PRINTER_CHANGESTODOC ); - USHORT nFlags = 0; + USHORT nFlags = 0; nFlags = (aPrintItem.GetOptionsPrint().IsWarningSize() ? SFX_PRINTER_CHG_SIZE : 0) | (aPrintItem.GetOptionsPrint().IsWarningOrientation() ? SFX_PRINTER_CHG_ORIENTATION : 0); @@ -227,7 +227,7 @@ void DrawDocShell::OnDocumentPrinterChanged(Printer* pNewPrinter) return; } - // if (mpPrinter->IsA(SfxPrinter)) + // if (mpPrinter->IsA(SfxPrinter)) { // Da kein RTTI verfuegbar, wird hart gecasted (...) SetPrinter((SfxPrinter*) pNewPrinter); @@ -316,8 +316,8 @@ BOOL DrawDocShell::Load( SfxMedium& rMedium ) { mbNewDocument = sal_False; - BOOL bRet = FALSE; - bool bStartPresentation = false; + BOOL bRet = FALSE; + bool bStartPresentation = false; ErrCode nError = ERRCODE_NONE; SfxItemSet* pSet = rMedium.GetItemSet(); @@ -462,9 +462,9 @@ BOOL DrawDocShell::ConvertFrom( SfxMedium& rMedium ) { mbNewDocument = sal_False; - const String aFilterName( rMedium.GetFilter()->GetFilterName() ); - BOOL bRet = FALSE; - bool bStartPresentation = false; + const String aFilterName( rMedium.GetFilter()->GetFilterName() ); + BOOL bRet = FALSE; + bool bStartPresentation = false; SetWaitCursor( TRUE ); @@ -584,7 +584,7 @@ BOOL DrawDocShell::SaveAs( SfxMedium& rMedium ) if( GetCreateMode() == SFX_CREATE_MODE_STANDARD ) SfxObjectShell::SetVisArea( Rectangle() ); - UINT32 nVBWarning = ERRCODE_NONE; + UINT32 nVBWarning = ERRCODE_NONE; BOOL bRet = SfxObjectShell::SaveAs( rMedium ); if( bRet ) @@ -612,9 +612,9 @@ BOOL DrawDocShell::ConvertTo( SfxMedium& rMedium ) if( mpDoc->GetPageCount() ) { - const SfxFilter* pMediumFilter = rMedium.GetFilter(); - const String aTypeName( pMediumFilter->GetTypeName() ); - SdFilter* pFilter = NULL; + const SfxFilter* pMediumFilter = rMedium.GetFilter(); + const String aTypeName( pMediumFilter->GetTypeName() ); + SdFilter* pFilter = NULL; if( aTypeName.SearchAscii( "graphic_HTML" ) != STRING_NOTFOUND ) { @@ -648,7 +648,7 @@ BOOL DrawDocShell::ConvertTo( SfxMedium& rMedium ) if( pFilter ) { - const ULONG nOldSwapMode = mpDoc->GetSwapGraphicsMode(); + const ULONG nOldSwapMode = mpDoc->GetSwapGraphicsMode(); mpDoc->SetSwapGraphicsMode( SDR_SWAPGRAPHICSMODE_TEMP ); @@ -666,7 +666,7 @@ BOOL DrawDocShell::ConvertTo( SfxMedium& rMedium ) /************************************************************************* |* |* SaveCompleted: die eigenen Streams wieder oeffnen, damit kein anderer -|* sie "besetzt" +|* sie "besetzt" |* \************************************************************************/ @@ -992,7 +992,7 @@ void DrawDocShell::FillClass(SvGlobalName* pClassName, { *pClassName = SvGlobalName(SO3_SDRAW_CLASSID_60); *pFormat = bTemplate ? SOT_FORMATSTR_ID_STARDRAW_8_TEMPLATE : SOT_FORMATSTR_ID_STARDRAW_8; - *pFullTypeName = String(RTL_CONSTASCII_USTRINGPARAM("Draw 8")); // HACK: method will be removed with new storage API + *pFullTypeName = String(RTL_CONSTASCII_USTRINGPARAM("Draw 8")); // HACK: method will be removed with new storage API } else { diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 78b1b9434ad0..135b453dc4cc 100755 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,8 +106,8 @@ SFX_IMPL_INTERFACE(DrawDocShell, SfxObjectShell, SdResId(0)) namespace sd { -#define POOL_BUFFER_SIZE (USHORT)32768 -#define BASIC_BUFFER_SIZE (USHORT)8192 +#define POOL_BUFFER_SIZE (USHORT)32768 +#define BASIC_BUFFER_SIZE (USHORT)8192 #define DOCUMENT_BUFFER_SIZE (USHORT)32768 @@ -255,8 +255,8 @@ DrawDocShell::~DrawDocShell() delete mpDoc; // damit der Navigator das Verschwinden des Dokuments mitbekommt - SfxBoolItem aItem(SID_NAVIGATOR_INIT, TRUE); - SfxViewFrame* pFrame = mpViewShell ? mpViewShell->GetFrame() : GetFrame(); + SfxBoolItem aItem(SID_NAVIGATOR_INIT, TRUE); + SfxViewFrame* pFrame = mpViewShell ? mpViewShell->GetFrame() : GetFrame(); if( !pFrame ) pFrame = SfxViewFrame::GetFirst( this ); @@ -308,11 +308,11 @@ void DrawDocShell::GetState(SfxItemSet &rSet) case SID_SEARCH_OPTIONS: { - UINT16 nOpt = SEARCH_OPTIONS_SEARCH | + UINT16 nOpt = SEARCH_OPTIONS_SEARCH | SEARCH_OPTIONS_WHOLE_WORDS | - SEARCH_OPTIONS_BACKWARDS | - SEARCH_OPTIONS_REG_EXP | - SEARCH_OPTIONS_EXACT | + SEARCH_OPTIONS_BACKWARDS | + SEARCH_OPTIONS_REG_EXP | + SEARCH_OPTIONS_EXACT | SEARCH_OPTIONS_SIMILARITY | SEARCH_OPTIONS_SELECTION; @@ -599,7 +599,7 @@ void DrawDocShell::ClearUndoBuffer() } pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, this, false); } - + SfxUndoManager* pUndoManager = GetUndoManager(); if(pUndoManager && pUndoManager->GetUndoActionCount()) pUndoManager->Clear(); diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx index d5e7315144c0..5974c6c8fddc 100644 --- a/sd/source/ui/docshell/grdocsh.cxx +++ b/sd/source/ui/docshell/grdocsh.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx index bb1cd14f87f5..9f859c3934b0 100644 --- a/sd/source/ui/docshell/sdclient.cxx +++ b/sd/source/ui/docshell/sdclient.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -196,8 +196,8 @@ void Client::ViewChanged() static_cast< long >( GetScaleHeight() * Fraction( aVisArea.GetHeight() ) ) ); // react to the change if the difference is bigger than one pixel - Size aPixelDiff = - Application::GetDefaultDevice()->LogicToPixel( + Size aPixelDiff = + Application::GetDefaultDevice()->LogicToPixel( Size( aLogicRect.GetWidth() - aScaledSize.Width(), aLogicRect.GetHeight() - aScaledSize.Height() ), aMap100 ); diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx index c46a89df8ee8..e0a6c3735c8b 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx index bad80ff50d69..87d20588ca02 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx index 5e70c313f251..d10324f4be47 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -115,7 +115,7 @@ void ChangeRequestQueueProcessor::AddRequest ( OSL_TRACE("Adding request\n"); TraceRequest(rxRequest); #endif - + maQueue.push_back(rxRequest); StartProcessing(); } diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx index 3d144bb08cda..74e902543294 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -112,7 +112,7 @@ private: is destroyed. */ sal_uIntPtr mnUserEventId; - + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XConfiguration> mxConfiguration; diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index 2637a9ac1413..2b4a6697f064 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ namespace { for STL containers. */ class XResourceIdLess - : public ::std::binary_function <Reference<XResourceId>, Reference<XResourceId>, bool> + : public ::std::binary_function <Reference<XResourceId>, Reference<XResourceId>, bool> { public: bool operator () (const Reference<XResourceId>& rId1, const Reference<XResourceId>& rId2) const @@ -119,7 +119,7 @@ Configuration::Configuration ( } - + Configuration::Configuration ( const Reference<XConfigurationControllerBroadcaster>& rxBroadcaster, bool bBroadcastRequestEvents, @@ -137,7 +137,7 @@ Configuration::Configuration ( Configuration::~Configuration (void) { } - + @@ -152,7 +152,7 @@ void SAL_CALL Configuration::disposing (void) //----- XConfiguration -------------------------------------------------------- - + void SAL_CALL Configuration::addResource (const Reference<XResourceId>& rxResourceId) throw (RuntimeException) { @@ -210,7 +210,7 @@ Sequence<Reference<XResourceId> > SAL_CALL Configuration::getResources ( ThrowIfDisposed(); bool bFilterResources (rsResourceURLPrefix.getLength() > 0); - + // Collect the matching resources in a vector. ::std::vector<Reference<XResourceId> > aResources; ResourceContainer::const_iterator iResource; @@ -221,7 +221,7 @@ Sequence<Reference<XResourceId> > SAL_CALL Configuration::getResources ( if ( ! (*iResource)->isBoundTo(rxAnchorId,eMode)) continue; - + if (bFilterResources) { // Apply the given resource prefix as filter. @@ -247,7 +247,7 @@ Sequence<Reference<XResourceId> > SAL_CALL Configuration::getResources ( Sequence<Reference<XResourceId> > aResult (aResources.size()); for (sal_uInt32 nIndex=0; nIndex<aResources.size(); ++nIndex) aResult[nIndex] = aResources[nIndex]; - + return aResult; } @@ -308,7 +308,7 @@ OUString SAL_CALL Configuration::getName (void) aString += FrameworkHelper::ResourceIdToString(*iResource); } aString += OUString::createFromAscii("]"); - + return aString; } @@ -332,7 +332,7 @@ void Configuration::PostEvent ( const bool bActivation) { OSL_ASSERT(rxResourceId.is()); - + if (mxBroadcaster.is()) { ConfigurationChangeEvent aEvent; @@ -348,7 +348,7 @@ void Configuration::PostEvent ( else aEvent.Type = FrameworkHelper::msResourceDeactivationEvent; aEvent.Configuration = this; - + mxBroadcaster->notifyEvent(aEvent); } } diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx index 55e22361ad3a..c08e6ff59db5 100755 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -118,7 +118,7 @@ void ConfigurationClassifier::PartitionResources ( OSL_TRACE("copying resource ids to C2-C1\r"); #endif CopyResources(aC2minusC1, mxConfiguration2, maC2minusC1); - + // Process the unique resources that belong to both configurations. ResourceIdVector::const_iterator iResource; for (iResource=aC1andC2.begin(); iResource!=aC1andC2.end(); ++iResource) @@ -154,7 +154,7 @@ void ConfigurationClassifier::ClassifyResources ( for (sal_Int32 j=0; j<nL2 && !bFound; ++j) if (aA1[i]->getResourceURL().equals(aA2[j]->getResourceURL())) bFound = true; - + if (bFound) rS1andS2.push_back(aA1[i]); else @@ -170,7 +170,7 @@ void ConfigurationClassifier::ClassifyResources ( for (sal_Int32 i=0; i<nL1 && !bFound; ++i) if (aA2[j]->getResourceURL().equals(aA1[i]->getResourceURL())) bFound = true; - + if ( ! bFound) rS2minusS1.push_back(aA2[j]); } @@ -195,7 +195,7 @@ void ConfigurationClassifier::CopyResources ( OUString(), AnchorBindingMode_INDIRECT)); const sal_Int32 nL (aBoundResources.getLength()); - + rTarget.reserve(rTarget.size() + 1 + nL); rTarget.push_back(*iResource); @@ -204,7 +204,7 @@ void ConfigurationClassifier::CopyResources ( OUStringToOString(FrameworkHelper::ResourceIdToString(*iResource), RTL_TEXTENCODING_UTF8).getStr()); #endif - + const Reference<XResourceId>* aA = aBoundResources.getConstArray(); for (sal_Int32 i=0; i<nL; ++i) { diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx index b19f8c1459a5..4fb9394bcd8d 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index 2f846e50be25..4329c575e8b3 100755 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -116,7 +116,7 @@ public: ::com::sun::star::drawing::framework::XConfiguration> mxRequestedConfiguration; ViewShellBase* mpBase; - + ::boost::shared_ptr<ResourceFactoryManager> mpResourceFactoryContainer; ::boost::shared_ptr<ConfigurationControllerResourceManager> mpResourceManager; @@ -142,14 +142,14 @@ ConfigurationController::Lock::Lock (const Reference<XConfigurationController>& : mxController(rxController) { OSL_ASSERT(mxController.is()); - + if (mxController.is()) mxController->lock(); } - - - + + + ConfigurationController::Lock::~Lock (void) { if (mxController.is()) @@ -286,7 +286,7 @@ void SAL_CALL ConfigurationController::notifyEvent ( //----- XConfigurationController ---------------------------------------------- - + void SAL_CALL ConfigurationController::lock (void) throw (RuntimeException) { @@ -296,7 +296,7 @@ void SAL_CALL ConfigurationController::lock (void) ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); - + ++mpImplementation->mnLockCount; if (mpImplementation->mpConfigurationUpdaterLock.get()==NULL) mpImplementation->mpConfigurationUpdaterLock @@ -379,7 +379,7 @@ void SAL_CALL ConfigurationController::requestResourceActivation ( requestResourceDeactivation(aResourceList[nIndex]); } } - + Reference<XConfigurationChangeRequest> xRequest( new GenericConfigurationChangeRequest( rxResourceId, @@ -476,7 +476,7 @@ sal_Bool SAL_CALL ConfigurationController::hasPendingRequests (void) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); - + return ! mpImplementation->mpQueueProcessor->IsEmpty(); } @@ -595,7 +595,7 @@ void SAL_CALL ConfigurationController::restoreConfiguration ( //----- XResourceFactoryManager ----------------------------------------------- - + void SAL_CALL ConfigurationController::addResourceFactory( const OUString& sResourceURL, const Reference<XResourceFactory>& rxResourceFactory) @@ -608,7 +608,7 @@ void SAL_CALL ConfigurationController::addResourceFactory( - + void SAL_CALL ConfigurationController::removeResourceFactoryForURL( const OUString& sResourceURL) throw (RuntimeException) diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx index ff167f07520a..416760c1027d 100755 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ void ConfigurationControllerBroadcaster::AddListener( OUString::createFromAscii("invalid listener"), mxConfigurationController, 0); - + if (maListenerMap.find(rsEventType) == maListenerMap.end()) maListenerMap[rsEventType] = ListenerList(); ListenerDescriptor aDescriptor; @@ -80,7 +80,7 @@ void ConfigurationControllerBroadcaster::RemoveListener( OUString::createFromAscii("invalid listener"), mxConfigurationController, 0); - + ListenerMap::iterator iMap; ListenerList::iterator iList; for (iMap=maListenerMap.begin(); iMap!=maListenerMap.end(); ++iMap) @@ -143,7 +143,7 @@ void ConfigurationControllerBroadcaster::NotifyListeners (const ConfigurationCha ListenerList aList (iMap->second.begin(), iMap->second.end()); NotifyListeners(aList,rEvent); } - + // Notify the universal listeners. iMap = maListenerMap.find(OUString()); if (iMap != maListenerMap.end()) diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx index a5939386d7b7..d29b06125bde 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx index 93ff7ee54e00..8f7d055e8544 100755 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -113,7 +113,7 @@ void ConfigurationControllerResourceManager::DeactivateResources ( rResources.rend(), ::boost::bind(&ConfigurationControllerResourceManager::DeactivateResource, this, _1, rxConfiguration)); -} +} @@ -152,7 +152,7 @@ void ConfigurationControllerResourceManager::ActivateResource ( #endif return; } - + try { // 2. Create the resource. @@ -171,7 +171,7 @@ void ConfigurationControllerResourceManager::ActivateResource ( { DBG_UNHANDLED_EXCEPTION(); } - + if (xResource.is()) { #if defined VERBOSE && VERBOSE>=1 @@ -224,10 +224,10 @@ void ConfigurationControllerResourceManager::DeactivateResource ( { // 1. Remove resource from URL->Object map. ResourceDescriptor aDescriptor (RemoveResource(rxResourceId)); - + if (aDescriptor.mxResource.is() && aDescriptor.mxResourceFactory.is()) { - // 2. Notifiy listeners that the resource is being deactivated. + // 2. Notifiy listeners that the resource is being deactivated. mpBroadcaster->NotifyListeners( FrameworkHelper::msResourceDeactivationEvent, rxResourceId, @@ -289,7 +289,7 @@ void ConfigurationControllerResourceManager::AddResource ( aDescriptor.mxResource = rxResource; aDescriptor.mxResourceFactory = rxFactory; maResourceMap[rxResource->getResourceId()] = aDescriptor; - + #if defined VERBOSE && VERBOSE>=2 OSL_TRACE("ConfigurationControllerResourceManager::AddResource(): added %s -> %x\n", OUStringToOString( diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx index 0c095df50fdf..9743e1a7546d 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ public: const ::std::vector< css::uno::Reference<css::drawing::framework::XResourceId> >& rResources, const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration); - + /** Deactivate all the resources that are specified by resource ids in rResources. The resource ids of deactivated resources are removed from the given configuration. Activated resources are notified to all @@ -126,15 +126,15 @@ private: void ActivateResource ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration); - + void DeactivateResource ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration); - + void AddResource ( const css::uno::Reference<css::drawing::framework::XResource>& rxResource, const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxFactory); - + ResourceDescriptor RemoveResource ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId); }; diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx index b9552940060e..1d19026be57e 100755 --- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx index b04206fd65e1..4fd464bc8553 100755 --- a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx index 4ab361a9490d..28a502488547 100755 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -137,7 +137,7 @@ void ConfigurationUpdater::RequestUpdate ( do { UpdateConfiguration(); - + if (mbUpdatePending && IsUpdatePossible()) continue; } @@ -215,7 +215,7 @@ void ConfigurationUpdater::UpdateConfiguration (void) catch(RuntimeException) { } - + // Notify the end of the update. aEvent.Type = FrameworkHelper::msConfigurationUpdateEndEvent; mpBroadcaster->NotifyListeners(aEvent); @@ -239,7 +239,7 @@ void ConfigurationUpdater::UpdateConfiguration (void) { DBG_UNHANDLED_EXCEPTION(); } - + #if defined VERBOSE && VERBOSE>0 OSL_TRACE("ConfigurationUpdater::UpdateConfiguration)"); OSL_TRACE("UpdateConfiguration end"); @@ -397,7 +397,7 @@ void ConfigurationUpdater::CheckPureAnchors ( OUStringToOString( FrameworkHelper::ResourceIdToString(xResourceId), RTL_TEXTENCODING_UTF8).getStr()); -#endif +#endif // Erase element from current configuration. for (sal_Int32 nI=nIndex; nI<nCount-2; ++nI) aResources[nI] = aResources[nI+1]; diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx index a9f3e09f2a64..2548b0232681 100755 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,7 +71,7 @@ public: void SetControllerManager( const css::uno::Reference< css::drawing::framework::XControllerManager>& rxControllerManager); - + /** Request an update of the current configuration so that it looks like the given requested configuration. It checks whether an update of the current configuration can be done. Calls UpdateConfiguration() @@ -90,7 +90,7 @@ public: made. */ ::boost::shared_ptr<ConfigurationUpdaterLock> GetLock (void); - + private: /** A reference to the XControllerManager is kept so that UpdateConfiguration() has access to the other sub controllers. @@ -122,13 +122,13 @@ private: resets the flag to </FALSE>. */ bool mbUpdatePending; - + /** This flag is set to </TRUE> while the UpdateConfiguration() method is running. It is used to prevent reentrance problems with this method. */ bool mbUpdateBeingProcessed; - + /** The ConfigurationController is locked when this count has a value larger then zero. If the controller is locked then updates of the current configuration are not made. diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx index 18c80b8b1243..eeba7cc75605 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ GenericConfigurationChangeRequest::~GenericConfigurationChangeRequest (void) thr - + void SAL_CALL GenericConfigurationChangeRequest::execute ( const Reference<XConfiguration>& rxConfiguration) throw (RuntimeException) @@ -71,7 +71,7 @@ void SAL_CALL GenericConfigurationChangeRequest::execute ( case Activation: rxConfiguration->addResource(mxResourceId); break; - + case Deactivation: rxConfiguration->removeResource(mxResourceId); break; diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx index ce708e1fa71a..03a7e52d947c 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,7 +66,7 @@ public: resource is requested. */ enum Mode { Activation, Deactivation }; - + /** Create a new object that represents the request for activation or deactivation of the specified resource. @param rxsResourceId @@ -80,12 +80,12 @@ public: rxResourceId, const Mode eMode) throw (::com::sun::star::lang::IllegalArgumentException); - + virtual ~GenericConfigurationChangeRequest (void) throw(); - + // XConfigurationChangeOperation - + /** The requested configuration change is executed on the given configuration. Additionally to the explicitly requested change other changes have to be made as well. See class description for an diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx index 1df3c77d78ba..942eca26b27d 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -193,7 +193,7 @@ Reference<XResourceFactory> ResourceFactoryManager::GetFactory ( // requested view type. Note that this can (and should) cause // intermediate calls to AddFactory(). xModuleController->requestResource(sURLBase); - + xFactory = FindFactory(sURLBase); } } diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx index dc7d2574dbfc..d8ad8c9aa639 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,7 +102,7 @@ private: typedef ::std::vector< ::std::pair< - rtl::OUString, + rtl::OUString, css::uno::Reference<css::drawing::framework::XResourceFactory> > > FactoryPatternList; FactoryPatternList maFactoryPatternList; diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index 15d7c3a6f4ec..ab46f7da51e5 100755 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -294,7 +294,7 @@ sal_Int16 SAL_CALL throw (RuntimeException) { sal_Int16 nResult (0); - + if ( ! rxResourceId.is()) { // The empty reference is interpreted as empty resource id object. @@ -381,7 +381,7 @@ sal_Int16 ResourceId::CompareToExternalImplementation (const Reference<XResource const Sequence<OUString> aAnchorURLs (rxId->getAnchorURLs()); const sal_uInt32 nLocalURLCount (maResourceURLs.size()); const sal_uInt32 nURLCount(1+aAnchorURLs.getLength()); - + // Start comparison with the top most anchors. sal_Int32 nLocalResult (0); for (sal_Int32 nIndex=nURLCount-1,nLocalIndex=nLocalURLCount-1; @@ -449,7 +449,7 @@ sal_Bool SAL_CALL return IsBoundToAnchor(&sResourceURL, &aAnchorURLs, eMode); } } - + @@ -609,7 +609,7 @@ void ResourceId::ParseResourceURL (void) SdGlobalResourceContainer::Instance().AddResource( Reference<XInterface>(xURLTransformer,UNO_QUERY)); } - + if (xURLTransformer.is() && maResourceURLs.size() > 0) { mpURL.reset(new util::URL); diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx index 1c39006b29c7..3f092d327c34 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.cxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ UpdateRequest::~UpdateRequest (void) throw() - + void SAL_CALL UpdateRequest::execute (const Reference<XConfiguration>& rxConfiguration) throw (RuntimeException) { diff --git a/sd/source/ui/framework/configuration/UpdateRequest.hxx b/sd/source/ui/framework/configuration/UpdateRequest.hxx index e3fc159d4b11..87031583125c 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.hxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,9 +64,9 @@ public: UpdateRequest (void) throw(); virtual ~UpdateRequest (void) throw(); - + // XConfigurationChangeOperation - + virtual void SAL_CALL execute ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XConfiguration>& rxConfiguration) diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index f406501bd114..e05e66c4c47c 100755 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -146,7 +146,7 @@ BasicPaneFactory::BasicPaneFactory ( BasicPaneFactory::~BasicPaneFactory (void) { } - + @@ -440,7 +440,7 @@ void SAL_CALL BasicPaneFactory::notifyConfigurationChange ( - + //===== lang::XEventListener ================================================== void SAL_CALL BasicPaneFactory::disposing ( @@ -477,7 +477,7 @@ Reference<XResource> BasicPaneFactory::CreateFrameWindowPane ( const Reference<XResourceId>& rxPaneId) { Reference<XResource> xPane; - + if (mpViewShellBase != NULL) { xPane = new FrameWindowPane(rxPaneId, mpViewShellBase->GetViewWindow()); @@ -522,12 +522,12 @@ Reference<XResource> BasicPaneFactory::CreateChildWindowPane ( pShell.reset(new LeftImpressPaneShell()); nChildWindowId = ::sd::LeftPaneImpressChildWindow::GetChildWindowId(); break; - + case LeftDrawPaneId: pShell.reset(new LeftDrawPaneShell()); nChildWindowId = ::sd::LeftPaneDrawChildWindow::GetChildWindowId(); break; - + case RightPaneId: pShell.reset(new ToolPanelPaneShell()); nChildWindowId = ::sd::ToolPanelChildWindow::GetChildWindowId(); diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx index 9b41866180fc..9ce59689fb11 100755 --- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,25 +77,25 @@ namespace sd { namespace framework { */ class BasicPaneFactory : private ::cppu::BaseMutex, - public BasicPaneFactoryInterfaceBase + public BasicPaneFactoryInterfaceBase { public: BasicPaneFactory ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); virtual ~BasicPaneFactory (void); - + virtual void SAL_CALL disposing (void); - + // XInitialization - + virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments) throw (css::uno::Exception, css::uno::RuntimeException); // XResourceFactory - + virtual css::uno::Reference<css::drawing::framework::XResource> SAL_CALL createResource ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId) @@ -115,7 +115,7 @@ public: // lang::XEventListener - + virtual void SAL_CALL disposing ( const css::lang::EventObject& rEventObject) throw (css::uno::RuntimeException); diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx index d353cfc58c1f..3301f4b2b5ad 100755 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -189,7 +189,7 @@ void SAL_CALL BasicToolBarFactory::disposing ( //===== XPaneFactory ========================================================== - + Reference<XResource> SAL_CALL BasicToolBarFactory::createResource ( const Reference<XResourceId>& rxToolBarId) throw (RuntimeException, IllegalArgumentException, WrappedTargetException) @@ -197,7 +197,7 @@ Reference<XResource> SAL_CALL BasicToolBarFactory::createResource ( ThrowIfDisposed(); Reference<XResource> xToolBar; - + if (rxToolBarId->getResourceURL().equals(FrameworkHelper::msViewTabBarURL)) { xToolBar = new ViewTabBar(rxToolBarId, mxController); @@ -205,7 +205,7 @@ Reference<XResource> SAL_CALL BasicToolBarFactory::createResource ( else throw lang::IllegalArgumentException(); - + return xToolBar; } diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx index 686de897c179..8b98a3d15a0f 100755 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,18 +64,18 @@ namespace sd { namespace framework { */ class BasicToolBarFactory : protected ::cppu::BaseMutex, - public BasicToolBarFactoryInterfaceBase + public BasicToolBarFactoryInterfaceBase { public: BasicToolBarFactory ( const css::uno::Reference<com::sun::star::uno::XComponentContext>& rxContext); virtual ~BasicToolBarFactory (void); - + virtual void SAL_CALL disposing (void); - + // ToolBarFactory - + virtual css::uno::Reference<com::sun::star::drawing::framework::XResource> SAL_CALL createResource ( const css::uno::Reference< @@ -90,14 +90,14 @@ public: // XInitialization - + virtual void SAL_CALL initialize( const css::uno::Sequence<com::sun::star::uno::Any>& aArguments) throw (css::uno::Exception, css::uno::RuntimeException); - + // lang::XEventListener - + virtual void SAL_CALL disposing ( const css::lang::EventObject& rEventObject) throw (css::uno::RuntimeException); diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 1320df5c827b..d73efd9979bf 100755 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -153,7 +153,7 @@ BasicViewFactory::BasicViewFactory ( BasicViewFactory::~BasicViewFactory (void) { } - + @@ -172,7 +172,7 @@ void SAL_CALL BasicViewFactory::disposing (void) { ReleaseView(*iView, true); } - + // Release the view shell container. At this point no one other than us // should hold references to the view shells (at the moment this is a // trivial requirement, because no one other then us holds a shared @@ -215,10 +215,10 @@ Reference<XResource> SAL_CALL BasicViewFactory::createResource ( pWindow = VCLUnoHelper::GetWindow(xPane->getWindow()); // Get the view frame. - SfxViewFrame* pFrame = NULL; + SfxViewFrame* pFrame = NULL; if (mpBase != NULL) pFrame = mpBase->GetViewFrame(); - + if (pFrame != NULL && mpBase!=NULL && pWindow!=NULL) { // Try to get the view from the cache. @@ -229,7 +229,7 @@ Reference<XResource> SAL_CALL BasicViewFactory::createResource ( { pDescriptor = CreateView(rxViewId, *pFrame, *pWindow, xPane, pFrameView); } - + if (pDescriptor.get() != NULL) xView = pDescriptor->mxView; @@ -240,7 +240,7 @@ Reference<XResource> SAL_CALL BasicViewFactory::createResource ( else pWindow->Resize(); } - + return xView; } @@ -354,14 +354,14 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments) FrameView* pFrameView) { ::boost::shared_ptr<ViewDescriptor> pDescriptor (new ViewDescriptor()); - + pDescriptor->mpViewShell = CreateViewShell( rxViewId, rFrame, rWindow, pFrameView); pDescriptor->mxViewId = rxViewId; - + if (pDescriptor->mpViewShell.get() != NULL) { const bool bIsCenterPane ( @@ -476,7 +476,7 @@ void BasicViewFactory::ReleaseView ( bool bDoNotCache) { bool bIsCacheable (!bDoNotCache && IsCacheable(rpDescriptor)); - + if (bIsCacheable) { Reference<XRelocatableResource> xResource (rpDescriptor->mxView, UNO_QUERY); @@ -496,14 +496,14 @@ void BasicViewFactory::ReleaseView ( bIsCacheable = false; } } - + if ( ! bIsCacheable) { // Shut down the current view shell. rpDescriptor->mpViewShell->Shutdown (); mpBase->GetDocShell()->Disconnect(rpDescriptor->mpViewShell.get()); mpBase->GetViewShellManager()->DeactivateViewShell(rpDescriptor->mpViewShell.get()); - + Reference<XComponent> xComponent (rpDescriptor->mxView, UNO_QUERY); if (xComponent.is()) xComponent->dispose(); @@ -581,7 +581,7 @@ bool BasicViewFactory::IsCacheable (const ::boost::shared_ptr<ViewDescriptor>& r if (xResource->relocateToAnchor(xNewAnchor)) bRelocationSuccessfull = true; } - + if ( ! bRelocationSuccessfull) { ReleaseView(pDescriptor, true); diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx index e5bb43551a24..34d2e258768b 100755 --- a/sd/source/ui/framework/factories/BasicViewFactory.hxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,16 +81,16 @@ namespace sd { namespace framework { */ class BasicViewFactory : private sd::MutexOwner, - public BasicViewFactoryInterfaceBase + public BasicViewFactoryInterfaceBase { public: BasicViewFactory ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); virtual ~BasicViewFactory (void); - + virtual void SAL_CALL disposing (void); - + // XViewFactory virtual css::uno::Reference<css::drawing::framework::XResource> @@ -102,9 +102,9 @@ public: const css::uno::Reference<css::drawing::framework::XResource>& xView) throw(css::uno::RuntimeException); - + // XInitialization - + virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments) throw (css::uno::Exception, css::uno::RuntimeException); @@ -129,7 +129,7 @@ private: ::Window& rWindow, const css::uno::Reference<css::drawing::framework::XPane>& rxPane, FrameView* pFrameView); - + ::boost::shared_ptr<ViewShell> CreateViewShell ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, SfxViewFrame& rFrame, diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx index 5e4e6df987f0..a9717ff21dee 100755 --- a/sd/source/ui/framework/factories/ChildWindowPane.cxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -146,7 +146,7 @@ void SAL_CALL ChildWindowPane::disposing (void) if (mxWindow.is()) // Window already exists => nothing to do. break; - + // When the window is not yet present then obtain it only when the // shell has already been activated. The activation is not // necessary for the code to work properly but is used to optimize @@ -156,7 +156,7 @@ void SAL_CALL ChildWindowPane::disposing (void) // Impress takes longer. if ( ! mbHasBeenActivated && mpShell.get()!=NULL && ! mpShell->IsActive()) break; - + mbHasBeenActivated = true; SfxViewFrame* pViewFrame = mrViewShellBase.GetViewFrame(); if (pViewFrame == NULL) @@ -193,7 +193,7 @@ void SAL_CALL ChildWindowPane::disposing (void) // At last, we have access to the window and its UNO wrapper. mpWindow = &pDockingWindow->GetContentWindow(); mxWindow = VCLUnoHelper::GetInterface(mpWindow); - + // Register as window listener to be informed when the child window // is hidden. if (mxWindow.is()) @@ -218,11 +218,11 @@ Reference<awt::XWindow> SAL_CALL ChildWindowPane::getWindow (void) IMPLEMENT_FORWARD_XINTERFACE2( - ChildWindowPane, + ChildWindowPane, ChildWindowPaneInterfaceBase, Pane); IMPLEMENT_FORWARD_XTYPEPROVIDER2( - ChildWindowPane, + ChildWindowPane, ChildWindowPaneInterfaceBase, Pane); @@ -235,7 +235,7 @@ void SAL_CALL ChildWindowPane::disposing (const lang::EventObject& rEvent) throw (RuntimeException) { ThrowIfDisposed(); - + if (rEvent.Source == mxWindow) { // The window is gone but the pane remains alive. The next call to diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx index 4d2f154a327f..7bf636c3f765 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.hxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -118,7 +118,7 @@ private: USHORT mnChildWindowId; ViewShellBase& mrViewShellBase; ::std::auto_ptr<SfxShell> mpShell; - + /** This flag is set when the pane shell has been activated at least once. It is used to optimize the start-up performance (by not showing the window too early) and by not delaying its creation at diff --git a/sd/source/ui/framework/factories/FrameWindowPane.cxx b/sd/source/ui/framework/factories/FrameWindowPane.cxx index 8cdbffe05816..31707e9fb867 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.cxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/factories/FrameWindowPane.hxx b/sd/source/ui/framework/factories/FrameWindowPane.hxx index 9fbc153f59ce..017fc7414062 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.hxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 74088422b4ab..c5f3d59807bd 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ FullScreenPane::FullScreenPane ( sal_Int32 nScreenNumber = 1; ExtractArguments(rxPaneId, nScreenNumber); - + if (mpWorkWindow.get() == NULL) return; @@ -134,8 +134,8 @@ void SAL_CALL FullScreenPane::disposing (void) mpWorkWindow->RemoveEventListener(aWindowEventHandler); mpWorkWindow.reset(); } - - + + FrameWindowPane::disposing(); } @@ -191,7 +191,7 @@ void SAL_CALL FullScreenPane::setAccessible ( throw (RuntimeException) { ThrowIfDisposed(); - + if (mpWindow != NULL) { Reference<lang::XInitialization> xInitializable (rxAccessible, UNO_QUERY); @@ -242,14 +242,14 @@ Reference<rendering::XCanvas> FullScreenPane::CreateCanvas (void) if (pWindow != NULL) { Sequence<Any> aArg (5); - + // common: first any is VCL pointer to window (for VCL canvas) aArg[0] = makeAny(reinterpret_cast<sal_Int64>(pWindow)); aArg[1] = Any(); aArg[2] = makeAny(::com::sun::star::awt::Rectangle()); aArg[3] = makeAny(sal_False); aArg[4] = makeAny(mxWindow); - + Reference<lang::XMultiServiceFactory> xFactory ( mxComponentContext->getServiceManager(), UNO_QUERY_THROW); return Reference<rendering::XCanvas>( diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index c69a09e10b54..7e71abb8470c 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ public: const cssu::Reference<css::accessibility::XAccessible>& rxAccessible) throw (cssu::RuntimeException); - + //------------------------------------------------------------------------- DECL_LINK(WindowEventHandler, VclWindowEvent*); diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index 94081f24b733..08306aa22cbc 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,7 +86,7 @@ void Pane::disposing (void) //----- XPane ----------------------------------------------------------------- - + Reference<awt::XWindow> SAL_CALL Pane::getWindow (void) throw (RuntimeException) { @@ -106,7 +106,7 @@ Reference<rendering::XCanvas> SAL_CALL Pane::getCanvas (void) if ( ! mxCanvas.is()) mxCanvas = CreateCanvas(); - + return mxCanvas; } @@ -215,7 +215,7 @@ const Sequence<sal_Int8>& Pane::getUnoTunnelId (void) sal_Int64 SAL_CALL Pane::getSomething (const Sequence<sal_Int8>& rId) throw (RuntimeException) -{ +{ sal_Int64 nResult = 0; if (rId.getLength() == 16 @@ -236,7 +236,7 @@ Reference<rendering::XCanvas> Pane::CreateCanvas (void) throw (RuntimeException) { Reference<rendering::XCanvas> xCanvas; - + if (mpWindow != NULL) { ::cppcanvas::SpriteCanvasSharedPtr pCanvas ( @@ -244,7 +244,7 @@ Reference<rendering::XCanvas> Pane::CreateCanvas (void) if (pCanvas.get() != NULL) xCanvas = Reference<rendering::XCanvas>(pCanvas->getUNOSpriteCanvas(), UNO_QUERY); } - + return xCanvas; } diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index 6f22f1484627..623eddf134a8 100755 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,9 +61,9 @@ public: virtual ~PresentationFactoryProvider (void); virtual void SAL_CALL disposing (void); - + // XInitialization - + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence<com::sun::star::uno::Any>& aArguments) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -95,7 +95,7 @@ public: virtual sal_Bool SAL_CALL isAnchorOnly (void) throw (RuntimeException) { return false; } - + private: Reference<XResourceId> mxResourceId; }; @@ -167,7 +167,7 @@ PresentationFactory::PresentationFactory ( PresentationFactory::~PresentationFactory (void) { } - + @@ -231,7 +231,7 @@ void SAL_CALL PresentationFactory::notifyConfigurationChange ( - + //===== lang::XEventListener ================================================== void SAL_CALL PresentationFactory::disposing ( @@ -290,7 +290,7 @@ void PresentationFactoryProvider::disposing (void) // XInitialization - + void SAL_CALL PresentationFactoryProvider::initialize( const Sequence<Any>& aArguments) throw (Exception, RuntimeException) diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx index d7c45ceb803b..b518b51aea4d 100755 --- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,13 +82,13 @@ typedef ::cppu::WeakComponentImplHelper1 < class TaskPanelResource : private ::cppu::BaseMutex, - public TaskPanelResourceInterfaceBase + public TaskPanelResourceInterfaceBase { public: TaskPanelResource ( const Reference<XResourceId>& rxResourceId ); virtual ~TaskPanelResource (); - + virtual void SAL_CALL disposing (); // XResource @@ -134,9 +134,9 @@ void SAL_CALL TaskPanelFactory::disposing (void) - + //===== XInitialization ======================================================= - + void SAL_CALL TaskPanelFactory::initialize( const ::com::sun::star::uno::Sequence<com::sun::star::uno::Any>& aArguments) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) @@ -205,7 +205,7 @@ Reference<XResource> SAL_CALL TaskPanelFactory::createResource ( throw (RuntimeException, IllegalArgumentException, WrappedTargetException) { Reference<XResource> xResource; - + if ( ! rxResourceId.is()) return NULL; @@ -214,7 +214,7 @@ Reference<XResource> SAL_CALL TaskPanelFactory::createResource ( if ( sResourceURL.match( FrameworkHelper::msTaskPanelURLPrefix ) ) { toolpanel::PanelId ePanelId( toolpanel::GetStandardPanelId( sResourceURL ) ); - + if ( ( ePanelId != toolpanel::PID_UNKNOWN ) && ( mpViewShellBase != NULL ) ) { ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( *mpViewShellBase ) ); diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.hxx b/sd/source/ui/framework/factories/TaskPanelFactory.hxx index 086788a6763e..347e89c4d953 100755 --- a/sd/source/ui/framework/factories/TaskPanelFactory.hxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,18 +57,18 @@ namespace sd { namespace framework { */ class TaskPanelFactory : private ::cppu::BaseMutex, - public TaskPanelFactoryInterfaceBase + public TaskPanelFactoryInterfaceBase { public: TaskPanelFactory ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); virtual ~TaskPanelFactory (void); - + virtual void SAL_CALL disposing (void); - + // XInitialization - + virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments) throw (css::uno::Exception, css::uno::RuntimeException); diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index a1c0bd525c9e..faac4af35412 100755 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,7 +83,7 @@ ViewShellWrapper::ViewShellWrapper ( ViewShellWrapper::~ViewShellWrapper (void) { } - + @@ -149,7 +149,7 @@ sal_Bool SAL_CALL ViewShellWrapper::relocateToAnchor ( if (xWindow.is()) xWindow->removeWindowListener(this); mxWindow = NULL; - + if (mpViewShell.get() != NULL) { ::Window* pWindow = VCLUnoHelper::GetWindow(xPane->getWindow()); @@ -197,7 +197,7 @@ const Sequence<sal_Int8>& ViewShellWrapper::getUnoTunnelId (void) sal_Int64 SAL_CALL ViewShellWrapper::getSomething (const Sequence<sal_Int8>& rId) throw (RuntimeException) -{ +{ sal_Int64 nResult = 0; if (rId.getLength() == 16 @@ -231,7 +231,7 @@ void SAL_CALL ViewShellWrapper::windowMoved (const awt::WindowEvent& rEvent) { (void)rEvent; } - + @@ -243,7 +243,7 @@ void SAL_CALL ViewShellWrapper::windowShown (const lang::EventObject& rEvent) if (pViewShell != NULL) pViewShell->Resize(); } - + diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx index 32e055144fc3..1b3f24187b23 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ CenterViewFocusModule::CenterViewFocusModule (Reference<frame::XController>& rxC if (xControllerManager.is()) { mxConfigurationController = xControllerManager->getConfigurationController(); - + // Tunnel through the controller to obtain a ViewShellBase. Reference<lang::XUnoTunnel> xTunnel (rxController, UNO_QUERY); if (xTunnel.is()) @@ -84,7 +84,7 @@ CenterViewFocusModule::CenterViewFocusModule (Reference<frame::XController>& rxC mbValid = true; } } - + if (mbValid) { mxConfigurationController->addConfigurationChangeListener( @@ -104,7 +104,7 @@ CenterViewFocusModule::CenterViewFocusModule (Reference<frame::XController>& rxC CenterViewFocusModule::~CenterViewFocusModule (void) { } - + diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.hxx b/sd/source/ui/framework/module/CenterViewFocusModule.hxx index e104b8971fb3..c099d9ea795b 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.hxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,16 +63,16 @@ namespace sd { namespace framework { */ class CenterViewFocusModule : private sd::MutexOwner, - public CenterViewFocusModuleInterfaceBase + public CenterViewFocusModuleInterfaceBase { public: CenterViewFocusModule ( ::com::sun::star::uno::Reference<com::sun::star::frame::XController>& rxController); virtual ~CenterViewFocusModule (void); - + virtual void SAL_CALL disposing (void); - + // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( diff --git a/sd/source/ui/framework/module/DrawModule.cxx b/sd/source/ui/framework/module/DrawModule.cxx index 1f1604a3099c..9f3e695e89fc 100644 --- a/sd/source/ui/framework/module/DrawModule.cxx +++ b/sd/source/ui/framework/module/DrawModule.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/module/ImpressModule.cxx b/sd/source/ui/framework/module/ImpressModule.cxx index a5856bc3ebc9..a635e3fa2069 100755 --- a/sd/source/ui/framework/module/ImpressModule.cxx +++ b/sd/source/ui/framework/module/ImpressModule.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index e910a8df7496..ef4b8b529299 100755 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -243,7 +243,7 @@ void ModuleController::InstantiateStartupServices (void) void ModuleController::ProcessStartupService (const ::std::vector<Any>& rValues) { OSL_ASSERT(rValues.size() == snStartupPropertyCount); - + try { // Get the service name of the startup service. @@ -319,7 +319,7 @@ void SAL_CALL ModuleController::requestResource (const OUString& rsResourceURL) //----- XInitialization ------------------------------------------------------- - + void SAL_CALL ModuleController::initialize (const Sequence<Any>& aArguments) throw (Exception, RuntimeException) { diff --git a/sd/source/ui/framework/module/PresentationModule.cxx b/sd/source/ui/framework/module/PresentationModule.cxx index 6a5ba5dc5e7f..2fc1a783355e 100755 --- a/sd/source/ui/framework/module/PresentationModule.cxx +++ b/sd/source/ui/framework/module/PresentationModule.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx b/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx index 090247e7f68c..1bc567ac8a93 100755 --- a/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx +++ b/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -160,13 +160,13 @@ bool ReadOnlyModeObserver::ConnectToDispatch (void) } } } - + return mxDispatch.is(); } - + void ReadOnlyModeObserver::statusChanged (const frame::FeatureStateEvent& rEvent) throw (RuntimeException) { @@ -191,7 +191,7 @@ void SAL_CALL ReadOnlyModeObserver::disposing ( mxConfigurationController = NULL; else if (rEvent.Source == mxDispatch) mxDispatch = NULL; - + dispose(); } diff --git a/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx b/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx index d783d6d83abf..d4b0314aa265 100755 --- a/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx +++ b/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ public: ReadOnlyModeObserver ( const ::com::sun::star::uno::Reference<com::sun::star::frame::XController>& rxController); virtual ~ReadOnlyModeObserver (void); - + virtual void SAL_CALL disposing (void); @@ -97,7 +97,7 @@ public: const com::sun::star::lang::EventObject& rEvent) throw (com::sun::star::uno::RuntimeException); - + // frame::XStatusListener /** Called by slot state change broadcasters. @@ -107,9 +107,9 @@ public: statusChanged ( const ::com::sun::star::frame::FeatureStateEvent& rState) throw (::com::sun::star::uno::RuntimeException); - + // XConfigurationChangeListener - + virtual void SAL_CALL notifyConfigurationChange ( const ::com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx index fcd90ca6454b..8050fc058055 100755 --- a/sd/source/ui/framework/module/ResourceManager.cxx +++ b/sd/source/ui/framework/module/ResourceManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx index d00ee78c2de3..dd7cd9e0c73c 100755 --- a/sd/source/ui/framework/module/ResourceManager.hxx +++ b/sd/source/ui/framework/module/ResourceManager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ namespace sd { namespace framework { */ class ResourceManager : private sd::MutexOwner, - public ResourceManagerInterfaceBase + public ResourceManagerInterfaceBase { public: ResourceManager ( @@ -70,14 +70,14 @@ public: activate the resource managed by the called object. */ void AddActiveMainView (const ::rtl::OUString& rsMainViewURL); - + virtual void SAL_CALL disposing (void); /** Allow the ResourceManager to make resource activation or deactivation requests. */ void Enable (void); - + /** Disable the resource management. When called, the ResourceManager requests the resource to be deactivated. Until enabled again it does not make any further requests for resource activation or @@ -86,7 +86,7 @@ public: Call this for example to hide resources in read-only mode. */ void Disable (void); - + // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx index 79396a57f36a..47acc5b88f5d 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.cxx +++ b/sd/source/ui/framework/module/ShellStackGuard.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ ShellStackGuard::ShellStackGuard (Reference<frame::XController>& rxController) if (xControllerManager.is()) { mxConfigurationController = xControllerManager->getConfigurationController(); - + // Tunnel through the controller to obtain a ViewShellBase. Reference<lang::XUnoTunnel> xTunnel (rxController, UNO_QUERY); if (xTunnel.is()) @@ -94,7 +94,7 @@ ShellStackGuard::ShellStackGuard (Reference<frame::XController>& rxController) ShellStackGuard::~ShellStackGuard (void) { } - + diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx index 694e7fe5719f..a60c1caa2df4 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.hxx +++ b/sd/source/ui/framework/module/ShellStackGuard.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,15 +75,15 @@ namespace sd { namespace framework { */ class ShellStackGuard : private ::cppu::BaseMutex, - public ShellStackGuardInterfaceBase + public ShellStackGuardInterfaceBase { public: ShellStackGuard (css::uno::Reference<css::frame::XController>& rxController); virtual ~ShellStackGuard (void); - + virtual void SAL_CALL disposing (void); - + // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx index 2a1aaa4ca771..3a836e5fb3d0 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.cxx +++ b/sd/source/ui/framework/module/SlideSorterModule.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,7 +66,7 @@ SlideSorterModule::SlideSorterModule ( AddActiveMainView(FrameworkHelper::msImpressViewURL); AddActiveMainView(FrameworkHelper::msOutlineViewURL); AddActiveMainView(FrameworkHelper::msNotesViewURL); - + AddActiveMainView(FrameworkHelper::msDrawViewURL); mxConfigurationController->addConfigurationChangeListener( @@ -82,7 +82,7 @@ SlideSorterModule::SlideSorterModule ( SlideSorterModule::~SlideSorterModule (void) { } - + diff --git a/sd/source/ui/framework/module/SlideSorterModule.hxx b/sd/source/ui/framework/module/SlideSorterModule.hxx index c685c16d830b..d36510e60db2 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.hxx +++ b/sd/source/ui/framework/module/SlideSorterModule.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,8 +48,8 @@ public: const css::uno::Reference<css::frame::XController>& rxController, const ::rtl::OUString& rsLeftPaneURL); virtual ~SlideSorterModule (void); - - + + // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx b/sd/source/ui/framework/module/ToolBarModule.cxx index b987009537b8..6b154d7ae893 100644 --- a/sd/source/ui/framework/module/ToolBarModule.cxx +++ b/sd/source/ui/framework/module/ToolBarModule.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,7 +102,7 @@ ToolBarModule::ToolBarModule ( ToolBarModule::~ToolBarModule (void) { } - + diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx index 1e26cef6d435..47228ee97548 100644 --- a/sd/source/ui/framework/module/ToolBarModule.hxx +++ b/sd/source/ui/framework/module/ToolBarModule.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ namespace { */ class ToolBarModule : private ::cppu::BaseMutex, - public ToolBarModuleInterfaceBase + public ToolBarModuleInterfaceBase { public: /** Create a new module. @@ -70,10 +70,10 @@ public: ToolBarModule ( const css::uno::Reference<css::frame::XController>& rxController); virtual ~ToolBarModule (void); - + virtual void SAL_CALL disposing (void); - + // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( diff --git a/sd/source/ui/framework/module/ToolPanelModule.cxx b/sd/source/ui/framework/module/ToolPanelModule.cxx index 888fa68ad708..ed9447efab48 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.cxx +++ b/sd/source/ui/framework/module/ToolPanelModule.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ using ::sd::framework::FrameworkHelper; namespace sd { namespace framework { namespace { - + typedef ::cppu::WeakComponentImplHelper1 < ::com::sun::star::frame::XStatusListener > LocalReadOnlyModeObserverInterfaceBase; @@ -102,7 +102,7 @@ public: xComponent->removeEventListener(this); } - + virtual void SAL_CALL disposing (const com::sun::star::lang::EventObject& rEvent) throw(RuntimeException) { @@ -117,14 +117,14 @@ public: } dispose(); } - + virtual void SAL_CALL statusChanged (const com::sun::star::frame::FeatureStateEvent& rEvent) throw(RuntimeException) { bool bReadWrite (true); if (rEvent.IsEnabled) rEvent.State >>= bReadWrite; - + if (bReadWrite) mpResourceManager->Enable(); else diff --git a/sd/source/ui/framework/module/ToolPanelModule.hxx b/sd/source/ui/framework/module/ToolPanelModule.hxx index 7d728e60e93d..34b0ecf42d46 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.hxx +++ b/sd/source/ui/framework/module/ToolPanelModule.hxx @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx index 6a4db6246c1a..7bc49d6baff5 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.cxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ ViewTabBarModule::ViewTabBarModule ( mxViewTabBarId(rxViewTabBarId) { Reference<XControllerManager> xControllerManager (rxController, UNO_QUERY); - + if (xControllerManager.is()) { mxConfigurationController = xControllerManager->getConfigurationController(); @@ -95,7 +95,7 @@ ViewTabBarModule::ViewTabBarModule ( ViewTabBarModule::~ViewTabBarModule (void) { } - + @@ -172,7 +172,7 @@ void ViewTabBarModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar) if ( ! xBar.is()) xBar = Reference<XTabBar>( mxConfigurationController->getResource(mxViewTabBarId), UNO_QUERY); - + if (xBar.is()) { TabBarButton aEmptyButton; @@ -202,7 +202,7 @@ void ViewTabBarModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar) aNotesViewButton.ButtonLabel = String(SdResId(STR_NOTES_MODE)); if ( ! xBar->hasTabBarButton(aNotesViewButton)) xBar->addTabBarButtonAfter(aNotesViewButton, aOutlineViewButton); - + TabBarButton aHandoutViewButton; aHandoutViewButton.ResourceId = FrameworkHelper::CreateResourceId( FrameworkHelper::msHandoutViewURL, diff --git a/sd/source/ui/framework/module/ViewTabBarModule.hxx b/sd/source/ui/framework/module/ViewTabBarModule.hxx index f775bfb87c38..559724232d48 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.hxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ namespace sd { namespace framework { */ class ViewTabBarModule : private sd::MutexOwner, - public ViewTabBarModuleInterfaceBase + public ViewTabBarModuleInterfaceBase { public: /** Create a new module that controlls the view tab bar above the view @@ -73,10 +73,10 @@ public: const css::uno::Reference< css::drawing::framework::XResourceId>& rxViewTabBarId); virtual ~ViewTabBarModule (void); - + virtual void SAL_CALL disposing (void); - + // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 078f86a88d86..6b59149370d8 100755 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -152,7 +152,7 @@ public: /** This method is called when the ViewShellBase is being destroyed. */ virtual void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint); - + private: ::sd::ViewShellBase& mrBase; bool mbListeningToViewShellBase; @@ -330,7 +330,7 @@ public: ~DisposeListener (void); virtual void SAL_CALL disposing (void); - + virtual void SAL_CALL disposing (const lang::EventObject& rEventObject) throw(RuntimeException); @@ -375,7 +375,7 @@ FrameworkHelper::InstanceMap FrameworkHelper::maInstanceMap; ::boost::shared_ptr<FrameworkHelper> FrameworkHelper::Instance (ViewShellBase& rBase) { - + ::boost::shared_ptr<FrameworkHelper> pHelper; InstanceMap::const_iterator iHelper (maInstanceMap.find(&rBase)); @@ -397,7 +397,7 @@ FrameworkHelper::InstanceMap FrameworkHelper::maInstanceMap; OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); pHelper = iHelper->second; } - + return pHelper; } @@ -500,7 +500,7 @@ bool FrameworkHelper::IsValid (void) Reference<XView> FrameworkHelper::GetView (const Reference<XResourceId>& rxPaneOrViewId) { Reference<XView> xView; - + if ( ! rxPaneOrViewId.is() || ! mxConfigurationController.is()) return NULL; @@ -639,7 +639,7 @@ ViewShell::ShellType FrameworkHelper::GetViewId (const rtl::OUString& rsViewURL) void FrameworkHelper::HandleModeChangeSlot ( - ULONG nSlotId, + ULONG nSlotId, SfxRequest& rRequest) { BOOL bIsActive = TRUE; @@ -658,9 +658,9 @@ void FrameworkHelper::HandleModeChangeSlot ( const SfxItemSet* pRequestArguments = rRequest.GetArgs(); if (pRequestArguments) { - SFX_REQUEST_ARG (rRequest, - pIsActive, - SfxBoolItem, + SFX_REQUEST_ARG (rRequest, + pIsActive, + SfxBoolItem, (USHORT)nSlotId, FALSE); bIsActive = pIsActive->GetValue (); @@ -674,19 +674,19 @@ void FrameworkHelper::HandleModeChangeSlot ( if ( ! mxConfigurationController.is()) throw RuntimeException(); - + Reference<XResourceId> xPaneId ( CreateResourceId(framework::FrameworkHelper::msCenterPaneURL)); Reference<XView> xView (GetView(xPaneId)); ::boost::shared_ptr<ViewShell> pCenterViewShell (GetViewShell(xView)); - + ::rtl::OUString sRequestedView; if (bIsActive) { switch (nSlotId) { case SID_NORMAL_MULTI_PANE_GUI: - case SID_DRAWINGMODE: + case SID_DRAWINGMODE: sRequestedView = FrameworkHelper::msImpressViewURL; break; @@ -708,7 +708,7 @@ void FrameworkHelper::HandleModeChangeSlot ( break; } } - + if (xView.is() && xView->getResourceId()->getResourceURL().equals(sRequestedView)) { @@ -1138,7 +1138,7 @@ LifetimeController::LifetimeController (::sd::ViewShellBase& rBase) StartListening(mrBase); acquire(); mbListeningToViewShellBase = true; - + Reference<XComponent> xComponent (rBase.GetController(), UNO_QUERY); if (xComponent.is()) { diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx index 1a6e8992a10e..6c095aada271 100644 --- a/sd/source/ui/func/bulmaper.cxx +++ b/sd/source/ui/func/bulmaper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -177,7 +177,7 @@ void SdBulletMapper::MapFontsInNumRule( SvxNumRule& aNumRule, const SfxItemSet& aMyFont.SetShadow(rSItem.GetValue()); aNewLevel.SetBulletFont(&aMyFont); -// aNewLevel.SetBulletRelSize( 75 ); +// aNewLevel.SetBulletRelSize( 75 ); aNumRule.SetLevel(nLevel, aNewLevel ); } else if( rSrcLevel.GetNumberingType() == com::sun::star::style::NumberingType::CHAR_SPECIAL ) diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx index 31c4c1358d3a..79784705d72b 100644 --- a/sd/source/ui/func/fuarea.cxx +++ b/sd/source/ui/func/fuarea.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ void FuArea::DoExecute( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); AbstractSvxAreaTabDialog * pDlg = pFact ? pFact->CreateSvxAreaTabDialog( NULL, - &aNewAttr, + &aNewAttr, mpDoc, mpView) : 0; if( pDlg && (pDlg->Execute() == RET_OK) ) diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index 92b1450624e1..9b9ed46f3545 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,13 +57,13 @@ namespace sd { -const sal_Unicode CHAR_HARDBLANK = ((sal_Unicode)0x00A0); -const sal_Unicode CHAR_HARDHYPHEN = ((sal_Unicode)0x2011); -const sal_Unicode CHAR_SOFTHYPHEN = ((sal_Unicode)0x00AD); -const sal_Unicode CHAR_RLM = ((sal_Unicode)0x200F); -const sal_Unicode CHAR_LRM = ((sal_Unicode)0x200E); -const sal_Unicode CHAR_ZWSP = ((sal_Unicode)0x200B); -const sal_Unicode CHAR_ZWNBSP = ((sal_Unicode)0x2060); +const sal_Unicode CHAR_HARDBLANK = ((sal_Unicode)0x00A0); +const sal_Unicode CHAR_HARDHYPHEN = ((sal_Unicode)0x2011); +const sal_Unicode CHAR_SOFTHYPHEN = ((sal_Unicode)0x00AD); +const sal_Unicode CHAR_RLM = ((sal_Unicode)0x200F); +const sal_Unicode CHAR_LRM = ((sal_Unicode)0x200E); +const sal_Unicode CHAR_ZWSP = ((sal_Unicode)0x200B); +const sal_Unicode CHAR_ZWNBSP = ((sal_Unicode)0x2060); TYPEINIT1( FuBullet, FuPoor ); @@ -100,8 +100,8 @@ void FuBullet::DoExecute( SfxRequest& rReq ) switch( rReq.GetSlot() ) { case FN_INSERT_SOFT_HYPHEN: cMark = CHAR_SOFTHYPHEN ; break; - case FN_INSERT_HARDHYPHEN: cMark = CHAR_HARDHYPHEN ; break; - case FN_INSERT_HARD_SPACE: cMark = CHAR_HARDBLANK ; break; + case FN_INSERT_HARDHYPHEN: cMark = CHAR_HARDHYPHEN ; break; + case FN_INSERT_HARD_SPACE: cMark = CHAR_HARDBLANK ; break; case SID_INSERT_RLM : cMark = CHAR_RLM ; break; case SID_INSERT_LRM : cMark = CHAR_LRM ; break; case SID_INSERT_ZWSP : cMark = CHAR_ZWSP ; break; @@ -119,7 +119,7 @@ void FuBullet::DoExecute( SfxRequest& rReq ) void FuBullet::InsertFormattingMark( sal_Unicode cMark ) { OutlinerView* pOV = NULL; - ::Outliner* pOL = NULL; + ::Outliner* pOL = NULL; // depending on ViewShell set Outliner and OutlinerView if (mpViewShell->ISA(DrawViewShell)) @@ -241,7 +241,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) if( aChars.Len() ) { OutlinerView* pOV = NULL; - ::Outliner* pOL = NULL; + ::Outliner* pOL = NULL; // je nach ViewShell Outliner und OutlinerView bestimmen if(mpViewShell && mpViewShell->ISA(DrawViewShell)) @@ -283,7 +283,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) // attributieren (Font setzen) SfxItemSet aSet(pOL->GetEmptyItemSet()); - SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetName(), + SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetName(), aFont.GetStyleName(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO); diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx index f43b33c8318a..ab93a9a4efa1 100644 --- a/sd/source/ui/func/fuchar.cxx +++ b/sd/source/ui/func/fuchar.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx index ef0827cc6efc..17f040d4711d 100644 --- a/sd/source/ui/func/fucon3d.cxx +++ b/sd/source/ui/func/fucon3d.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,11 +71,11 @@ TYPEINIT1( FuConstruct3dObject, FuConstruct ); \************************************************************************/ FuConstruct3dObject::FuConstruct3dObject ( - ViewShell* pViewSh, - ::sd::Window* pWin, - ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq) + ViewShell* pViewSh, + ::sd::Window* pWin, + ::sd::View* pView, + SdDrawDocument* pDoc, + SfxRequest& rReq) : FuConstruct(pViewSh, pWin, pView, pDoc, rReq) { } @@ -288,7 +288,7 @@ void FuConstruct3dObject::ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj, E3dS case SID_3D_SPHERE: { -// pScene->RotateX(DEG2RAD(60)); +// pScene->RotateX(DEG2RAD(60)); } break; @@ -303,13 +303,13 @@ void FuConstruct3dObject::ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj, E3dS case SID_3D_CONE: case SID_3D_PYRAMID: { -// pScene->RotateX(DEG2RAD(25)); +// pScene->RotateX(DEG2RAD(25)); } break; case SID_3D_TORUS: { -// pScene->RotateX(DEG2RAD(15)); +// pScene->RotateX(DEG2RAD(15)); aTransformation.rotate(DEG2RAD(90), 0.0, 0.0); } break; @@ -454,7 +454,7 @@ SdrObject* FuConstruct3dObject::CreateDefaultObject(const sal_uInt16 nID, const E3dCompoundObject* p3DObj = ImpCreateBasic3DShape(); - // E3dView::SetCurrent3DObj part + // E3dView::SetCurrent3DObj part // get transformed BoundVolume of the object basegfx::B3DRange aObjVol(p3DObj->GetBoundVolume()); aObjVol.transform(p3DObj->GetTransform()); @@ -477,18 +477,18 @@ SdrObject* FuConstruct3dObject::CreateDefaultObject(const sal_uInt16 nID, const aCam.SetFocalLength(mpView->GetDefaultCamFocal()); aCam.SetDefaults(::basegfx::B3DPoint(0.0, 0.0, fDefaultCamPosZ), aLookAt, mpView->GetDefaultCamFocal()); pScene->SetCamera(aCam); - + pScene->Insert3DObj(p3DObj); pScene->NbcSetSnapRect(a3DRect); pScene->SetModel(mpDoc); - + ImpPrepareBasic3DShape(p3DObj, pScene); - + SfxItemSet aAttr(mpDoc->GetPool()); SetStyleSheet(aAttr, p3DObj); aAttr.Put(XLineStyleItem (XLINE_NONE)); p3DObj->SetMergedItemSet(aAttr); - + // make object interactive at once pScene->SetRectsDirty(); diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx index 7a7ab2b9dc2e..820f8a3d3cd0 100644 --- a/sd/source/ui/func/fuconarc.cxx +++ b/sd/source/ui/func/fuconarc.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,11 +65,11 @@ TYPEINIT1( FuConstructArc, FuConstruct ); \************************************************************************/ FuConstructArc::FuConstructArc ( - ViewShell* pViewSh, - ::sd::Window* pWin, - ::sd::View* pView, + ViewShell* pViewSh, + ::sd::Window* pWin, + ::sd::View* pView, SdDrawDocument* pDoc, - SfxRequest& rReq ) + SfxRequest& rReq ) : FuConstruct( pViewSh, pWin, pView, pDoc, rReq ) { } @@ -102,7 +102,7 @@ void FuConstructArc::DoExecute( SfxRequest& rReq ) SFX_REQUEST_ARG (rReq, pPhiStart, SfxUInt32Item, ID_VAL_ANGLESTART, FALSE); SFX_REQUEST_ARG (rReq, pPhiEnd, SfxUInt32Item, ID_VAL_ANGLEEND, FALSE); - Rectangle aNewRectangle (pCenterX->GetValue () - pAxisX->GetValue () / 2, + Rectangle aNewRectangle (pCenterX->GetValue () - pAxisX->GetValue () / 2, pCenterY->GetValue () - pAxisY->GetValue () / 2, pCenterX->GetValue () + pAxisX->GetValue () / 2, pCenterY->GetValue () + pAxisY->GetValue () / 2); @@ -143,7 +143,7 @@ BOOL FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt ) SfxItemSet aAttr(mpDoc->GetPool()); SetStyleSheet(aAttr, pObj); -//-/ pObj->NbcSetAttributes(aAttr, FALSE); +//-/ pObj->NbcSetAttributes(aAttr, FALSE); pObj->SetMergedItemSet(aAttr); } @@ -226,25 +226,25 @@ void FuConstructArc::Activate() switch( nSlotId ) { - case SID_DRAW_ARC : + case SID_DRAW_ARC : case SID_DRAW_CIRCLEARC: { aObjKind = OBJ_CARC; } break; - case SID_DRAW_PIE : - case SID_DRAW_PIE_NOFILL : - case SID_DRAW_CIRCLEPIE : + case SID_DRAW_PIE : + case SID_DRAW_PIE_NOFILL : + case SID_DRAW_CIRCLEPIE : case SID_DRAW_CIRCLEPIE_NOFILL: { aObjKind = OBJ_SECT; } break; - case SID_DRAW_ELLIPSECUT : + case SID_DRAW_ELLIPSECUT : case SID_DRAW_ELLIPSECUT_NOFILL: - case SID_DRAW_CIRCLECUT : + case SID_DRAW_CIRCLECUT : case SID_DRAW_CIRCLECUT_NOFILL : { aObjKind = OBJ_CCUT; @@ -261,7 +261,7 @@ void FuConstructArc::Activate() mpView->SetCurrentObj((UINT16)aObjKind); FuConstruct::Activate(); -// FuDraw::Activate(); +// FuDraw::Activate(); } /************************************************************************* @@ -273,7 +273,7 @@ void FuConstructArc::Activate() void FuConstructArc::Deactivate() { FuConstruct::Deactivate(); -// FuDraw::Deactivate(); +// FuDraw::Deactivate(); } // #97016# diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index e95a2377e4ee..c465276fbec8 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,9 +71,9 @@ TYPEINIT1( FuConstructBezierPolygon, FuConstruct ); \************************************************************************/ FuConstructBezierPolygon::FuConstructBezierPolygon ( - ViewShell* pViewSh, + ViewShell* pViewSh, ::sd::Window* pWin, - ::sd::View* pView, + ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq) : FuConstruct(pViewSh, pWin, pView, pDoc, rReq), @@ -247,7 +247,7 @@ BOOL FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) mpView->DeleteMarked(); bDeleted = true; } - + if ((!bPermanent && bCreated) || bDeleted) { mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); @@ -443,7 +443,7 @@ SdrObject* FuConstructBezierPolygon::CreateDefaultObject(const sal_uInt16 nID, c basegfx::B2DPolygon aInnerPoly; aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left(), rRectangle.Bottom())); - + aInnerPoly.appendBezierSegment( basegfx::B2DPoint(rRectangle.Left(), rRectangle.Top()), basegfx::B2DPoint(rRectangle.Center().X(), rRectangle.Top()), @@ -462,7 +462,7 @@ SdrObject* FuConstructBezierPolygon::CreateDefaultObject(const sal_uInt16 nID, c { aInnerPoly.setClosed(true); } - + aPoly.append(aInnerPoly); break; } @@ -470,14 +470,14 @@ SdrObject* FuConstructBezierPolygon::CreateDefaultObject(const sal_uInt16 nID, c case SID_DRAW_XPOLYGON_NOFILL: { basegfx::B2DPolygon aInnerPoly; - + aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left(), rRectangle.Bottom())); aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left(), rRectangle.Top())); aInnerPoly.append(basegfx::B2DPoint(rRectangle.Center().X(), rRectangle.Top())); aInnerPoly.append(basegfx::B2DPoint(rRectangle.Center().X(), rRectangle.Center().Y())); aInnerPoly.append(basegfx::B2DPoint(rRectangle.Right(), rRectangle.Center().Y())); aInnerPoly.append(basegfx::B2DPoint(rRectangle.Right(), rRectangle.Bottom())); - + if(SID_DRAW_XPOLYGON_NOFILL == nID) { aInnerPoly.append(basegfx::B2DPoint(rRectangle.Center().X(), rRectangle.Bottom())); @@ -496,7 +496,7 @@ SdrObject* FuConstructBezierPolygon::CreateDefaultObject(const sal_uInt16 nID, c basegfx::B2DPolygon aInnerPoly; const sal_Int32 nWdt(rRectangle.GetWidth()); const sal_Int32 nHgt(rRectangle.GetHeight()); - + aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left(), rRectangle.Bottom())); aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left() + (nWdt * 30) / 100, rRectangle.Top() + (nHgt * 70) / 100)); aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left(), rRectangle.Top() + (nHgt * 15) / 100)); @@ -505,7 +505,7 @@ SdrObject* FuConstructBezierPolygon::CreateDefaultObject(const sal_uInt16 nID, c aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left() + (nWdt * 80) / 100, rRectangle.Top() + (nHgt * 50) / 100)); aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left() + (nWdt * 80) / 100, rRectangle.Top() + (nHgt * 75) / 100)); aInnerPoly.append(basegfx::B2DPoint(rRectangle.Bottom(), rRectangle.Right())); - + if(SID_DRAW_POLYGON_NOFILL == nID) { aInnerPoly.append(basegfx::B2DPoint(rRectangle.Center().X(), rRectangle.Bottom())); diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index 0627abdd62fc..7265eed76b65 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,11 +93,11 @@ TYPEINIT1( FuConstructCustomShape, FuConstruct ); \************************************************************************/ FuConstructCustomShape::FuConstructCustomShape ( - ViewShell* pViewSh, - ::sd::Window* pWin, - ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq ) : + ViewShell* pViewSh, + ::sd::Window* pWin, + ::sd::View* pView, + SdDrawDocument* pDoc, + SfxRequest& rReq ) : FuConstruct(pViewSh, pWin, pView, pDoc, rReq) { } @@ -262,7 +262,7 @@ void FuConstructCustomShape::SetAttributes( SdrObject* pObj ) if( pSourceObj ) { const SfxItemSet& rSource = pSourceObj->GetMergedItemSet(); - SfxItemSet aDest( pObj->GetModel()->GetItemPool(), // ranges from SdrAttrObj + SfxItemSet aDest( pObj->GetModel()->GetItemPool(), // ranges from SdrAttrObj SDRATTR_START, SDRATTR_SHADOW_LAST, SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST, SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION, diff --git a/sd/source/ui/func/fuconnct.cxx b/sd/source/ui/func/fuconnct.cxx index edce9a5e38e4..522d54eaf3b2 100644 --- a/sd/source/ui/func/fuconnct.cxx +++ b/sd/source/ui/func/fuconnct.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,10 +50,10 @@ TYPEINIT1( FuConnectionDlg, FuPoor ); \************************************************************************/ FuConnectionDlg::FuConnectionDlg ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) { diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index ef7eaae17004..6ba5de769915 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,11 +88,11 @@ TYPEINIT1( FuConstructRectangle, FuConstruct ); \************************************************************************/ FuConstructRectangle::FuConstructRectangle ( - ViewShell* pViewSh, - ::sd::Window* pWin, - ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq) + ViewShell* pViewSh, + ::sd::Window* pWin, + ::sd::View* pView, + SdDrawDocument* pDoc, + SfxRequest& rReq) : FuConstruct(pViewSh, pWin, pView, pDoc, rReq) { } @@ -127,11 +127,11 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq ) SFX_REQUEST_ARG (rReq, pAxisX, SfxUInt32Item, ID_VAL_AXIS_X, FALSE); SFX_REQUEST_ARG (rReq, pAxisY, SfxUInt32Item, ID_VAL_AXIS_Y, FALSE); - Rectangle aNewRectangle (pCenterX->GetValue () - pAxisX->GetValue () / 2, + Rectangle aNewRectangle (pCenterX->GetValue () - pAxisX->GetValue () / 2, pCenterY->GetValue () - pAxisY->GetValue () / 2, pCenterX->GetValue () + pAxisX->GetValue () / 2, pCenterY->GetValue () + pAxisY->GetValue () / 2); - SdrCircObj *pNewCircle = new SdrCircObj (OBJ_CIRC, aNewRectangle); + SdrCircObj *pNewCircle = new SdrCircObj (OBJ_CIRC, aNewRectangle); SdrPageView *pPV = mpView->GetSdrPageView(); mpView->InsertObjectAtView(pNewCircle, *pPV, SDRINSERT_SETDEFLAYER | SDRINSERT_SETDEFATTR); @@ -145,11 +145,11 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq ) SFX_REQUEST_ARG (rReq, pMouseEndX, SfxUInt32Item, ID_VAL_MOUSEEND_X, FALSE); SFX_REQUEST_ARG (rReq, pMouseEndY, SfxUInt32Item, ID_VAL_MOUSEEND_Y, FALSE); - Rectangle aNewRectangle (pMouseStartX->GetValue (), + Rectangle aNewRectangle (pMouseStartX->GetValue (), pMouseStartY->GetValue (), pMouseEndX->GetValue (), pMouseEndY->GetValue ()); - SdrRectObj *pNewRect = new SdrRectObj (aNewRectangle); + SdrRectObj *pNewRect = new SdrRectObj (aNewRectangle); SdrPageView *pPV = mpView->GetSdrPageView(); mpView->InsertObjectAtView(pNewRect, *pPV, SDRINSERT_SETDEFLAYER | SDRINSERT_SETDEFATTR); @@ -185,13 +185,13 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq ) nSlotId == SID_CONNECTOR_LINES_ARROWS || nSlotId == SID_CONNECTOR_LINES_CIRCLE_START || nSlotId == SID_CONNECTOR_LINES_CIRCLE_END || - nSlotId == SID_CONNECTOR_LINES_CIRCLES || - nSlotId == SID_LINE_ARROW_START || - nSlotId == SID_LINE_ARROW_END || - nSlotId == SID_LINE_ARROWS || - nSlotId == SID_LINE_ARROW_CIRCLE || - nSlotId == SID_LINE_CIRCLE_ARROW || - nSlotId == SID_LINE_ARROW_SQUARE || + nSlotId == SID_CONNECTOR_LINES_CIRCLES || + nSlotId == SID_LINE_ARROW_START || + nSlotId == SID_LINE_ARROW_END || + nSlotId == SID_LINE_ARROWS || + nSlotId == SID_LINE_ARROW_CIRCLE || + nSlotId == SID_LINE_CIRCLE_ARROW || + nSlotId == SID_LINE_ARROW_SQUARE || nSlotId == SID_LINE_SQUARE_ARROW ) { mpView->UnmarkAll(); @@ -355,21 +355,21 @@ void FuConstructRectangle::Activate() break; case SID_DRAW_RECT : - case SID_DRAW_RECT_NOFILL : - case SID_DRAW_RECT_ROUND : + case SID_DRAW_RECT_NOFILL : + case SID_DRAW_RECT_ROUND : case SID_DRAW_RECT_ROUND_NOFILL: - case SID_DRAW_SQUARE : + case SID_DRAW_SQUARE : case SID_DRAW_SQUARE_NOFILL : - case SID_DRAW_SQUARE_ROUND : + case SID_DRAW_SQUARE_ROUND : case SID_DRAW_SQUARE_ROUND_NOFILL: { aObjKind = OBJ_RECT; } break; - case SID_DRAW_ELLIPSE : + case SID_DRAW_ELLIPSE : case SID_DRAW_ELLIPSE_NOFILL: - case SID_DRAW_CIRCLE : + case SID_DRAW_CIRCLE : case SID_DRAW_CIRCLE_NOFILL : { aObjKind = OBJ_CIRC; @@ -464,13 +464,13 @@ void FuConstructRectangle::Deactivate() nSlotId == SID_CONNECTOR_LINES_ARROWS || nSlotId == SID_CONNECTOR_LINES_CIRCLE_START || nSlotId == SID_CONNECTOR_LINES_CIRCLE_END || - nSlotId == SID_CONNECTOR_LINES_CIRCLES || - nSlotId == SID_LINE_ARROW_START || - nSlotId == SID_LINE_ARROW_END || - nSlotId == SID_LINE_ARROWS || - nSlotId == SID_LINE_ARROW_CIRCLE || - nSlotId == SID_LINE_CIRCLE_ARROW || - nSlotId == SID_LINE_ARROW_SQUARE || + nSlotId == SID_CONNECTOR_LINES_CIRCLES || + nSlotId == SID_LINE_ARROW_START || + nSlotId == SID_LINE_ARROW_END || + nSlotId == SID_LINE_ARROWS || + nSlotId == SID_LINE_ARROW_CIRCLE || + nSlotId == SID_LINE_CIRCLE_ARROW || + nSlotId == SID_LINE_ARROW_SQUARE || nSlotId == SID_LINE_SQUARE_ARROW ) { mpView->SetGlueVisible( FALSE ); @@ -988,8 +988,8 @@ SdrObject* FuConstructRectangle::CreateDefaultObject(const sal_uInt16 nID, const } // For task #105815# the default text is not inserted anymore. - // String aText(SdResId(STR_POOLSHEET_TEXT)); - // ((SdrCaptionObj*)pObj)->SetText(aText); + // String aText(SdResId(STR_POOLSHEET_TEXT)); + // ((SdrCaptionObj*)pObj)->SetText(aText); ((SdrCaptionObj*)pObj)->SetLogicRect(aRect); ((SdrCaptionObj*)pObj)->SetTailPos( diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index c0d8235e97fb..1d62b9a76a0c 100755 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,11 +62,11 @@ TYPEINIT1( FuConstruct, FuDraw ); \************************************************************************/ FuConstruct::FuConstruct ( - ViewShell* pViewSh, - ::sd::Window* pWin, - ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq) + ViewShell* pViewSh, + ::sd::Window* pWin, + ::sd::View* pView, + SdDrawDocument* pDoc, + SfxRequest& rReq) : FuDraw(pViewSh, pWin, pView, pDoc, rReq), bSelectionChanged(FALSE) { @@ -95,7 +95,7 @@ BOOL FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) // #90235# this extra triggering is an error and leads to // erasing the last two points when creating a polygon. // if ( rMEvt.IsRight() ) - // mpView->BckAction(); + // mpView->BckAction(); return TRUE; } @@ -391,7 +391,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj, else { /*********************************** - * object was created on normal page + * object was created on normal page ************************************/ if ( bForceNoFillStyle ) { diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx index fffcaf3c0b9f..6318253ceea3 100644 --- a/sd/source/ui/func/fuconuno.cxx +++ b/sd/source/ui/func/fuconuno.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,11 +67,11 @@ TYPEINIT1( FuConstructUnoControl, FuConstruct ); \************************************************************************/ FuConstructUnoControl::FuConstructUnoControl ( - ViewShell* pViewSh, - ::sd::Window* pWin, - ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq) + ViewShell* pViewSh, + ::sd::Window* pWin, + ::sd::View* pView, + SdDrawDocument* pDoc, + SfxRequest& rReq) : FuConstruct(pViewSh, pWin, pView, pDoc, rReq) { } @@ -205,7 +205,7 @@ void FuConstructUnoControl::Deactivate() SdrObject* FuConstructUnoControl::CreateDefaultObject(const sal_uInt16, const Rectangle& rRectangle) { // case SID_FM_CREATE_CONTROL: - + SdrObject* pObj = SdrObjFactory::MakeNewObject( mpView->GetCurrentObjInventor(), mpView->GetCurrentObjIdentifier(), 0L, mpDoc); diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx index 0335ff9aa13c..89c44320d4c9 100644 --- a/sd/source/ui/func/fucopy.cxx +++ b/sd/source/ui/func/fucopy.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,10 +62,10 @@ TYPEINIT1( FuCopy, FuPoor ); \************************************************************************/ FuCopy::FuCopy ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) { @@ -98,7 +98,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) // Farb-Attribut angeben SfxItemSet aAttr( mpDoc->GetPool() ); mpView->GetAttributes( aAttr ); - const SfxPoolItem* pPoolItem = NULL; + const SfxPoolItem* pPoolItem = NULL; if( SFX_ITEM_SET == aAttr.GetItemState( XATTR_FILLSTYLE, TRUE, &pPoolItem ) ) { @@ -143,11 +143,11 @@ void FuCopy::DoExecute( SfxRequest& rReq ) } } - Rectangle aRect; - INT32 lWidth = 0, lHeight = 0, lSizeX = 0L, lSizeY = 0L, lAngle = 0L; - UINT16 nNumber = 0; - Color aStartColor, aEndColor; - BOOL bColor = FALSE; + Rectangle aRect; + INT32 lWidth = 0, lHeight = 0, lSizeX = 0L, lSizeY = 0L, lAngle = 0L; + UINT16 nNumber = 0; + Color aStartColor, aEndColor; + BOOL bColor = FALSE; const SfxPoolItem* pPoolItem = NULL; // Anzahl @@ -200,19 +200,19 @@ void FuCopy::DoExecute( SfxRequest& rReq ) bWaiting = TRUE; } - const SdrMarkList aMarkList( mpView->GetMarkedObjectList() ); - const ULONG nMarkCount = aMarkList.GetMarkCount(); - SdrObject* pObj = NULL; + const SdrMarkList aMarkList( mpView->GetMarkedObjectList() ); + const ULONG nMarkCount = aMarkList.GetMarkCount(); + SdrObject* pObj = NULL; // Anzahl moeglicher Kopien berechnen aRect = mpView->GetAllMarkedRect(); - + if( lWidth < 0L ) { long nTmp = ( aRect.Right() - aRect.Left() ) / -lWidth; nNumber = (UINT16) Min( nTmp, (long)nNumber ); } - + if( lHeight < 0L ) { long nTmp = ( aRect.Bottom() - aRect.Top() ) / -lHeight; @@ -236,16 +236,16 @@ void FuCopy::DoExecute( SfxRequest& rReq ) // make a copy of selected objects mpView->CopyMarked(); - - // get newly selected objects + + // get newly selected objects SdrMarkList aCopyMarkList( mpView->GetMarkedObjectList() ); - ULONG j, nCopyMarkCount = aMarkList.GetMarkCount(); - + ULONG j, nCopyMarkCount = aMarkList.GetMarkCount(); + // set protection flags at marked copies to null for( j = 0; j < nCopyMarkCount; j++ ) { pObj = aCopyMarkList.GetMark( j )->GetMarkedSdrObj(); - + if( pObj ) { pObj->SetMoveProtect( FALSE ); @@ -264,7 +264,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) if( mpView->IsMoveAllowed() ) mpView->MoveAllMarked( Size( lSizeX, lSizeY ) ); - + // set protection flags at marked copies to original values if( nMarkCount == nCopyMarkCount ) { @@ -272,8 +272,8 @@ void FuCopy::DoExecute( SfxRequest& rReq ) { SdrObject* pSrcObj = aMarkList.GetMark( j )->GetMarkedSdrObj(); SdrObject* pDstObj = aCopyMarkList.GetMark( j )->GetMarkedSdrObj(); - - if( pSrcObj && pDstObj && + + if( pSrcObj && pDstObj && ( pSrcObj->GetObjInventor() == pDstObj->GetObjInventor() ) && ( pSrcObj->GetObjIdentifier() == pDstObj->GetObjIdentifier() ) ) { @@ -312,4 +312,4 @@ void FuCopy::DoExecute( SfxRequest& rReq ) } } -} // end of namespace +} // end of namespace diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx index 1ca6da60a713..648711097ebc 100644 --- a/sd/source/ui/func/fucushow.cxx +++ b/sd/source/ui/func/fucushow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,11 +55,11 @@ TYPEINIT1( FuCustomShowDlg, FuPoor ); \************************************************************************/ FuCustomShowDlg::FuCustomShowDlg ( - ViewShell* pViewSh, - ::sd::Window* pWin, - ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq) + ViewShell* pViewSh, + ::sd::Window* pWin, + ::sd::View* pView, + SdDrawDocument* pDoc, + SfxRequest& rReq) : FuPoor( pViewSh, pWin, pView, pDoc, rReq ) { } @@ -96,4 +96,4 @@ void FuCustomShowDlg::DoExecute( SfxRequest& ) } } -} // end of namespace +} // end of namespace diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 5cc3cc49ca88..4a93eff1e3a0 100755 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -131,8 +131,8 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt) { FrameView* pFrameView = mpViewShell->GetFrameView(); -// BOOL bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho(); -// bOrtho = bOrtho != rMEvt.IsShift(); +// BOOL bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho(); +// bOrtho = bOrtho != rMEvt.IsShift(); BOOL bOrtho = FALSE; BOOL bRestricted = TRUE; @@ -253,8 +253,8 @@ BOOL FuDraw::MouseMove(const MouseEvent& rMEvt) FrameView* pFrameView = mpViewShell->GetFrameView(); Point aPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() ); -// BOOL bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho(); -// bOrtho = bOrtho != rMEvt.IsShift(); +// BOOL bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho(); +// bOrtho = bOrtho != rMEvt.IsShift(); BOOL bOrtho = FALSE; BOOL bRestricted = TRUE; @@ -689,8 +689,8 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) { UINT16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier(); - if ( nSdrObjKind != OBJ_TEXT && - nSdrObjKind != OBJ_TITLETEXT && + if ( nSdrObjKind != OBJ_TEXT && + nSdrObjKind != OBJ_TITLETEXT && nSdrObjKind != OBJ_OUTLINETEXT && aVEvt.pObj->IsEmptyPresObj() ) { @@ -786,8 +786,8 @@ BOOL FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) || (mpView->ISA(DrawView) && SlideShow::IsRunning( mpViewShell->GetViewShellBase() ) && - (pInfo->meClickAction == presentation::ClickAction_VANISH || - pInfo->meClickAction == presentation::ClickAction_INVISIBLE || + (pInfo->meClickAction == presentation::ClickAction_VANISH || + pInfo->meClickAction == presentation::ClickAction_INVISIBLE || pInfo->meClickAction == presentation::ClickAction_STOPPRESENTATION || (pInfo->mbActive && ( pInfo->meEffect != presentation::AnimationEffect_NONE || diff --git a/sd/source/ui/func/fudspord.cxx b/sd/source/ui/func/fudspord.cxx index 2e6ad66e11f1..bd1fa0e662dc 100644 --- a/sd/source/ui/func/fudspord.cxx +++ b/sd/source/ui/func/fudspord.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ TYPEINIT1( FuDisplayOrder, FuPoor ); |* \************************************************************************/ -FuDisplayOrder::FuDisplayOrder( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq) +FuDisplayOrder::FuDisplayOrder( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) , mpRefObj(NULL) , mpOverlay(0L) diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx index ddae68d8b9ab..a1ce2b37ba36 100644 --- a/sd/source/ui/func/fuediglu.cxx +++ b/sd/source/ui/func/fuediglu.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,8 +64,8 @@ FuEditGluePoints::FuEditGluePoints ( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq) + SdDrawDocument* pDoc, + SfxRequest& rReq) : FuDraw(pViewSh, pWin, pView, pDoc, rReq) { } diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx index 281e4c692228..c5bdcf13224c 100644 --- a/sd/source/ui/func/fuexpand.cxx +++ b/sd/source/ui/func/fuexpand.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -194,7 +194,7 @@ void FuExpandPage::DoExecute( SfxRequest& ) // Title-Textobjekt erstellen SdrTextObj* pTextObj = (SdrTextObj*) pPage->GetPresObj(PRESOBJ_TITLE); - + // OutlinerParaObject* pOutlinerParaObject = pOutl->CreateParaObject( (USHORT) nParaPos, 1); pOutlinerParaObject->SetOutlinerMode(OUTLINERMODE_TITLEOBJECT); @@ -233,13 +233,13 @@ void FuExpandPage::DoExecute( SfxRequest& ) // -- SdrOutliner* pTempOutl = SdrMakeOutliner( OUTLINERMODE_OUTLINEOBJECT, mpDoc ); pTempOutl->SetText( *pOPO ); - + ULONG nParaCount2 = pTempOutl->GetParagraphCount(); ULONG nPara; for( nPara = 0; nPara < nParaCount2; nPara++ ) { pTempOutl->SetDepth ( - pTempOutl->GetParagraph( nPara ), + pTempOutl->GetParagraph( nPara ), pTempOutl->GetDepth((USHORT) nPara ) - 1); } diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index 0d43ea73c964..24c8c2509221 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ namespace sd { TYPEINIT1( FuFormatPaintBrush, FuText ); -FuFormatPaintBrush::FuFormatPaintBrush( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) +FuFormatPaintBrush::FuFormatPaintBrush( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) : FuText(pViewSh, pWin, pView, pDoc, rReq) , mbPermanent( false ) , mbOldIsQuickTextEditMode( true ) @@ -92,7 +92,7 @@ void FuFormatPaintBrush::DoExecute( SfxRequest& rReq ) void FuFormatPaintBrush::implcancel() { if( mpViewShell && mpViewShell->GetViewFrame() ) - { + { SfxViewFrame* pViewFrame = mpViewShell->GetViewFrame(); pViewFrame->GetBindings().Invalidate(SID_FORMATPAINTBRUSH); pViewFrame->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); @@ -151,7 +151,7 @@ BOOL FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt) unmarkimpl( mpView ); if( aVEvt.pObj ) - { + { USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); BOOL bToggle = FALSE; mpView->MarkObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ), nHitLog, bToggle, FALSE); @@ -260,7 +260,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma if(mpItemSet.get() && (rMarkList.GetMarkCount() == 1) ) { SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); - + if( mpDoc->IsUndoEnabled() ) { String sLabel( mpViewShell->GetViewShellBase().RetrieveLabelFromCommand( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormatPaintbrush" ) ) ) ); @@ -269,7 +269,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma } mpView->ApplyFormatPaintBrush( *mpItemSet.get(), bNoCharacterFormats, bNoParagraphFormats ); - + if( mpDoc->IsUndoEnabled() ) { mpDoc->EndUndo(); @@ -281,7 +281,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma { const SdrMarkList& rMarkList = rDrawViewShell.GetDrawView()->GetMarkedObjectList(); const ULONG nMarkCount = rMarkList.GetMarkCount(); - + if( nMarkCount == 1 ) { SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx index a7f96a5b50d2..b792b9e59b4d 100644 --- a/sd/source/ui/func/fuhhconv.cxx +++ b/sd/source/ui/func/fuhhconv.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 6de64c70cbf2..916a5120945a 100755 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -135,17 +135,17 @@ FunctionReference FuInsertGraphic::Create( ViewShell* pViewSh, ::sd::Window* pWi void FuInsertGraphic::DoExecute( SfxRequest& ) { - SvxOpenGraphicDialog aDlg(SdResId(STR_INSERTGRAPHIC)); + SvxOpenGraphicDialog aDlg(SdResId(STR_INSERTGRAPHIC)); if( aDlg.Execute() == GRFILTER_OK ) { - Graphic aGraphic; + Graphic aGraphic; int nError = aDlg.GetGraphic(aGraphic); if( nError == GRFILTER_OK ) { if( mpViewShell && mpViewShell->ISA(DrawViewShell)) { - sal_Int8 nAction = DND_ACTION_COPY; + sal_Int8 nAction = DND_ACTION_COPY; SdrObject* pPickObj = mpView->GetEmptyPresentationObject( PRESOBJ_GRAPHIC ); if( pPickObj ) nAction = DND_ACTION_LINK; @@ -209,7 +209,7 @@ FunctionReference FuInsertClipboard::Create( ViewShell* pViewSh, ::sd::Window* p void FuInsertClipboard::DoExecute( SfxRequest& ) { - TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( mpWindow ) ); + TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( mpWindow ) ); ULONG nFormatId; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -726,9 +726,9 @@ FunctionReference FuInsertAVMedia::Create( ViewShell* pViewSh, ::sd::Window* pWi void FuInsertAVMedia::DoExecute( SfxRequest& rReq ) { - ::rtl::OUString aURL; - const SfxItemSet* pReqArgs = rReq.GetArgs(); - bool bAPI = false; + ::rtl::OUString aURL; + const SfxItemSet* pReqArgs = rReq.GetArgs(); + bool bAPI = false; if( pReqArgs ) { @@ -758,8 +758,8 @@ void FuInsertAVMedia::DoExecute( SfxRequest& rReq ) } else { - Point aPos; - Size aSize; + Point aPos; + Size aSize; sal_Int8 nAction = DND_ACTION_COPY; if( aPrefSize.Width() && aPrefSize.Height() ) diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index d14a5859d47b..573acc8ac39c 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,9 +86,9 @@ namespace sd { TYPEINIT1( FuInsertFile, FuPoor ); -#define POOL_BUFFER_SIZE (USHORT)32768 -#define BASIC_BUFFER_SIZE (USHORT)8192 -#define DOCUMENT_BUFFER_SIZE (USHORT)32768 +#define POOL_BUFFER_SIZE (USHORT)32768 +#define BASIC_BUFFER_SIZE (USHORT)8192 +#define DOCUMENT_BUFFER_SIZE (USHORT)32768 /************************************************************************* |* @@ -98,10 +98,10 @@ TYPEINIT1( FuInsertFile, FuPoor ); FuInsertFile::FuInsertFile ( ViewShell* pViewSh, - ::sd::Window* pWin, - ::sd::View* pView, + ::sd::Window* pWin, + ::sd::View* pView, SdDrawDocument* pDoc, - SfxRequest& rReq) + SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) { } @@ -128,7 +128,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) Reference< XFilterManager > xFilterManager( xFilePicker, UNO_QUERY ); String aOwnCont; String aOtherCont; - const SfxFilter* pFilter = NULL; + const SfxFilter* pFilter = NULL; aFileDialog.SetTitle( String( SdResId(STR_DLG_INSERT_PAGES_FROM_FILE ) ) ); @@ -270,12 +270,12 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) mpDocSh->SetWaitCursor( TRUE ); - SfxMedium* pMedium = new SfxMedium( aFile, STREAM_READ | STREAM_NOCREATE, FALSE ); - const SfxFilter* pFilter = NULL; - + SfxMedium* pMedium = new SfxMedium( aFile, STREAM_READ | STREAM_NOCREATE, FALSE ); + const SfxFilter* pFilter = NULL; + SFX_APP()->GetFilterMatcher().GuessFilter( *pMedium, &pFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE ); - - BOOL bDrawMode = mpViewShell && mpViewShell->ISA(DrawViewShell); + + BOOL bDrawMode = mpViewShell && mpViewShell->ISA(DrawViewShell); BOOL bInserted = FALSE; if( pFilter ) @@ -513,11 +513,11 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium) // was zeichnen muessen; // der globale Outliner koennte in SdPage::CreatePresObj // benutzt werden -// SfxItemPool* pPool = mpDoc->GetDrawOutliner().GetEmptyItemSet().GetPool(); +// SfxItemPool* pPool = mpDoc->GetDrawOutliner().GetEmptyItemSet().GetPool(); SdrOutliner* pOutliner = new ::sd::Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT ); -// pOutliner->SetStyleSheetPool((SfxStyleSheetPool*)mpDoc->GetStyleSheetPool()); -// pOutliner->SetEditTextObjectPool(pPool); -// pOutliner->SetForbiddenCharsTable( mpDoc->GetForbiddenCharsTable() ); +// pOutliner->SetStyleSheetPool((SfxStyleSheetPool*)mpDoc->GetStyleSheetPool()); +// pOutliner->SetEditTextObjectPool(pPool); +// pOutliner->SetForbiddenCharsTable( mpDoc->GetForbiddenCharsTable() ); // Referenz-Device setzen pOutliner->SetRefDevice( SD_MOD()->GetRefDevice( *mpDocSh ) ); @@ -635,9 +635,9 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) else if( aFilterName.SearchAscii( "HTML" ) != STRING_NOTFOUND ) nFormat = EE_FORMAT_HTML; - ::Outliner* pDocliner = static_cast<OutlineView*>(mpView)->GetOutliner(); - List* pList = pDocliner->GetView(0)->CreateSelectionList(); - Paragraph* pPara = (Paragraph*)pList->First(); + ::Outliner* pDocliner = static_cast<OutlineView*>(mpView)->GetOutliner(); + List* pList = pDocliner->GetView(0)->CreateSelectionList(); + Paragraph* pPara = (Paragraph*)pList->First(); // wo soll eingefuegt werden? while( !pDocliner->HasParaFlag( pPara, PARAFLAG_ISPAGE ) ) @@ -775,14 +775,14 @@ BOOL FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium) pOutliner->SetParaInsertedHdl( Link(NULL, NULL)); Link aOldParagraphRemovingHdl = pOutliner->GetParaRemovingHdl(); pOutliner->SetParaRemovingHdl( Link(NULL, NULL)); - Link aOldDepthChangedHdl = pOutliner->GetDepthChangedHdl(); + Link aOldDepthChangedHdl = pOutliner->GetDepthChangedHdl(); pOutliner->SetDepthChangedHdl( Link(NULL, NULL)); - Link aOldBeginMovingHdl = pOutliner->GetBeginMovingHdl(); + Link aOldBeginMovingHdl = pOutliner->GetBeginMovingHdl(); pOutliner->SetBeginMovingHdl( Link(NULL, NULL)); - Link aOldEndMovingHdl = pOutliner->GetEndMovingHdl(); + Link aOldEndMovingHdl = pOutliner->GetEndMovingHdl(); pOutliner->SetEndMovingHdl( Link(NULL, NULL)); - Link aOldStatusEventHdl = pOutliner->GetStatusEventHdl(); + Link aOldStatusEventHdl = pOutliner->GetStatusEventHdl(); pOutliner->SetStatusEventHdl(Link(NULL, NULL)); pOutliner->Clear(); diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx index b14d5f6acc08..273abef6e7d7 100644 --- a/sd/source/ui/func/fuline.cxx +++ b/sd/source/ui/func/fuline.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,10 +62,10 @@ TYPEINIT1( FuLine, FuPoor ); \************************************************************************/ FuLine::FuLine ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) { @@ -80,7 +80,7 @@ FunctionReference FuLine::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd:: void FuLine::DoExecute( SfxRequest& rReq ) { - BOOL bHasMarked = mpView->AreObjectsMarked(); + BOOL bHasMarked = mpView->AreObjectsMarked(); const SfxItemSet* pArgs = rReq.GetArgs(); diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx index 9c53518507f3..3d889fb1c610 100644 --- a/sd/source/ui/func/fulinend.cxx +++ b/sd/source/ui/func/fulinend.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/fulink.cxx b/sd/source/ui/func/fulink.cxx index a87cb63883e7..8549945206cc 100644 --- a/sd/source/ui/func/fulink.cxx +++ b/sd/source/ui/func/fulink.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/fumeasur.cxx b/sd/source/ui/func/fumeasur.cxx index 55344a46acc2..6ff3a6b6f18d 100644 --- a/sd/source/ui/func/fumeasur.cxx +++ b/sd/source/ui/func/fumeasur.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,10 +49,10 @@ TYPEINIT1( FuMeasureDlg, FuPoor ); \************************************************************************/ FuMeasureDlg::FuMeasureDlg ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) { diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index 1dc2d40fefd3..0d1e7ba2f2d0 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,12 +66,12 @@ TYPEINIT1( FuMorph, FuPoor ); // constructor // FuMorph::FuMorph ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq ) - : FuPoor(pViewSh, pWin, pView, pDoc, rReq) + SdDrawDocument* pDoc, + SfxRequest& rReq ) + : FuPoor(pViewSh, pWin, pView, pDoc, rReq) { } @@ -84,23 +84,23 @@ FunctionReference FuMorph::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd: void FuMorph::DoExecute( SfxRequest& ) { - const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); + const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); if(rMarkList.GetMarkCount() == 2) { // Clones erzeugen - SdrObject* pObj1 = rMarkList.GetMark(0)->GetMarkedSdrObj(); - SdrObject* pObj2 = rMarkList.GetMark(1)->GetMarkedSdrObj(); - SdrObject* pCloneObj1 = pObj1->Clone(); - SdrObject* pCloneObj2 = pObj2->Clone(); + SdrObject* pObj1 = rMarkList.GetMark(0)->GetMarkedSdrObj(); + SdrObject* pObj2 = rMarkList.GetMark(1)->GetMarkedSdrObj(); + SdrObject* pCloneObj1 = pObj1->Clone(); + SdrObject* pCloneObj2 = pObj2->Clone(); // Text am Clone loeschen, da wir sonst kein richtiges PathObj bekommen pCloneObj1->SetOutlinerParaObject(NULL); pCloneObj2->SetOutlinerParaObject(NULL); // Path-Objekte erzeugen - SdrObject* pPolyObj1 = pCloneObj1->ConvertToPolyObj(FALSE, FALSE); - SdrObject* pPolyObj2 = pCloneObj2->ConvertToPolyObj(FALSE, FALSE); + SdrObject* pPolyObj1 = pCloneObj1->ConvertToPolyObj(FALSE, FALSE); + SdrObject* pPolyObj2 = pCloneObj2->ConvertToPolyObj(FALSE, FALSE); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); AbstractMorphDlg* pDlg = pFact ? pFact->CreateMorphDlg( static_cast< ::Window*>(mpWindow), pObj1, pObj2 ) : 0; if(pPolyObj1 && pPolyObj2 && pDlg && (pDlg->Execute() == RET_OK)) @@ -261,7 +261,7 @@ void FuMorph::ImpEqualizePolyPointCount(::basegfx::B2DPolygon& rSmall, const ::b const ::basegfx::B2DPoint aSrcPos(aSrcSize.getCenter()); const ::basegfx::B2DRange aDstSize(::basegfx::tools::getRange(rSmall)); const ::basegfx::B2DPoint aDstPos(aDstSize.getCenter()); - + basegfx::B2DHomMatrix aTrans(basegfx::tools::createTranslateB2DHomMatrix(-aSrcPos.getX(), -aSrcPos.getY())); aTrans.scale(aDstSize.getWidth() / aSrcSize.getWidth(), aDstSize.getHeight() / aSrcSize.getHeight()); aTrans.translate(aDstPos.getX(), aDstPos.getY()); @@ -323,7 +323,7 @@ void FuMorph::ImpAddPolys(::basegfx::B2DPolyPolygon& rSmaller, const ::basegfx:: { aNewPoly.append(aNewPoint); } - + rSmaller.append(aNewPoly); } } @@ -334,21 +334,21 @@ void FuMorph::ImpAddPolys(::basegfx::B2DPolyPolygon& rSmaller, const ::basegfx:: void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, const SdrObject* pObj1, const SdrObject* pObj2) { - Color aStartFillCol; - Color aEndFillCol; - Color aStartLineCol; - Color aEndLineCol; - long nStartLineWidth = 0; - long nEndLineWidth = 0; - SdrPageView* pPageView = mpView->GetSdrPageView(); - SfxItemPool* pPool = pObj1->GetObjectItemPool(); - SfxItemSet aSet1( *pPool,SDRATTR_START,SDRATTR_NOTPERSIST_FIRST-1,EE_ITEMS_START,EE_ITEMS_END,0 ); - SfxItemSet aSet2( aSet1 ); - BOOL bLineColor = FALSE; - BOOL bFillColor = FALSE; - BOOL bLineWidth = FALSE; - BOOL bIgnoreLine = FALSE; - BOOL bIgnoreFill = FALSE; + Color aStartFillCol; + Color aEndFillCol; + Color aStartLineCol; + Color aEndLineCol; + long nStartLineWidth = 0; + long nEndLineWidth = 0; + SdrPageView* pPageView = mpView->GetSdrPageView(); + SfxItemPool* pPool = pObj1->GetObjectItemPool(); + SfxItemSet aSet1( *pPool,SDRATTR_START,SDRATTR_NOTPERSIST_FIRST-1,EE_ITEMS_START,EE_ITEMS_END,0 ); + SfxItemSet aSet2( aSet1 ); + BOOL bLineColor = FALSE; + BOOL bFillColor = FALSE; + BOOL bLineWidth = FALSE; + BOOL bIgnoreLine = FALSE; + BOOL bIgnoreFill = FALSE; aSet1.Put(pObj1->GetMergedItemSet()); aSet2.Put(pObj2->GetMergedItemSet()); @@ -389,13 +389,13 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, if ( pPageView ) { - SfxItemSet aSet( aSet1 ); - SdrObjGroup* pObjGroup = new SdrObjGroup; - SdrObjList* pObjList = pObjGroup->GetSubList(); - const ULONG nCount = rPolyPolyList3D.Count(); - const double fStep = 1. / ( nCount + 1 ); - const double fDelta = nEndLineWidth - nStartLineWidth; - double fFactor = fStep; + SfxItemSet aSet( aSet1 ); + SdrObjGroup* pObjGroup = new SdrObjGroup; + SdrObjList* pObjList = pObjGroup->GetSubList(); + const ULONG nCount = rPolyPolyList3D.Count(); + const double fStep = 1. / ( nCount + 1 ); + const double fDelta = nEndLineWidth - nStartLineWidth; + double fFactor = fStep; aSet.Put( XLineStyleItem( XLINE_SOLID ) ); aSet.Put( XFillStyleItem( XFILL_SOLID ) ); @@ -445,8 +445,8 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, ////////////////////////////////////////////////////////////////////////////// // create single morphed PolyPolygon // -::basegfx::B2DPolyPolygon* FuMorph::ImpCreateMorphedPolygon( - const ::basegfx::B2DPolyPolygon& rPolyPolyStart, +::basegfx::B2DPolyPolygon* FuMorph::ImpCreateMorphedPolygon( + const ::basegfx::B2DPolyPolygon& rPolyPolyStart, const ::basegfx::B2DPolyPolygon& rPolyPolyEnd, double fMorphingFactor) { @@ -478,7 +478,7 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, // create morphed PolyPolygons // sal_Bool FuMorph::ImpMorphPolygons( - const ::basegfx::B2DPolyPolygon& rPolyPoly1, + const ::basegfx::B2DPolyPolygon& rPolyPoly1, const ::basegfx::B2DPolyPolygon& rPolyPoly2, const sal_uInt16 nSteps, List& rPolyPolyList3D) { diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index b348d6533930..21bd350393c3 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ #include "View.hxx" #include "sdabstdlg.hxx" #include "sdresid.hxx" -#include <vcl/salbtype.hxx> // FRound +#include <vcl/salbtype.hxx> // FRound #include <basegfx/polygon/b2dpolygon.hxx> using namespace ::com::sun::star; @@ -76,11 +76,11 @@ TYPEINIT1( FuObjectAnimationParameters, FuPoor ); \************************************************************************/ FuObjectAnimationParameters::FuObjectAnimationParameters ( - ViewShell* pViewSh, - ::sd::Window* pWin, - ::sd::View* pView, + ViewShell* pViewSh, + ::sd::Window* pWin, + ::sd::View* pView, SdDrawDocument* pDoc, - SfxRequest& rReq) + SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) { } @@ -97,8 +97,8 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) SfxUndoManager* pUndoMgr = mpViewShell->GetViewFrame()->GetObjectShell()->GetUndoManager(); const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(); - ULONG nObject = 0; + ULONG nCount = rMarkList.GetMarkCount(); + ULONG nObject = 0; short nAnimationSet = ATTR_MISSING; short nEffectSet = ATTR_MISSING; @@ -728,10 +728,10 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) pAction->SetSoundOn(pInfo->mbSoundOn, pInfo->mbSoundOn); pAction->SetSound(pInfo->maSoundFile, pInfo->maSoundFile); pAction->SetPlayFull(pInfo->mbPlayFull, pInfo->mbPlayFull); -// pAction->SetPathObj(pInfo->mpPathObj, pInfo->mpPathObj); +// pAction->SetPathObj(pInfo->mpPathObj, pInfo->mpPathObj); pAction->SetClickAction(pInfo->meClickAction, pInfo->meClickAction); pAction->SetBookmark(pInfo->GetBookmark(), pInfo->GetBookmark()); -// pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, TRUE); +// pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, TRUE); pAction->SetVerb(pInfo->mnVerb, pInfo->mnVerb); pAction->SetSecondEffect(pInfo->meSecondEffect, pInfo->meSecondEffect); pAction->SetSecondSpeed(pInfo->meSecondSpeed, pInfo->meSecondSpeed); @@ -739,7 +739,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) pAction->SetSecondPlayFull(pInfo->mbSecondPlayFull, pInfo->mbSecondPlayFull); pUndoGroup->AddAction(pAction); -// pInfo->mbInvisibleInPresentation = TRUE; +// pInfo->mbInvisibleInPresentation = TRUE; } else { @@ -760,8 +760,8 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) pAction->SetPathObj(pInfo->mpPathObj, pPath); pAction->SetClickAction(pInfo->meClickAction, eClickAction); pAction->SetBookmark(pInfo->GetBookmark(), aBookmark); -// pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, -// pInfo->mbInvisibleInPresentation); +// pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, +// pInfo->mbInvisibleInPresentation); pAction->SetVerb(pInfo->mnVerb, (USHORT)pInfo->GetBookmark().ToInt32() ); pAction->SetSecondEffect(pInfo->meSecondEffect, eSecondEffect); pAction->SetSecondSpeed(pInfo->meSecondSpeed, eSecondSpeed); @@ -819,8 +819,8 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) pInfo->mbSecondPlayFull = bSecondPlayFull; // noch ein paar Spezialitaeten -// if (eEffect == presentation::AnimationEffect_PATH && nEffectSet == ATTR_SET) -// pInfo->mSetPath(pPath); +// if (eEffect == presentation::AnimationEffect_PATH && nEffectSet == ATTR_SET) +// pInfo->mSetPath(pPath); if (eClickAction == presentation::ClickAction_VERB) pInfo->mnVerb = (USHORT)aBookmark.ToInt32(); diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index 32ca9d3278b3..5f5ad6467e64 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx index 2797631d12db..334441f988ec 100644 --- a/sd/source/ui/func/fuoltext.cxx +++ b/sd/source/ui/func/fuoltext.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/fuoutl.cxx b/sd/source/ui/func/fuoutl.cxx index c0ef53f144b3..2f26f0a816d2 100755 --- a/sd/source/ui/func/fuoutl.cxx +++ b/sd/source/ui/func/fuoutl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,10 +49,10 @@ TYPEINIT1( FuOutline, FuPoor ); \************************************************************************/ FuOutline::FuOutline ( - ViewShell* pViewShell, - ::sd::Window* pWindow, + ViewShell* pViewShell, + ::sd::Window* pWindow, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewShell, pWindow, pView, pDoc, rReq), pOutlineViewShell (static_cast<OutlineViewShell*>(pViewShell)), @@ -70,13 +70,13 @@ BOOL FuOutline::Command(const CommandEvent& rCEvt) { BOOL bResult = FALSE; - OutlinerView* pOlView = + OutlinerView* pOlView = static_cast<OutlineView*>(mpView)->GetViewByWindow(mpWindow); DBG_ASSERT (pOlView, "keine OutlinerView gefunden"); if (pOlView) { - pOlView->Command(rCEvt); // liefert leider keinen Returnwert + pOlView->Command(rCEvt); // liefert leider keinen Returnwert bResult = TRUE; } return bResult; diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 3dea67412fac..c5a70872bf3a 100755 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -129,7 +129,7 @@ void mergeItemSetsImpl( SfxItemSet& rTarget, const SfxItemSet& rSource ) FuPage::FuPage( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) -: FuPoor(pViewSh, pWin, pView, pDoc, rReq), +: FuPoor(pViewSh, pWin, pView, pDoc, rReq), mrReq(rReq), mpArgs( rReq.GetArgs() ), mpBackgroundObjUndoAction( 0 ), @@ -287,10 +287,10 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) } else { - if(pStyleSheet + if(pStyleSheet && XFILL_NONE != ((const XFillStyleItem&)pStyleSheet->GetItemSet().Get(XATTR_FILLSTYLE)).GetValue()) { - // if the page has no fill style, use the settings from the + // if the page has no fill style, use the settings from the // background stylesheet (if used) mergeItemSetsImpl(aMergedAttr, pStyleSheet->GetItemSet()); } @@ -307,11 +307,11 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) if( GetSlotID() == SID_SELECT_BACKGROUND ) { - SvxOpenGraphicDialog aDlg(SdResId(STR_SET_BACKGROUND_PICTURE)); + SvxOpenGraphicDialog aDlg(SdResId(STR_SET_BACKGROUND_PICTURE)); if( aDlg.Execute() == GRFILTER_OK ) { - Graphic aGraphic; + Graphic aGraphic; int nError = aDlg.GetGraphic(aGraphic); if( nError == GRFILTER_OK ) { @@ -472,7 +472,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) SdrPage& rUsedMasterPage = mpPage->IsMasterPage() ? *mpPage : mpPage->TRG_GetMasterPage(); OSL_ENSURE(rUsedMasterPage.IsMasterPage(), "No MasterPage (!)"); rUsedMasterPage.getSdrPageProperties().ClearItem(); - OSL_ENSURE(0 != rUsedMasterPage.getSdrPageProperties().GetStyleSheet(), + OSL_ENSURE(0 != rUsedMasterPage.getSdrPageProperties().GetStyleSheet(), "MasterPage without StyleSheet detected (!)"); } @@ -498,10 +498,10 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) const SfxPoolItem* pPoolItem; BOOL bSetPageSizeAndBorder = FALSE; Size aNewSize(maSize); - INT32 nLeft = -1, nRight = -1, nUpper = -1, nLower = -1; - BOOL bScaleAll = TRUE; + INT32 nLeft = -1, nRight = -1, nUpper = -1, nLower = -1; + BOOL bScaleAll = TRUE; Orientation eOrientation = mpPage->GetOrientation(); - SdPage* pMasterPage = mpPage->IsMasterPage() ? mpPage : &(SdPage&)(mpPage->TRG_GetMasterPage()); + SdPage* pMasterPage = mpPage->IsMasterPage() ? mpPage : &(SdPage&)(mpPage->TRG_GetMasterPage()); BOOL bFullSize = pMasterPage->IsBackgroundFullSize(); USHORT nPaperBin = mpPage->GetPaperBin(); diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx index 68f8a3e922d0..ebefc2aed097 100644 --- a/sd/source/ui/func/fuparagr.cxx +++ b/sd/source/ui/func/fuparagr.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 0342c5f2bbc5..7bfafc33fed9 100755 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -186,12 +186,12 @@ void FuPoor::ForceScroll(const Point& aPixPos) if ( !mpView->IsDragHelpLine() && !mpView->IsSetPageOrg() && !SlideShow::IsRunning( mpViewShell->GetViewShellBase() ) ) { -/* Size aSize = mpWindow->GetSizePixel(); +/* Size aSize = mpWindow->GetSizePixel(); short dx = 0, dy = 0; - if ( aPixPos.X() <= 0 ) dx = -1; + if ( aPixPos.X() <= 0 ) dx = -1; if ( aPixPos.X() >= aSize.Width() ) dx = 1; - if ( aPixPos.Y() <= 0 ) dy = -1; + if ( aPixPos.Y() <= 0 ) dy = -1; if ( aPixPos.Y() >= aSize.Height() ) dy = 1; */ Point aPos = mpWindow->OutputToScreenPixel(aPixPos); @@ -206,10 +206,10 @@ void FuPoor::ForceScroll(const Point& aPixPos) { short dx = 0, dy = 0; - if ( aPos.X() <= rRect.Left() ) dx = -1; - if ( aPos.X() >= rRect.Right() ) dx = 1; - if ( aPos.Y() <= rRect.Top() ) dy = -1; - if ( aPos.Y() >= rRect.Bottom() ) dy = 1; + if ( aPos.X() <= rRect.Left() ) dx = -1; + if ( aPos.X() >= rRect.Right() ) dx = 1; + if ( aPos.Y() <= rRect.Top() ) dy = -1; + if ( aPos.Y() >= rRect.Bottom() ) dy = 1; if ( dx != 0 || dy != 0 ) { @@ -236,7 +236,7 @@ void FuPoor::ForceScroll(const Point& aPixPos) IMPL_LINK_INLINE_START( FuPoor, ScrollHdl, Timer *, EMPTYARG ) { Point aPnt(mpWindow->GetPointerPosPixel()); - + // #95491# use remembered MouseButton state to create correct // MouseEvents for this artifical MouseMove. MouseMove(MouseEvent(aPnt, 1, 0, GetMouseButtonCode())); @@ -269,7 +269,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) { if(mpViewShell && mpViewShell->ISA(DrawViewShell)) { - DrawViewShell* pDrawViewShell = + DrawViewShell* pDrawViewShell = static_cast<DrawViewShell*>(mpViewShell); SdPage* pActualPage = pDrawViewShell->GetActualPage(); SdrTextObj* pCandidate = 0L; @@ -287,7 +287,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) sal_uInt32 nInv(pObj->GetObjInventor()); sal_uInt16 nKnd(pObj->GetObjIdentifier()); - if(SdrInventor == nInv && + if(SdrInventor == nInv && (OBJ_TITLETEXT == nKnd || OBJ_OUTLINETEXT == nKnd || OBJ_TEXT == nKnd)) { pCandidate = (SdrTextObj*)pObj; @@ -320,7 +320,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) // #98255# activate OLE object on RETURN for selected object // #98198# activate text edit on RETURN for selected object const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); - + if( !mpView->IsTextEdit() && 1 == rMarkList.GetMarkCount() ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); @@ -373,7 +373,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) } } break; - + case KEY_ESCAPE: { bReturn = FuPoor::cancel(); @@ -464,8 +464,8 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) case KEY_HOME: { - if (!mpView->IsTextEdit() - && mpViewShell->ISA(DrawViewShell) + if (!mpView->IsTextEdit() + && mpViewShell->ISA(DrawViewShell) && !bSlideShow) { // Sprung zu erster Seite @@ -477,12 +477,12 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) case KEY_END: { - if (!mpView->IsTextEdit() - && mpViewShell->ISA(DrawViewShell) + if (!mpView->IsTextEdit() + && mpViewShell->ISA(DrawViewShell) && !bSlideShow) { // Sprung zu letzter Seite - SdPage* pPage = + SdPage* pPage = static_cast<DrawViewShell*>(mpViewShell)->GetActualPage(); static_cast<DrawViewShell*>(mpViewShell) ->SwitchPage(mpDoc->GetSdPageCount( @@ -496,7 +496,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) { if( rKEvt.GetKeyCode().IsMod1() && rKEvt.GetKeyCode().IsMod2() ) break; - + if(mpViewShell->ISA(DrawViewShell) && !bSlideShow) { // The page-up key switches layers or pages depending on the @@ -506,12 +506,12 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) // With no modifier pressed we move to the previous // slide. mpView->SdrEndTextEdit(); - + // Previous page. bReturn = TRUE; SdPage* pPage = static_cast<DrawViewShell*>(mpViewShell)->GetActualPage(); USHORT nSdPage = (pPage->GetPageNum() - 1) / 2; - + if (nSdPage > 0) { // Switch the page and send events regarding @@ -550,14 +550,14 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) // modifier key. if ( ! rKEvt.GetKeyCode().GetAllModifier()) { - // With no modifier pressed we move to the next slide. + // With no modifier pressed we move to the next slide. mpView->SdrEndTextEdit(); - + // Next page. bReturn = TRUE; SdPage* pPage = static_cast<DrawViewShell*>(mpViewShell)->GetActualPage(); USHORT nSdPage = (pPage->GetPageNum() - 1) / 2; - + if (nSdPage < mpDoc->GetSdPageCount(pPage->GetPageKind()) - 1) { // Switch the page and send events regarding @@ -573,7 +573,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) } } else if (rKEvt.GetKeyCode().IsMod1()) - { + { // With the CONTROL modifier we switch layers. if (static_cast<DrawViewShell*>(mpViewShell)->IsLayerModeActive()) { @@ -599,7 +599,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) // rescue ID of point with focus sal_uInt32 nPol(pHdl->GetPolyNum()); sal_uInt32 nPnt(pHdl->GetPointNum()); - + if(mpView->IsPointMarked(*pHdl)) { if(rKEvt.GetKeyCode().IsShift()) @@ -616,7 +616,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) mpView->MarkPoint(*pHdl); } - + if(0L == rHdlList.GetFocusHdl()) { // restore point with focus @@ -625,9 +625,9 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) for(sal_uInt32 a(0); !pNewOne && a < rHdlList.GetHdlCount(); a++) { SdrHdl* pAct = rHdlList.GetHdl(a); - - if(pAct - && pAct->GetKind() == HDL_POLY + + if(pAct + && pAct->GetKind() == HDL_POLY && pAct->GetPolyNum() == nPol && pAct->GetPointNum() == nPnt) { @@ -831,7 +831,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) mpView->MovAction(aEndPoint); mpView->EndDragObj(); - + // restore snap if(!bWasNoSnap) ((SdrDragStat&)rDragStat).SetNoSnap(bWasNoSnap); @@ -889,14 +889,14 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) // #98533# use common IsSimpleCharInput from // the EditEngine. sal_Bool bPrintable(EditEngine::IsSimpleCharInput(rKEvt)); - + if(bPrintable) { // try to activate textedit mode for the selected object SfxStringItem aInputString(SID_ATTR_CHAR, String(rKEvt.GetCharCode())); - + mpViewShell->GetViewFrame()->GetDispatcher()->Execute( - SID_ATTR_CHAR, + SID_ATTR_CHAR, SFX_CALLMODE_ASYNCHRON, &aInputString, 0L); @@ -910,10 +910,10 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) { // #99039# test if there is a title object there. If yes, try to // set it to edit mode and start typing... - if(mpViewShell->ISA(DrawViewShell) + if(mpViewShell->ISA(DrawViewShell) && EditEngine::IsSimpleCharInput(rKEvt)) { - DrawViewShell* pDrawViewShell = + DrawViewShell* pDrawViewShell = static_cast<DrawViewShell*>(mpViewShell); SdPage* pActualPage = pDrawViewShell->GetActualPage(); SdrTextObj* pCandidate = 0L; @@ -947,7 +947,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) SfxStringItem aInputString(SID_ATTR_CHAR, String(rKEvt.GetCharCode())); mpViewShell->GetViewFrame()->GetDispatcher()->Execute( - SID_ATTR_CHAR, + SID_ATTR_CHAR, SFX_CALLMODE_ASYNCHRON, &aInputString, 0L); @@ -1064,7 +1064,7 @@ IMPL_LINK_INLINE_START( FuPoor, DelayHdl, Timer *, EMPTYARG ) bScrollable = TRUE; Point aPnt(mpWindow->GetPointerPosPixel()); - + // #95491# use remembered MouseButton state to create correct // MouseEvents for this artifical MouseMove. MouseMove(MouseEvent(aPnt, 1, 0, GetMouseButtonCode())); @@ -1085,16 +1085,16 @@ BOOL FuPoor::MouseButtonUp (const MouseEvent& rMEvt) SetMouseButtonCode(rMEvt.GetButtons()); aDelayToScrollTimer.Stop (); - return bScrollable = + return bScrollable = bDelayActive = FALSE; } -BOOL FuPoor::MouseButtonDown(const MouseEvent& rMEvt) -{ +BOOL FuPoor::MouseButtonDown(const MouseEvent& rMEvt) +{ // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - return FALSE; + return FALSE; } /************************************************************************* @@ -1179,13 +1179,13 @@ void FuPoor::ImpForceQuadratic(Rectangle& rRect) if(rRect.GetWidth() > rRect.GetHeight()) { rRect = Rectangle( - Point(rRect.Left() + ((rRect.GetWidth() - rRect.GetHeight()) / 2), rRect.Top()), + Point(rRect.Left() + ((rRect.GetWidth() - rRect.GetHeight()) / 2), rRect.Top()), Size(rRect.GetHeight(), rRect.GetHeight())); } else { rRect = Rectangle( - Point(rRect.Left(), rRect.Top() + ((rRect.GetHeight() - rRect.GetWidth()) / 2)), + Point(rRect.Left(), rRect.Top() + ((rRect.GetHeight() - rRect.GetWidth()) / 2)), Size(rRect.GetWidth(), rRect.GetWidth())); } } @@ -1197,7 +1197,7 @@ void FuPoor::SwitchLayer (sal_Int32 nOffset) { if(mpViewShell && mpViewShell->ISA(DrawViewShell)) { - DrawViewShell* pDrawViewShell = + DrawViewShell* pDrawViewShell = static_cast<DrawViewShell*>(mpViewShell); // Calculate the new index. diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index 0d6f0b5aa565..410b55c2c0af 100644 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,8 +76,8 @@ SO2_DECL_REF(SvStorage) TYPEINIT1( FuPresentationLayout, FuPoor ); -#define POOL_BUFFER_SIZE (USHORT)32768 -#define DOCUMENT_BUFFER_SIZE (USHORT)32768 +#define POOL_BUFFER_SIZE (USHORT)32768 +#define DOCUMENT_BUFFER_SIZE (USHORT)32768 #define DOCUMENT_TOKEN (sal_Unicode('#')) /************************************************************************* @@ -147,9 +147,9 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) BOOL bCheckMasters = FALSE; // Dialog aufrufen - BOOL bLoad = FALSE; // tauchen neue Masterpages auf? + BOOL bLoad = FALSE; // tauchen neue Masterpages auf? String aFile; - + SfxItemSet aSet(mpDoc->GetPool(), ATTR_PRESLAYOUT_START, ATTR_PRESLAYOUT_END); aSet.Put( SfxBoolItem( ATTR_PRESLAYOUT_LOAD, bLoad)); @@ -157,8 +157,8 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) aSet.Put( SfxBoolItem( ATTR_PRESLAYOUT_CHECK_MASTERS, bCheckMasters ) ); aSet.Put( SfxStringItem( ATTR_PRESLAYOUT_NAME, aOldLayoutName)); - - + + const SfxItemSet *pArgs = rReq.GetArgs (); if (pArgs) @@ -249,7 +249,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) { if (mpViewShell->ISA(DrawViewShell)) { - ::sd::View* pView = + ::sd::View* pView = static_cast<DrawViewShell*>(mpViewShell)->GetView(); USHORT nPgNum = pSelectedPage->TRG_GetMasterPage().GetPageNum(); @@ -272,7 +272,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) // fake a mode change to repaint the page tab bar if( mpViewShell && mpViewShell->ISA( DrawViewShell ) ) { - DrawViewShell* pDrawViewSh = + DrawViewShell* pDrawViewSh = static_cast<DrawViewShell*>(mpViewShell); EditMode eMode = pDrawViewSh->GetEditMode(); BOOL bLayer = pDrawViewSh->IsLayerModeActive(); diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index d65bc8aaffe3..198861060b9c 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ TYPEINIT1( FuPresentationObjects, FuPoor ); FuPresentationObjects::FuPresentationObjects ( ViewShell* pViewSh, - ::sd::Window* pWin, + ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq) @@ -97,8 +97,8 @@ void FuPresentationObjects::DoExecute( SfxRequest& ) String aLayoutName = (((SfxStringItem&)aSet.Get(SID_STATUS_LAYOUT)).GetValue()); DBG_ASSERT(aLayoutName.Len(), "Layout unbestimmt"); - BOOL bUnique = FALSE; - sal_Int16 nDepth, nTmp; + BOOL bUnique = FALSE; + sal_Int16 nDepth, nTmp; OutlineView* pOlView = static_cast<OutlineView*>(pOutlineViewShell->GetView()); OutlinerView* pOutlinerView = pOlView->GetViewByWindow( (Window*) mpWindow ); ::Outliner* pOutl = pOutlinerView->GetOutliner(); @@ -132,7 +132,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& ) String aStyleName = aLayoutName; aStyleName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ) ); USHORT nDlgId = TAB_PRES_LAYOUT_TEMPLATE; - PresentationObjects ePO; + PresentationObjects ePO; if( bPage ) { diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx index dc5677c6ef2d..59572474143f 100644 --- a/sd/source/ui/func/fuscale.cxx +++ b/sd/source/ui/func/fuscale.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,10 +68,10 @@ TYPEINIT1( FuScale, FuPoor ); \************************************************************************/ FuScale::FuScale ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) { @@ -200,7 +200,7 @@ void FuScale::DoExecute( SfxRequest& rReq ) break; } } - + delete pZoomItem; } else if(mpViewShell && (pArgs->Count () == 1)) diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx index 04fcf124cc14..b7781d984735 100755 --- a/sd/source/ui/func/fusearch.cxx +++ b/sd/source/ui/func/fusearch.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 2ddf6a5fb885..5529033bc70c 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx index 76af1555c861..da8ab477d067 100644 --- a/sd/source/ui/func/fusldlg.cxx +++ b/sd/source/ui/func/fusldlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,11 +61,11 @@ TYPEINIT1( FuSlideShowDlg, FuPoor ); \************************************************************************/ FuSlideShowDlg::FuSlideShowDlg ( - ViewShell* pViewSh, + ViewShell* pViewSh, ::sd::Window* pWin, - ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq) + ::sd::View* pView, + SdDrawDocument* pDoc, + SfxRequest& rReq) : FuPoor( pViewSh, pWin, pView, pDoc, rReq ) { } @@ -81,13 +81,13 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) { PresentationSettings& rPresentationSettings = mpDoc->getPresentationSettings(); - SfxItemSet aDlgSet( mpDoc->GetPool(), ATTR_PRESENT_START, ATTR_PRESENT_END ); - List aPageNameList; - const String& rPresPage = rPresentationSettings.maPresPage; - String aFirstPage; - String aStandardName( SdResId( STR_PAGE ) ); - SdPage* pPage = NULL; - long nPage; + SfxItemSet aDlgSet( mpDoc->GetPool(), ATTR_PRESENT_START, ATTR_PRESENT_END ); + List aPageNameList; + const String& rPresPage = rPresentationSettings.maPresPage; + String aFirstPage; + String aStandardName( SdResId( STR_PAGE ) ); + SdPage* pPage = NULL; + long nPage; for( nPage = mpDoc->GetSdPageCount( PK_STANDARD ) - 1L; nPage >= 0L; nPage-- ) { @@ -146,9 +146,9 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) if( pDlg && (pDlg->Execute() == RET_OK) ) { rtl::OUString aPage; - long nValue32; + long nValue32; sal_Bool bValue; - bool bValuesChanged = FALSE; + bool bValuesChanged = FALSE; pDlg->GetAttr( aDlgSet ); diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx index fad1cb324fd2..e99220578998 100755 --- a/sd/source/ui/func/fusnapln.cxx +++ b/sd/source/ui/func/fusnapln.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,8 +76,8 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) { const SfxItemSet* pArgs = rReq.GetArgs(); SdrPageView* pPV = 0; - USHORT nHelpLine = 0; - BOOL bCreateNew = TRUE; + USHORT nHelpLine = 0; + BOOL bCreateNew = TRUE; // Get index of snap line or snap point from the request. SFX_REQUEST_ARG (rReq, pHelpLineIndex, SfxUInt32Item, ID_VAL_INDEX, FALSE); @@ -87,19 +87,19 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) // Reset the argument pointer to trigger the display of the dialog. pArgs = NULL; } - + if ( !pArgs ) { SfxItemSet aNewAttr(mpViewShell->GetPool(), ATTR_SNAPLINE_START, ATTR_SNAPLINE_END); bool bLineExist (false); pPV = mpView->GetSdrPageView(); Point aLinePos; - + if (pHelpLineIndex == NULL) { // The index of the snap line is not provided as argument to the // request. Determine it from the mouse position. - + aLinePos = static_cast<DrawViewShell*>(mpViewShell)->GetMousePos(); static_cast<DrawViewShell*>(mpViewShell)->SetMousePosFreezed( FALSE ); @@ -195,9 +195,9 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) switch ( (SnapKind) ((const SfxAllEnumItem&) pArgs->Get(ATTR_SNAPLINE_KIND)).GetValue() ) { - case SK_HORIZONTAL : eKind = SDRHELPLINE_HORIZONTAL; break; - case SK_VERTICAL : eKind = SDRHELPLINE_VERTICAL; break; - default : eKind = SDRHELPLINE_POINT; break; + case SK_HORIZONTAL : eKind = SDRHELPLINE_HORIZONTAL; break; + case SK_VERTICAL : eKind = SDRHELPLINE_VERTICAL; break; + default : eKind = SDRHELPLINE_POINT; break; } pPV->InsertHelpLine(SdrHelpLine(eKind, aHlpPos)); } diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx index 3ed152d1f862..015c4ceb3e19 100644 --- a/sd/source/ui/func/fusumry.cxx +++ b/sd/source/ui/func/fusumry.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,10 +60,10 @@ TYPEINIT1( FuSummaryPage, FuPoor ); |* \************************************************************************/ FuSummaryPage::FuSummaryPage ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) { diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index 43572c2af8a4..d9fda760f097 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -248,14 +248,14 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) String aStr; if( // if the object had no style sheet, allow all - !pOldStyleSheet || - + !pOldStyleSheet || + // allow if old and new style sheet has same family pStyleSheet->GetFamily() == pOldStyleSheet->GetFamily() || - + // allow if old was background objects and new is graphics pStyleSheet->GetFamily() == (SD_STYLE_FAMILY_GRAPHICS && pOldStyleSheet->GetHelpId( aStr ) == HID_PSEUDOSHEET_BACKGROUNDOBJECTS) || - + // allow if old was presentation and we are a drawing document (pOldStyleSheet->GetFamily() == SD_STYLE_FAMILY_MASTERPAGE && mpDoc->GetDocumentType() == DOCUMENT_TYPE_DRAW) ) { diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 2f3111665692..54b36a03f459 100755 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -116,7 +116,7 @@ static USHORT SidArray[] = { SID_SET_SUPER_SCRIPT, // 10294 SID_SET_SUB_SCRIPT, // 10295 SID_HYPERLINK_GETLINK, // 10361 - SID_CHARMAP, // 10503 + SID_CHARMAP, // 10503 SID_TEXTDIRECTION_LEFT_TO_RIGHT, // 10907 SID_TEXTDIRECTION_TOP_TO_BOTTOM, // 10908 SID_ATTR_PARA_LEFT_TO_RIGHT, // 10950 @@ -137,7 +137,7 @@ static BOOL bTestText = 0; |* \************************************************************************/ -FuText::FuText( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) +FuText::FuText( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) : FuConstruct(pViewSh, pWin, pView, pDoc, rReq) , bFirstObjCreated(FALSE) , rRequest (rReq) @@ -406,10 +406,10 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) // this caused SdrEndTextEdit() to be called also when not in text editing and // this does not make sense and caused troubles. (see issue 112855) -// ::Outliner* pOutl = mpView->GetTextEditOutliner(); -// -// if (mxTextObj.is() && (mxTextObj->GetOutlinerParaObject() || -// (pOutl && pOutl->GetText(pOutl->GetParagraph( 0 )).Len() != 0))) +// ::Outliner* pOutl = mpView->GetTextEditOutliner(); +// +// if (mxTextObj.is() && (mxTextObj->GetOutlinerParaObject() || +// (pOutl && pOutl->GetText(pOutl->GetParagraph( 0 )).Len() != 0))) if( mpView->IsTextEdit() ) { mpView->SdrEndTextEdit(); @@ -1005,8 +1005,8 @@ BOOL FuText::KeyInput(const KeyEvent& rKEvt) mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray ); -// if ( pTextObj ) -// pTextObj->SetEmptyPresObj(FALSE); +// if ( pTextObj ) +// pTextObj->SetEmptyPresObj(FALSE); } else if (aKeyCode == KEY_ESCAPE) { @@ -1411,7 +1411,7 @@ void FuText::DoubleClick(const MouseEvent& ) */ SdrObject* FuText::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) { - // case SID_TEXTEDIT: // BASIC ??? + // case SID_TEXTEDIT: // BASIC ??? // case SID_ATTR_CHAR: // case SID_ATTR_CHAR_VERTICAL: // case SID_TEXT_FITTOSIZE: @@ -1500,7 +1500,7 @@ void FuText::ChangeFontSize( bool bGrow, OutlinerView* pOLV, const FontList* pFo } else { -// SdDrawDocument* pDoc = pView->GetDoc(); +// SdDrawDocument* pDoc = pView->GetDoc(); const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); for( sal_uInt32 nMark = 0; nMark < rMarkList.GetMarkCount(); nMark++ ) @@ -1542,7 +1542,7 @@ void FuText::ChangeFontSize( bool bGrow, OutlinerView* pOLV, const FontList* pFo pTextObj->SetObjectItemNoBroadcast( aShapeSet.Get( EE_CHAR_FONTHEIGHT_CTL ) ); } } - } + } } } diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx index 2ec18c0f019a..b06ed4e28339 100644 --- a/sd/source/ui/func/futhes.cxx +++ b/sd/source/ui/func/futhes.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx index 31797f3c8a03..8e39dc38bc7a 100755 --- a/sd/source/ui/func/futransf.cxx +++ b/sd/source/ui/func/futransf.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/futxtatt.cxx b/sd/source/ui/func/futxtatt.cxx index f434f2790620..14b51c11a0d3 100644 --- a/sd/source/ui/func/futxtatt.cxx +++ b/sd/source/ui/func/futxtatt.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,10 +50,10 @@ TYPEINIT1( FuTextAttrDlg, FuPoor ); \************************************************************************/ FuTextAttrDlg::FuTextAttrDlg ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) { diff --git a/sd/source/ui/func/fuvect.cxx b/sd/source/ui/func/fuvect.cxx index 5a8419ba7822..09ff7dbd4b5c 100644 --- a/sd/source/ui/func/fuvect.cxx +++ b/sd/source/ui/func/fuvect.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,10 +62,10 @@ TYPEINIT1( FuVectorize, FuPoor ); \************************************************************************/ FuVectorize::FuVectorize ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor (pViewSh, pWin, pView, pDoc, rReq) { @@ -92,13 +92,13 @@ void FuVectorize::DoExecute( SfxRequest& ) AbstractSdVectorizeDlg* pDlg = pFact ? pFact->CreateSdVectorizeDlg( mpWindow, ( (SdrGrafObj*) pObj )->GetGraphic().GetBitmap(), mpDocSh ) : 0; if( pDlg && pDlg->Execute() == RET_OK ) { - const GDIMetaFile& rMtf = pDlg->GetGDIMetaFile(); - SdrPageView* pPageView = mpView->GetSdrPageView(); + const GDIMetaFile& rMtf = pDlg->GetGDIMetaFile(); + SdrPageView* pPageView = mpView->GetSdrPageView(); if( pPageView && rMtf.GetActionCount() ) { - SdrGrafObj* pVectObj = (SdrGrafObj*) pObj->Clone(); - String aStr( mpView->GetDescriptionOfMarkedObjects() ); + SdrGrafObj* pVectObj = (SdrGrafObj*) pObj->Clone(); + String aStr( mpView->GetDescriptionOfMarkedObjects() ); aStr.Append( sal_Unicode(' ') ); aStr.Append( String( SdResId( STR_UNDO_VECTORIZE ) ) ); diff --git a/sd/source/ui/func/fuzoom.cxx b/sd/source/ui/func/fuzoom.cxx index 390522cc33ca..e3a71a48bdf9 100644 --- a/sd/source/ui/func/fuzoom.cxx +++ b/sd/source/ui/func/fuzoom.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,8 +68,8 @@ FuZoom::FuZoom( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq) + SdDrawDocument* pDoc, + SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq), bVisible(FALSE), bStartDrag(FALSE) diff --git a/sd/source/ui/func/sdundo.cxx b/sd/source/ui/func/sdundo.cxx index 83619cc0efe9..657e88c383fd 100644 --- a/sd/source/ui/func/sdundo.cxx +++ b/sd/source/ui/func/sdundo.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/sdundogr.cxx b/sd/source/ui/func/sdundogr.cxx index 7b7a361bba80..11b8b70d1ed0 100755 --- a/sd/source/ui/func/sdundogr.cxx +++ b/sd/source/ui/func/sdundogr.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,14 +63,14 @@ BOOL SdUndoGroup::Merge( SfxUndoAction* pNextAction ) if( pNextAction && pNextAction->ISA( SdUndoAction ) ) { SdUndoAction* pClone = static_cast< SdUndoAction* >( pNextAction )->Clone(); - + if( pClone ) { AddAction( pClone ); bRet = TRUE; } } - + return bRet; } diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx index a8b6c0647237..ff5459e8df08 100755 --- a/sd/source/ui/func/smarttag.cxx +++ b/sd/source/ui/func/smarttag.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -284,8 +284,8 @@ bool SmartTagSet::KeyInput( const KeyEvent& rKEvt ) return true; } } - - + + return false; } @@ -335,7 +335,7 @@ bool SmartTagSet::Command( const CommandEvent& rCEvt ) { if( mxSelectedTag.is() ) return mxSelectedTag->Command( rCEvt ); - + } return false; @@ -404,7 +404,7 @@ ULONG SmartTagSet::GetMarkedPointCount() const BOOL SmartTagSet::IsPointMarkable(const SdrHdl& rHdl) const { const SmartHdl* pSmartHdl = dynamic_cast< const SmartHdl* >( &rHdl ); - + return pSmartHdl && pSmartHdl->isMarkable(); } @@ -450,7 +450,7 @@ SmartHdl::SmartHdl( const SmartTagReference& xTag, const Point& rPnt, SdrHdlKind : SdrHdl( rPnt, eNewKind ) , mxTag( xTag ) { -} +} // -------------------------------------------------------------------- diff --git a/sd/source/ui/func/undoback.cxx b/sd/source/ui/func/undoback.cxx index 7f0245c50cda..596550a79572 100644 --- a/sd/source/ui/func/undoback.cxx +++ b/sd/source/ui/func/undoback.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,10 +42,10 @@ TYPEINIT1( SdBackgroundObjUndoAction, SdUndoAction ); // ----------------------------------------------------------------------------- -SdBackgroundObjUndoAction::SdBackgroundObjUndoAction( - SdDrawDocument& rDoc, +SdBackgroundObjUndoAction::SdBackgroundObjUndoAction( + SdDrawDocument& rDoc, SdPage& rPage, - const SfxItemSet& rItenSet) + const SfxItemSet& rItenSet) : SdUndoAction(&rDoc), mrPage(rPage), mpItemSet(new SfxItemSet(rItenSet)) diff --git a/sd/source/ui/func/undoheaderfooter.cxx b/sd/source/ui/func/undoheaderfooter.cxx index 778bd3056027..2d834891d53a 100644 --- a/sd/source/ui/func/undoheaderfooter.cxx +++ b/sd/source/ui/func/undoheaderfooter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,8 +39,8 @@ TYPEINIT1(SdHeaderFooterUndoAction, SdUndoAction); -SdHeaderFooterUndoAction::SdHeaderFooterUndoAction( SdDrawDocument* pDoc, SdPage* pPage, const sd::HeaderFooterSettings& rNewSettings ) -: SdUndoAction(pDoc), +SdHeaderFooterUndoAction::SdHeaderFooterUndoAction( SdDrawDocument* pDoc, SdPage* pPage, const sd::HeaderFooterSettings& rNewSettings ) +: SdUndoAction(pDoc), mpPage(pPage), maOldSettings(pPage->getHeaderFooterSettings()), maNewSettings(rNewSettings) diff --git a/sd/source/ui/func/undolayer.cxx b/sd/source/ui/func/undolayer.cxx index 4739ae9b5c16..197ad1ae9138 100644 --- a/sd/source/ui/func/undolayer.cxx +++ b/sd/source/ui/func/undolayer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,11 +38,11 @@ TYPEINIT1(SdLayerModifyUndoAction, SdUndoAction); -SdLayerModifyUndoAction::SdLayerModifyUndoAction( +SdLayerModifyUndoAction::SdLayerModifyUndoAction( SdDrawDocument* _pDoc, SdrLayer* pLayer, const String& rOldLayerName, const String& rOldLayerTitle, const String& rOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool bOldIsPrintable, const String& rNewLayerName, const String& rNewLayerTitle, const String& rNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool bNewIsPrintable ) -: SdUndoAction( _pDoc ), +: SdUndoAction( _pDoc ), mpLayer( pLayer ), maOldLayerName( rOldLayerName ), maOldLayerTitle( rOldLayerTitle ), @@ -66,7 +66,7 @@ void SdLayerModifyUndoAction::Undo() ::sd::DrawDocShell* mpDocSh = mpDoc->GetDocSh(); if( mpDocSh ) { - ::sd::DrawViewShell* pDrViewSh = + ::sd::DrawViewShell* pDrViewSh = PTR_CAST(::sd::DrawViewShell, mpDocSh->GetViewShell() ); if( pDrViewSh ) { @@ -80,7 +80,7 @@ void SdLayerModifyUndoAction::Redo() ::sd::DrawDocShell* mpDocSh = mpDoc->GetDocSh(); if( mpDocSh ) { - ::sd::DrawViewShell* pDrViewSh = + ::sd::DrawViewShell* pDrViewSh = PTR_CAST(::sd::DrawViewShell, mpDocSh->GetViewShell() ); if( pDrViewSh ) { diff --git a/sd/source/ui/func/undopage.cxx b/sd/source/ui/func/undopage.cxx index 2da4d6260834..a11ea92f3651 100644 --- a/sd/source/ui/func/undopage.cxx +++ b/sd/source/ui/func/undopage.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/unmovss.cxx b/sd/source/ui/func/unmovss.cxx index 2ccaa4da19cb..5f16a7260f36 100644 --- a/sd/source/ui/func/unmovss.cxx +++ b/sd/source/ui/func/unmovss.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ void SdMoveStyleSheetsUndoAction::Undo() if (mbMySheets) { - // the styles have to be inserted in the pool + // the styles have to be inserted in the pool // first insert all styles to the pool for(SdStyleSheetVector::iterator iter = maStyles.begin(); iter != maStyles.end(); iter++ ) diff --git a/sd/source/ui/func/unoaprms.cxx b/sd/source/ui/func/unoaprms.cxx index 933e961ed927..b6a5299470fd 100755 --- a/sd/source/ui/func/unoaprms.cxx +++ b/sd/source/ui/func/unoaprms.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,26 +48,26 @@ void SdAnimationPrmsUndoAction::Undo() // keine neu Info erzeugt: Daten restaurieren if (!bInfoCreated) { - SdDrawDocument* pDoc = (SdDrawDocument*)pObject->GetModel(); + SdDrawDocument* pDoc = (SdDrawDocument*)pObject->GetModel(); if( pDoc ) { SdAnimationInfo* pInfo = pDoc->GetAnimationInfo( pObject ); // So nicht... //SdAnimationInfo* pInfo = (SdAnimationInfo*)pObject->GetUserData(0); - pInfo->mbActive = bOldActive; + pInfo->mbActive = bOldActive; pInfo->meEffect = eOldEffect; pInfo->meTextEffect = eOldTextEffect; - pInfo->meSpeed = eOldSpeed; + pInfo->meSpeed = eOldSpeed; pInfo->mbDimPrevious = bOldDimPrevious; pInfo->maDimColor = aOldDimColor; pInfo->mbDimHide = bOldDimHide; pInfo->mbSoundOn = bOldSoundOn; pInfo->maSoundFile = aOldSoundFile; pInfo->mbPlayFull = bOldPlayFull; -// pInfo->mSetPath(pOldPathObj); +// pInfo->mSetPath(pOldPathObj); pInfo->meClickAction = eOldClickAction; pInfo->SetBookmark( aOldBookmark ); -// pInfo->mbInvisibleInPresentation = bOldInvisibleInPres; +// pInfo->mbInvisibleInPresentation = bOldInvisibleInPres; pInfo->mnVerb = nOldVerb; pInfo->mnPresOrder = nOldPresOrder; @@ -110,10 +110,10 @@ void SdAnimationPrmsUndoAction::Redo() pInfo->mbSoundOn = bNewSoundOn; pInfo->maSoundFile = aNewSoundFile; pInfo->mbPlayFull = bNewPlayFull; -// pInfo->mSetPath(pNewPathObj); +// pInfo->mSetPath(pNewPathObj); pInfo->meClickAction = eNewClickAction; pInfo->SetBookmark( aNewBookmark ); -// pInfo->mbInvisibleInPresentation = bNewInvisibleInPres; +// pInfo->mbInvisibleInPresentation = bNewInvisibleInPres; pInfo->mnVerb = nNewVerb; pInfo->mnPresOrder = nNewPresOrder; diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx index ec0b223cf6a8..6fe9799f4644 100644 --- a/sd/source/ui/func/unprlout.cxx +++ b/sd/source/ui/func/unprlout.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/3dchld.hxx b/sd/source/ui/inc/3dchld.hxx index d90d52704b0d..2578c16a9adc 100644 --- a/sd/source/ui/inc/3dchld.hxx +++ b/sd/source/ui/inc/3dchld.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,5 +46,5 @@ class Sd3DChildWindow : public SfxChildWindow SFX_DECL_CHILDWINDOW(Sd3DChildWindow); }; -#endif // _SD_3DCHLD_HXX +#endif // _SD_3DCHLD_HXX diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index b070db968959..3403703a1021 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,18 +72,18 @@ namespace accessibility { <p>This class implements three kinds of listeners: <ol><li>The property change listener is not used directly but exists as - convenience for derived classes. May be moved to those classes + convenience for derived classes. May be moved to those classes instead.</li> <li>As window listener it waits for changes of the window geometry and forwards those as view forwarder changes.</li> <li>As focus listener it keeps track of the focus to give this class and derived classes the oportunity to set and remove the focus to/from shapes.</li> - </ol> + </ol> </p> */ class AccessibleDocumentViewBase - : public AccessibleContextBase, + : public AccessibleContextBase, public AccessibleComponentBase, public AccessibleSelectionBase, public IAccessibleViewForwarderListener, @@ -114,7 +114,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent); - virtual ~AccessibleDocumentViewBase (void); + virtual ~AccessibleDocumentViewBase (void); /** Initialize a new object. Call this method directly after creating a new object. It finished the initialization begun in the constructor @@ -134,7 +134,7 @@ public: windowResized... methods it will be sufficient in most cases just to overload this method. */ - virtual void ViewForwarderChanged (ChangeType aChangeType, + virtual void ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder); //===== XAccessibleContext ============================================== @@ -163,42 +163,42 @@ public: //===== XAccessibleComponent ============================================ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint (const ::com::sun::star::awt::Point& aPoint) + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::accessibility::XAccessible > SAL_CALL + getAccessibleAtPoint (const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) + virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) throw (::com::sun::star::uno::RuntimeException); //===== XInterface ====================================================== - + virtual com::sun::star::uno::Any SAL_CALL queryInterface (const com::sun::star::uno::Type & rType) throw (::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL - acquire (void) + acquire (void) throw (); - + virtual void SAL_CALL release (void) throw (); - - + + //===== XServiceInfo ==================================================== - - /** Returns an identifier for the implementation of this object. + + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName (void) @@ -210,7 +210,7 @@ public: //===== XTypeProvider =================================================== - + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes (void) throw (::com::sun::star::uno::RuntimeException); @@ -232,48 +232,48 @@ public: //===== XWindowListener ================================================= - virtual void SAL_CALL - windowResized (const ::com::sun::star::awt::WindowEvent& e) + virtual void SAL_CALL + windowResized (const ::com::sun::star::awt::WindowEvent& e) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL - windowMoved (const ::com::sun::star::awt::WindowEvent& e) + virtual void SAL_CALL + windowMoved (const ::com::sun::star::awt::WindowEvent& e) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL - windowShown (const ::com::sun::star::lang::EventObject& e) + virtual void SAL_CALL + windowShown (const ::com::sun::star::lang::EventObject& e) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL - windowHidden (const ::com::sun::star::lang::EventObject& e) + virtual void SAL_CALL + windowHidden (const ::com::sun::star::lang::EventObject& e) throw (::com::sun::star::uno::RuntimeException); //===== XFocusListener ================================================= virtual void SAL_CALL focusGained (const ::com::sun::star::awt::FocusEvent& e) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL focusLost (const ::com::sun::star::awt::FocusEvent& e) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException); private: // return the member maMutex; - virtual ::osl::Mutex& + virtual ::osl::Mutex& implGetMutex(); - + // return ourself as context in default case - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > - implGetAccessibleContext() + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + implGetAccessibleContext() throw ( ::com::sun::star::uno::RuntimeException ); // return sal_False in default case - virtual sal_Bool - implIsSelected( sal_Int32 nAccessibleChildIndex ) + virtual sal_Bool + implIsSelected( sal_Int32 nAccessibleChildIndex ) throw (::com::sun::star::uno::RuntimeException); // return nothing in default case virtual void - implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect ) + implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); protected: @@ -289,7 +289,7 @@ protected: mxController; /// Model of the document. - ::com::sun::star::uno::Reference < ::com::sun::star::frame::XModel> + ::com::sun::star::uno::Reference < ::com::sun::star::frame::XModel> mxModel; // Bundle of information that is passed down the shape tree. @@ -302,7 +302,7 @@ protected: <member>SetAccessibleOLEObject</member> method. */ ::com::sun::star::uno::Reference < - ::com::sun::star::accessibility::XAccessible> + ::com::sun::star::accessibility::XAccessible> mxAccessibleOLEObject; Link maWindowLink; @@ -311,7 +311,7 @@ protected: // disposing. virtual void SAL_CALL disposing (void); - /** Create a name string. The current name is not modified and, + /** Create a name string. The current name is not modified and, therefore, no events are send. This method is usually called once by the <member>getAccessibleName</member> method of the base class. @return @@ -321,7 +321,7 @@ protected: CreateAccessibleName () throw (::com::sun::star::uno::RuntimeException); - /** Create a description string. The current description is not + /** Create a description string. The current description is not modified and, therefore, no events are send. This method is usually called once by the <member>getAccessibleDescription</member> method of the base class. @@ -336,7 +336,7 @@ protected: document has been activated. Can be used to send FOCUSED state changes for the currently selected element. - Note: Currently used as a substitute for FocusGained. Should be + Note: Currently used as a substitute for FocusGained. Should be renamed in the future. */ virtual void Activated (void); @@ -345,7 +345,7 @@ protected: this document has been deactivated. Can be used to send FOCUSED state changes for the currently selected element. - Note: Currently used as a substitute for FocusLost. Should be + Note: Currently used as a substitute for FocusLost. Should be renamed in the future. */ virtual void Deactivated (void); diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx index 512520266ef2..a47db2a659e2 100644 --- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx +++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace accessibility { Please see the documentation of the base class for further explanations of the individual methods. */ -class AccessibleDrawDocumentView : +class AccessibleDrawDocumentView : public AccessibleDocumentViewBase { public: @@ -54,7 +54,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent); - virtual ~AccessibleDrawDocumentView (void); + virtual ~AccessibleDrawDocumentView (void); /** Complete the initialization begun in the constructor. */ @@ -63,7 +63,7 @@ public: //===== IAccessibleViewForwarderListener ================================ - virtual void ViewForwarderChanged (ChangeType aChangeType, + virtual void ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder); //===== XAccessibleContext ============================================== @@ -94,7 +94,7 @@ public: protected: //===== XServiceInfo ==================================================== - + virtual ::rtl::OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); @@ -104,8 +104,8 @@ protected: throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool - implIsSelected( sal_Int32 nAccessibleChildIndex ) + virtual sal_Bool + implIsSelected( sal_Int32 nAccessibleChildIndex ) throw (::com::sun::star::uno::RuntimeException); /** Select or deselect the specified child or all children if the given @@ -122,7 +122,7 @@ protected: reps. children. */ virtual void - implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect ) + implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); protected: @@ -140,12 +140,12 @@ protected: */ AccessiblePageShape* CreateDrawPageShape (void); - /// Create an accessible name that contains the current view mode. + /// Create an accessible name that contains the current view mode. virtual ::rtl::OUString CreateAccessibleName () throw (::com::sun::star::uno::RuntimeException); - /** Create an accessible description that contains the current + /** Create an accessible description that contains the current view mode. */ virtual ::rtl::OUString @@ -163,7 +163,7 @@ protected: virtual void Deactivated (void); virtual void impl_dispose (void); - + private: void UpdateAccessibleName (void); }; diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx index a398d31ffbda..8d51efaeb2a1 100644 --- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx +++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,10 +42,10 @@ class SdrOutliner; class SdrView; class Window; -namespace accessibility +namespace accessibility { - /** Implementation of the SvxEditSource interface in the SdOutlineView - + /** Implementation of the SvxEditSource interface in the SdOutlineView + This class connects the SdOutlineView and its EditEngine outliner with the AccessibleTextHelper, which provides all necessary functionality to make the outliner text accessible @@ -53,33 +53,33 @@ namespace accessibility @see SvxEditSource @see SvxViewForwarder */ - class AccessibleOutlineEditSource : public SvxEditSource, public SvxViewForwarder, public SfxBroadcaster, public SfxListener + class AccessibleOutlineEditSource : public SvxEditSource, public SvxViewForwarder, public SfxBroadcaster, public SfxListener { public: /// Create an SvxEditSource interface for the given Outliner - AccessibleOutlineEditSource( - SdrOutliner& rOutliner, - SdrView& rView, - OutlinerView& rOutlView, + AccessibleOutlineEditSource( + SdrOutliner& rOutliner, + SdrView& rView, + OutlinerView& rOutlView, const ::Window& rViewWindow ); virtual ~AccessibleOutlineEditSource(); /// This method is disabled and always returns NULL - virtual SvxEditSource* Clone() const; - virtual SvxTextForwarder* GetTextForwarder(); - virtual SvxViewForwarder* GetViewForwarder(); - virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False ); - virtual void UpdateData(); - virtual SfxBroadcaster& GetBroadcaster() const; - - // the view forwarder - virtual BOOL IsValid() const; - virtual Rectangle GetVisArea() const; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; + virtual SvxEditSource* Clone() const; + virtual SvxTextForwarder* GetTextForwarder(); + virtual SvxViewForwarder* GetViewForwarder(); + virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False ); + virtual void UpdateData(); + virtual SfxBroadcaster& GetBroadcaster() const; + + // the view forwarder + virtual BOOL IsValid() const; + virtual Rectangle GetVisArea() const; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; // SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); private: @@ -89,13 +89,13 @@ namespace accessibility DECL_LINK( NotifyHdl, EENotify* ); - SdrView& mrView; + SdrView& mrView; const ::Window& mrWindow; - SdrOutliner* mpOutliner; + SdrOutliner* mpOutliner; OutlinerView* mpOutlinerView; - SvxOutlinerForwarder mTextForwarder; - SvxDrawOutlinerViewForwarder mViewForwarder; + SvxOutlinerForwarder mTextForwarder; + SvxDrawOutlinerViewForwarder mViewForwarder; }; diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index 44e705f6dce5..727e544eedce 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent); - virtual ~AccessibleOutlineView (void); + virtual ~AccessibleOutlineView (void); /** Complete the initialization begun in the constructor. */ @@ -67,7 +67,7 @@ public: //===== IAccessibleViewForwarderListener ================================ - virtual void ViewForwarderChanged (ChangeType aChangeType, + virtual void ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder); //===== XAccessibleContext ============================================== @@ -82,24 +82,24 @@ public: //===== XAccessibleEventBroadcaster ======================================== - virtual void SAL_CALL + virtual void SAL_CALL addEventListener ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) + const ::com::sun::star::uno::Reference< + ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL - removeEventListener ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) + virtual void SAL_CALL + removeEventListener ( + const ::com::sun::star::uno::Reference< + ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) throw (::com::sun::star::uno::RuntimeException); using cppu::WeakComponentImplHelperBase::addEventListener; using cppu::WeakComponentImplHelperBase::removeEventListener; //===== XServiceInfo ==================================================== - - /** Returns an identifier for the implementation of this object. + + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName (void) @@ -136,13 +136,13 @@ protected: // This method is called from the component helper base class while disposing. virtual void SAL_CALL disposing (void); - /// Create an accessible name that contains the current view mode. + /// Create an accessible name that contains the current view mode. virtual ::rtl::OUString CreateAccessibleName () throw (::com::sun::star::uno::RuntimeException); - /// Create an accessible description that contains the current - /// view mode. + /// Create an accessible description that contains the current + /// view mode. virtual ::rtl::OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx index e92bbfb91f41..9430b79805b8 100644 --- a/sd/source/ui/inc/AccessiblePageShape.hxx +++ b/sd/source/ui/inc/AccessiblePageShape.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace accessibility { /** A page shape represents the actual page as seen on the screen. */ class AccessiblePageShape - : public AccessibleShape + : public AccessibleShape { public: //===== internal ======================================================== @@ -85,12 +85,12 @@ public: //===== XAccessibleContext ============================================== - /// Returns always 0 because there can be no children. + /// Returns always 0 because there can be no children. virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) throw (); - - /** Return the specified child. + + /** Return the specified child. @param nIndex Index of the requested child. @return @@ -100,31 +100,31 @@ public: Throws always an exception because there are no children. */ virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> SAL_CALL + ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException); //===== XAccessibleComponent ============================================ - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground (void) throw (::com::sun::star::uno::RuntimeException); //===== XComponent ====================================================== - virtual void SAL_CALL - dispose (void) + virtual void SAL_CALL + dispose (void) throw (::com::sun::star::uno::RuntimeException); //===== XServiceInfo ==================================================== - + virtual ::rtl::OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); @@ -136,15 +136,15 @@ public: //===== lang::XEventListener ============================================ - virtual void SAL_CALL - disposing (const ::com::sun::star::lang::EventObject& Source) + virtual void SAL_CALL + disposing (const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException); using AccessibleShape::disposing; protected: - /** Create a base name string that contains the accessible name. + /** Create a base name string that contains the accessible name. */ virtual ::rtl::OUString CreateAccessibleBaseName (void) @@ -154,7 +154,7 @@ protected: CreateAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); - /// Create a description string that contains the accessible description. + /// Create a description string that contains the accessible description. virtual ::rtl::OUString CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); @@ -162,8 +162,8 @@ protected: private: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage> mxPage; - - /** Don't use the default constructor. Use the public constructor that + + /** Don't use the default constructor. Use the public constructor that takes the original shape and the parent as arguments instead. */ explicit AccessiblePageShape (void); diff --git a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx index 93c8f33444f2..7be7a2351aa0 100644 --- a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,10 +33,10 @@ namespace accessibility { -/** This class makes Impress shapes accessible. +/** This class makes Impress shapes accessible. */ class AccessiblePresentationGraphicShape - : public AccessibleGraphicShape + : public AccessibleGraphicShape { public: //===== internal ======================================================== @@ -46,8 +46,8 @@ public: virtual ~AccessiblePresentationGraphicShape (void); //===== XServiceInfo ==================================================== - - /** Returns an identifier for the implementation of this object. + + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName (void) @@ -55,12 +55,12 @@ public: //===== internal ======================================================== - /// Create a name string that contains the accessible name. + /// Create a name string that contains the accessible name. virtual ::rtl::OUString CreateAccessibleBaseName () throw (::com::sun::star::uno::RuntimeException); - /// Create a description string that contains the accessible description. + /// Create a description string that contains the accessible description. virtual ::rtl::OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx index e03ed7ef4374..4d5850166a98 100644 --- a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,10 +33,10 @@ namespace accessibility { -/** This class makes Impress shapes accessible. +/** This class makes Impress shapes accessible. */ class AccessiblePresentationOLEShape - : public AccessibleOLEShape + : public AccessibleOLEShape { public: //===== internal ======================================================== @@ -46,8 +46,8 @@ public: virtual ~AccessiblePresentationOLEShape (void); //===== XServiceInfo ==================================================== - - /** Returns an identifier for the implementation of this object. + + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName (void) @@ -55,12 +55,12 @@ public: //===== internal ======================================================== - /// Create a name string that contains the accessible name. + /// Create a name string that contains the accessible name. virtual ::rtl::OUString CreateAccessibleBaseName () throw (::com::sun::star::uno::RuntimeException); - /// Create a description string that contains the accessible description. + /// Create a description string that contains the accessible description. virtual ::rtl::OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/AccessiblePresentationShape.hxx b/sd/source/ui/inc/AccessiblePresentationShape.hxx index 7d716e657b1f..0e75d8fb8f96 100644 --- a/sd/source/ui/inc/AccessiblePresentationShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationShape.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,10 +32,10 @@ namespace accessibility { -/** This class makes Impress shapes accessible. +/** This class makes Impress shapes accessible. */ class AccessiblePresentationShape - : public AccessibleShape + : public AccessibleShape { public: //===== internal ======================================================== @@ -45,8 +45,8 @@ public: virtual ~AccessiblePresentationShape (void); //===== XServiceInfo ==================================================== - - /** Returns an identifier for the implementation of this object. + + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName (void) @@ -54,18 +54,18 @@ public: //===== internal ======================================================== - /// Create a name string that contains the accessible name. + /// Create a name string that contains the accessible name. virtual ::rtl::OUString CreateAccessibleBaseName () throw (::com::sun::star::uno::RuntimeException); - /// Create a description string that contains the accessible description. + /// Create a description string that contains the accessible description. virtual ::rtl::OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); private: - /** Don't use the default constructor. Use the public constructor that + /** Don't use the default constructor. Use the public constructor that takes the original shape and the parent as arguments instead. */ AccessiblePresentationShape (void); diff --git a/sd/source/ui/inc/AccessibleScrollPanel.hxx b/sd/source/ui/inc/AccessibleScrollPanel.hxx index ff77be75885a..ff73f55d1c91 100644 --- a/sd/source/ui/inc/AccessibleScrollPanel.hxx +++ b/sd/source/ui/inc/AccessibleScrollPanel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,11 +52,11 @@ public: //===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or throw exception. + /// Return the specified child or throw exception. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) @@ -65,7 +65,7 @@ public: //===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName (void) diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index 7049aff02094..8e23870eaf58 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ class SlideSorter; namespace accessibility { -typedef ::cppu::WeakComponentImplHelper5< +typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleEventBroadcaster, ::com::sun::star::accessibility::XAccessibleContext, @@ -86,7 +86,7 @@ public: /** The page number as given to the constructor. */ sal_uInt16 GetPageNumber (void) const; - + void FireAccessibleEvent ( short nEventId, const ::com::sun::star::uno::Any& rOldValue, @@ -103,14 +103,14 @@ public: getAccessibleContext (void) throw (::com::sun::star::uno::RuntimeException); - + //===== XAccessibleEventBroadcaster ======================================= virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) throw (::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< @@ -119,7 +119,7 @@ public: using cppu::WeakComponentImplHelperBase::addEventListener; using cppu::WeakComponentImplHelperBase::removeEventListener; - + //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL @@ -133,7 +133,7 @@ public: getAccessibleParent (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) throw (::com::sun::star::uno::RuntimeException); @@ -166,46 +166,46 @@ public: //===== XAccessibleComponent ================================================ virtual sal_Bool SAL_CALL containsPoint ( - const ::com::sun::star::awt::Point& aPoint) + const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint ( - const ::com::sun::star::awt::Point& aPoint) + const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) + virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus (void) + virtual void SAL_CALL grabFocus (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground (void) throw (::com::sun::star::uno::RuntimeException); - + //===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - /** Return whether the specified service is supported by this class. + /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const ::rtl::OUString& sServiceName) @@ -234,7 +234,7 @@ private: throw (::com::sun::star::lang::DisposedException); /** Check whether or not the object has been disposed (or is in the - state of beeing disposed). + state of beeing disposed). @return sal_True, if the object is disposed or in the course of being disposed. Otherwise, sal_False is returned. diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index 16804e79cb8f..5890e295b1b2 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ namespace accessibility { class AccessibleSlideSorterObject; -typedef ::cppu::WeakComponentImplHelper6< +typedef ::cppu::WeakComponentImplHelper6< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleEventBroadcaster, ::com::sun::star::accessibility::XAccessibleContext, @@ -76,7 +76,7 @@ public: ::sd::slidesorter::SlideSorter& rSlideSorter, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> & rxParent, ::Window* pParentWindow); - + virtual ~AccessibleSlideSorterView (void); /** This method acts like a dispose call. It sends a disposing to all @@ -96,7 +96,7 @@ public: Index of the child for which to return the implementation object. */ AccessibleSlideSorterObject* GetAccessibleChildImplementation (sal_Int32 nIndex); - + //===== XAccessible ======================================================= virtual ::com::sun::star::uno::Reference< @@ -104,14 +104,14 @@ public: getAccessibleContext (void) throw (::com::sun::star::uno::RuntimeException); - + //===== XAccessibleEventBroadcaster ======================================= virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) throw (::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< @@ -120,56 +120,56 @@ public: using cppu::WeakComponentImplHelperBase::addEventListener; using cppu::WeakComponentImplHelperBase::removeEventListener; - + //===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or throw exception. + /// Return the specified child or throw exception. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - /// Return a reference to the parent. + /// Return a reference to the parent. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) throw (::com::sun::star::uno::RuntimeException); - /// Return this objects index among the parents children. - virtual sal_Int32 SAL_CALL + /// Return this objects index among the parents children. + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) throw (::com::sun::star::uno::RuntimeException); - /// Return this object's role. + /// Return this object's role. virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException); - /// Return this object's description. + /// Return this object's description. virtual ::rtl::OUString SAL_CALL getAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current name. + /// Return the object's current name. virtual ::rtl::OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); - /// Return NULL to indicate that an empty relation set. + /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) throw (::com::sun::star::uno::RuntimeException); - /// Return the set of current states. + /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet (void) throw (::com::sun::star::uno::RuntimeException); - /** Return the parents locale or throw exception if this object has no + /** Return the parents locale or throw exception if this object has no parent yet/anymore. */ virtual ::com::sun::star::lang::Locale SAL_CALL @@ -184,15 +184,15 @@ public: inside this object. */ virtual sal_Bool SAL_CALL containsPoint ( - const ::com::sun::star::awt::Point& aPoint) + const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException); /** The default implementation returns an empty reference. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint ( - const ::com::sun::star::awt::Point& aPoint) + const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException); /** The default implementation returns an empty rectangle. @@ -203,82 +203,82 @@ public: /** The default implementation uses the result of <member>getBounds</member> to determine the location. */ - virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) throw (::com::sun::star::uno::RuntimeException); /** The default implementation returns an empty position, i.e. the * result of the default constructor of <type>com::sun::star::awt::Point</type>. */ - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) throw (::com::sun::star::uno::RuntimeException); /** The default implementation uses the result of <member>getBounds</member> to determine the size. */ - virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) + virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) throw (::com::sun::star::uno::RuntimeException); /** The default implementation does nothing. */ - virtual void SAL_CALL grabFocus (void) + virtual void SAL_CALL grabFocus (void) throw (::com::sun::star::uno::RuntimeException); /** Returns black as the default foreground color. */ - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground (void) throw (::com::sun::star::uno::RuntimeException); /** Returns white as the default background color. */ - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground (void) throw (::com::sun::star::uno::RuntimeException); - + //===== XAccessibleSelection ============================================== virtual void SAL_CALL selectAccessibleChild (sal_Int32 nChildIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException); - + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - + //===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - /** Return whether the specified service is supported by this class. + /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const ::rtl::OUString& sServiceName) @@ -290,7 +290,7 @@ public: getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); - + private: class Implementation; ::std::auto_ptr<Implementation> mpImpl; @@ -313,7 +313,7 @@ private: throw (::com::sun::star::lang::DisposedException); /** Check whether or not the object has been disposed (or is in the - state of beeing disposed). + state of beeing disposed). @return sal_True, if the object is disposed or in the course of being disposed. Otherwise, sal_False is returned. diff --git a/sd/source/ui/inc/AccessibleSlideView.hxx b/sd/source/ui/inc/AccessibleSlideView.hxx index f98d345c2019..682c9ba022a1 100644 --- a/sd/source/ui/inc/AccessibleSlideView.hxx +++ b/sd/source/ui/inc/AccessibleSlideView.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ class Window; // - AccessibleSlideViewObject - // ----------------------------- -class AccessibleSlideViewObject : public ::cppu::WeakImplHelper6< +class AccessibleSlideViewObject : public ::cppu::WeakImplHelper6< ::com::sun::star::lang::XUnoTunnel, ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleEventBroadcaster, @@ -68,8 +68,8 @@ private: AccessibleSlideView* mpManager; /// client id in the AccessibleEventNotifier queue sal_uInt32 mnClientId; - sal_uInt16 mnPage; - sal_Bool mbVisible; + sal_uInt16 mnPage; + sal_Bool mbVisible; sal_Bool mbValid; private: @@ -108,21 +108,21 @@ private: virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground (void) throw (::com::sun::star::uno::RuntimeException); //===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - /** Return whether the specified service is supported by this class. + /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const ::rtl::OUString& sServiceName) @@ -137,9 +137,9 @@ private: public: static AccessibleSlideViewObject* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw(); - -public: - + +public: + AccessibleSlideViewObject( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent, sal_uInt16 nPage, sal_Bool bVisible ); ~AccessibleSlideViewObject(); @@ -151,16 +151,16 @@ public: void Destroyed (void); sal_uInt16 GetPageNum() const { return mnPage; } - - void SetVisible( sal_Bool bVisible ); - sal_Bool IsVisible() const; + + void SetVisible( sal_Bool bVisible ); + sal_Bool IsVisible() const; }; // ----------------------- // - AccessibleSlideView - // ----------------------- -class AccessibleSlideView : public ::cppu::WeakImplHelper7< +class AccessibleSlideView : public ::cppu::WeakImplHelper7< ::com::sun::star::lang::XUnoTunnel, ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleEventBroadcaster, @@ -174,8 +174,8 @@ public: static AccessibleSlideView* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw(); AccessibleSlideView( - SdDrawDocument& rDoc, - ::sd::SlideView& rView, + SdDrawDocument& rDoc, + ::sd::SlideView& rView, ::sd::Window& rParentWindow); virtual ~AccessibleSlideView (void); @@ -190,8 +190,8 @@ public: ::sd::SlideView* GetSlideView() const { return mpView; } ::sd::Window* GetParentWindow() const { return mpParentWindow; } - void SetPageVisible( sal_uInt16 nPage, sal_Bool bVisible ); - void Reset(); + void SetPageVisible( sal_uInt16 nPage, sal_Bool bVisible ); + void Reset(); void FocusHasChanged( USHORT nOldFocusPage, USHORT nNewFocusPage ); @@ -240,10 +240,10 @@ private: virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground (void) throw (::com::sun::star::uno::RuntimeException); // XAccessibleSelection @@ -257,13 +257,13 @@ private: //===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - /** Return whether the specified service is supported by this class. + /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const ::rtl::OUString& sServiceName) diff --git a/sd/source/ui/inc/AccessibleTreeNode.hxx b/sd/source/ui/inc/AccessibleTreeNode.hxx index 2c1031921009..34f91b626592 100644 --- a/sd/source/ui/inc/AccessibleTreeNode.hxx +++ b/sd/source/ui/inc/AccessibleTreeNode.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ namespace accessibility { class AccessibleSlideSorterObject; -typedef ::cppu::WeakComponentImplHelper5< +typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleEventBroadcaster, ::com::sun::star::accessibility::XAccessibleContext, @@ -95,7 +95,7 @@ public: const ::rtl::OUString& rsName, const ::rtl::OUString& rsDescription, sal_Int16 eRole); - + /** Use this variant of the constructor when the accessible parent is non-standard. @param rxParent @@ -119,7 +119,7 @@ public: const ::rtl::OUString& rsName, const ::rtl::OUString& rsDescription, sal_Int16 eRole); - + void FireAccessibleEvent ( short nEventId, const ::com::sun::star::uno::Any& rOldValue, @@ -134,7 +134,7 @@ public: getAccessibleContext (void) throw (::com::sun::star::uno::RuntimeException); - + //===== XAccessibleEventBroadcaster ======================================= virtual void SAL_CALL @@ -142,7 +142,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) throw (::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< @@ -151,56 +151,56 @@ public: using cppu::WeakComponentImplHelperBase::addEventListener; using cppu::WeakComponentImplHelperBase::removeEventListener; - + //===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or throw exception. + /// Return the specified child or throw exception. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - /// Return a reference to the parent. + /// Return a reference to the parent. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) throw (::com::sun::star::uno::RuntimeException); - /// Return this objects index among the parents children. - virtual sal_Int32 SAL_CALL + /// Return this objects index among the parents children. + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) throw (::com::sun::star::uno::RuntimeException); - /// Return this object's role. + /// Return this object's role. virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException); - /// Return this object's description. + /// Return this object's description. virtual ::rtl::OUString SAL_CALL getAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current name. + /// Return the object's current name. virtual ::rtl::OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); - /// Return NULL to indicate that an empty relation set. + /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) throw (::com::sun::star::uno::RuntimeException); - /// Return the set of current states. + /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet (void) throw (::com::sun::star::uno::RuntimeException); - /** Return the parents locale or throw exception if this object has no + /** Return the parents locale or throw exception if this object has no parent yet/anymore. */ virtual ::com::sun::star::lang::Locale SAL_CALL @@ -211,46 +211,46 @@ public: //===== XAccessibleComponent ================================================ virtual sal_Bool SAL_CALL containsPoint ( - const ::com::sun::star::awt::Point& aPoint) + const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint ( - const ::com::sun::star::awt::Point& aPoint) + const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) + virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus (void) + virtual void SAL_CALL grabFocus (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground (void) throw (::com::sun::star::uno::RuntimeException); - + //===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - /** Return whether the specified service is supported by this class. + /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const ::rtl::OUString& sServiceName) @@ -262,13 +262,13 @@ public: getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); - + protected: ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> mxParent; ::sd::toolpanel::TreeNode& mrTreeNode; ::rtl::Reference< ::utl::AccessibleStateSetHelper> mrStateSet; - + const ::rtl::OUString msName; const ::rtl::OUString msDescription; const sal_Int16 meRole; @@ -284,7 +284,7 @@ protected: throw (::com::sun::star::lang::DisposedException); /** Check whether or not the object has been disposed (or is in the - state of beeing disposed). + state of beeing disposed). @return sal_True, if the object is disposed or in the course of being disposed. Otherwise, sal_False is returned. @@ -302,10 +302,10 @@ protected: void UpdateState( sal_Int16 aState, bool bValue); - + DECL_LINK(StateChangeListener, ::sd::toolpanel::TreeNodeStateChangeEvent*); DECL_LINK(WindowEventListener, VclWindowEvent*); - + private: sal_uInt32 mnClientId; diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx index 5c8fba1e6b2d..2c4d8e802236 100755 --- a/sd/source/ui/inc/AccessibleViewForwarder.hxx +++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ class OutputDevice; namespace accessibility { -/** <p>This class provides the means to transform between internal coordinates +/** <p>This class provides the means to transform between internal coordinates and screen coordinates without giving direct access to the underlying view. It represents a certain window. A call to <method>GetVisArea</method> returns the corresponding visible @@ -48,7 +48,7 @@ namespace accessibility { change the validity of the forwarder have to be signaled seperately. */ class AccessibleViewForwarder - : public IAccessibleViewForwarder + : public IAccessibleViewForwarder { public: //===== internal ======================================================== @@ -56,7 +56,7 @@ public: AccessibleViewForwarder (SdrPaintView* pView, OutputDevice& rDevice); virtual ~AccessibleViewForwarder (void); - + //===== IAccessibleViewforwarder ======================================== /** This method informs you about the state of the forwarder. Do not @@ -70,7 +70,7 @@ public: /** Returns the area of the underlying document that is visible in the * corresponding window. - @return + @return The rectangle of the visible part of the document. */ virtual Rectangle GetVisibleArea() const; @@ -81,7 +81,7 @@ public: @param rPoint Point in internal coordinates. - @return + @return The same point but in screen coordinates relative to the upper left corner of the (current) screen. */ @@ -93,7 +93,7 @@ public: @param rSize Size in internal coordinates. - @return + @return The same size but in screen coordinates. */ virtual Size LogicToPixel (const Size& rSize) const; @@ -105,7 +105,7 @@ public: Point in screen coordinates relative to the upper left corner of the (current) screen. - @return + @return The same point but in internal coordinates. */ virtual Point PixelToLogic (const Point& rPoint) const; @@ -116,7 +116,7 @@ public: @param rSize Size in screen coordinates. - @return + @return The same size but in internal coordinates. */ virtual Size PixelToLogic (const Size& rSize) const; diff --git a/sd/source/ui/inc/AnimationChildWindow.hxx b/sd/source/ui/inc/AnimationChildWindow.hxx index c3718220a172..709d56c0f74c 100644 --- a/sd/source/ui/inc/AnimationChildWindow.hxx +++ b/sd/source/ui/inc/AnimationChildWindow.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,13 +36,13 @@ class SfxBindings; namespace sd { -class AnimationChildWindow +class AnimationChildWindow : public SfxChildWindow { public: AnimationChildWindow( - ::Window*, - USHORT, + ::Window*, + USHORT, SfxBindings*, SfxChildWinInfo*); diff --git a/sd/source/ui/inc/BezierObjectBar.hxx b/sd/source/ui/inc/BezierObjectBar.hxx index ae54243a58e2..3519eaa1c169 100644 --- a/sd/source/ui/inc/BezierObjectBar.hxx +++ b/sd/source/ui/inc/BezierObjectBar.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ namespace sd { class View; class ViewShell; -class BezierObjectBar +class BezierObjectBar : public SfxShell { public: diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx index ee5ee7b1db0a..47c231a7071b 100644 --- a/sd/source/ui/inc/BreakDlg.hxx +++ b/sd/source/ui/inc/BreakDlg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,38 +53,38 @@ class DrawView; |* Dialog zum aufbrechen von Metafiles |* \************************************************************************/ -class BreakDlg +class BreakDlg : public SfxModalDialog { public: BreakDlg ( - ::Window* pWindow, - DrawView* pDrView, - DrawDocShell* pShell, - ULONG nSumActionCount, + ::Window* pWindow, + DrawView* pDrView, + DrawDocShell* pShell, + ULONG nSumActionCount, ULONG nObjCount); virtual ~BreakDlg(); short Execute(); private: - FixedText aFtObjInfo; - FixedText aFtActInfo; - FixedText aFtInsInfo; + FixedText aFtObjInfo; + FixedText aFtActInfo; + FixedText aFtInsInfo; - FixedInfo aFiObjInfo; - FixedInfo aFiActInfo; - FixedInfo aFiInsInfo; + FixedInfo aFiObjInfo; + FixedInfo aFiActInfo; + FixedInfo aFiInsInfo; - CancelButton aBtnCancel; - DrawView* pDrView; + CancelButton aBtnCancel; + DrawView* pDrView; - BOOL bCancel; + BOOL bCancel; - Timer aTimer; + Timer aTimer; SvdProgressInfo *pProgrInfo; - Link aLink; - SfxProgress *mpProgress; + Link aLink; + SfxProgress *mpProgress; DECL_LINK( CancelButtonHdl, void* ); DECL_LINK( UpDate, void* ); diff --git a/sd/source/ui/inc/Client.hxx b/sd/source/ui/inc/Client.hxx index 8370b31435c3..b8f1dd2988b1 100644 --- a/sd/source/ui/inc/Client.hxx +++ b/sd/source/ui/inc/Client.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,24 +49,24 @@ class ViewShell; class Client : public SfxInPlaceClient { ViewShell* mpViewShell; - SdrOle2Obj* pSdrOle2Obj; - SdrGrafObj* pSdrGrafObj; + SdrOle2Obj* pSdrOle2Obj; + SdrGrafObj* pSdrGrafObj; OutlinerParaObject* pOutlinerParaObj; virtual void ObjectAreaChanged(); virtual void RequestNewObjectArea( Rectangle& ); virtual void ViewChanged(); - virtual void MakeVisible(); + virtual void MakeVisible(); public: Client (SdrOle2Obj* pObj, ViewShell* pSdViewShell, ::Window* pWindow); virtual ~Client (void); - SdrOle2Obj* GetSdrOle2Obj() const { return pSdrOle2Obj; } - void SetSdrGrafObj(SdrGrafObj* pObj) { pSdrGrafObj = pObj; } - SdrGrafObj* GetSdrGrafObj() const { return pSdrGrafObj; } - void SetOutlinerParaObj (OutlinerParaObject* pObj) { pOutlinerParaObj = pObj; } - OutlinerParaObject* GetOutlinerParaObject () const { return pOutlinerParaObj; } + SdrOle2Obj* GetSdrOle2Obj() const { return pSdrOle2Obj; } + void SetSdrGrafObj(SdrGrafObj* pObj) { pSdrGrafObj = pObj; } + SdrGrafObj* GetSdrGrafObj() const { return pSdrGrafObj; } + void SetOutlinerParaObj (OutlinerParaObject* pObj) { pOutlinerParaObj = pObj; } + OutlinerParaObject* GetOutlinerParaObject () const { return pOutlinerParaObj; } }; } // end of namespace sd diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx index dd4b5e37f38e..5bd2870bc95a 100644 --- a/sd/source/ui/inc/ClientView.hxx +++ b/sd/source/ui/inc/ClientView.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,12 +40,12 @@ class DrawViewShell; |* \************************************************************************/ -class ClientView +class ClientView : public DrawView { public: ClientView ( - DrawDocShell* pDocSh, + DrawDocShell* pDocSh, OutputDevice* pOutDev, DrawViewShell* pShell); virtual ~ClientView (void); diff --git a/sd/source/ui/inc/CustomAnimation.hxx b/sd/source/ui/inc/CustomAnimation.hxx index 84a9f848f612..21e4865f4012 100644 --- a/sd/source/ui/inc/CustomAnimation.hxx +++ b/sd/source/ui/inc/CustomAnimation.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ class Window; namespace sd { -// extern void showCustomAnimationPane( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawView >& xView ); +// extern void showCustomAnimationPane( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawView >& xView ); extern ::Window* createCustomAnimationPane( ::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); } diff --git a/sd/source/ui/inc/DialogListBox.hxx b/sd/source/ui/inc/DialogListBox.hxx index f04f431a4b55..5dec726f6005 100644 --- a/sd/source/ui/inc/DialogListBox.hxx +++ b/sd/source/ui/inc/DialogListBox.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,36 +36,36 @@ namespace sd class DialogListBox : public Control { private: - ScrollBar* mpHScrollBar; - ScrollBar* mpVScrollBar; - ScrollBarBox* mpScrollBarBox; - ::Window* mpChild; - bool mbVScroll; - bool mbHScroll; - bool mbAutoHScroll; - Size maMinSize, maInnerSize; + ScrollBar* mpHScrollBar; + ScrollBar* mpVScrollBar; + ScrollBarBox* mpScrollBarBox; + ::Window* mpChild; + bool mbVScroll; + bool mbHScroll; + bool mbAutoHScroll; + Size maMinSize, maInnerSize; protected: - virtual void GetFocus(); - virtual void StateChanged( StateChangedType nType ); + virtual void GetFocus(); + virtual void StateChanged( StateChangedType nType ); - long Notify( NotifyEvent& rNEvt ); + long Notify( NotifyEvent& rNEvt ); - void ImplResizeControls(); - void ImplCheckScrollBars(); - void ImplInitScrollBars(); - void ImplResizeChild(); + void ImplResizeControls(); + void ImplCheckScrollBars(); + void ImplInitScrollBars(); + void ImplResizeChild(); - DECL_LINK( ScrollBarHdl, ScrollBar* ); + DECL_LINK( ScrollBarHdl, ScrollBar* ); public: DialogListBox( ::Window* pParent, WinBits nWinStyle ); ~DialogListBox(); - void SetChildWindow( ::Window* pChild, const Size& rMinSize ); + void SetChildWindow( ::Window* pChild, const Size& rMinSize ); - ::Window* GetPreferredKeyInputWindow(); - void Resize(); + ::Window* GetPreferredKeyInputWindow(); + void Resize(); }; diff --git a/sd/source/ui/inc/DocumentRenderer.hxx b/sd/source/ui/inc/DocumentRenderer.hxx index 0bc7db676401..5143f2ad5cfd 100644 --- a/sd/source/ui/inc/DocumentRenderer.hxx +++ b/sd/source/ui/inc/DocumentRenderer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,13 +59,13 @@ public: const css::uno::Any& aSelection, const css::uno::Sequence<css::beans::PropertyValue >& xOptions) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Sequence<css::beans::PropertyValue> SAL_CALL getRenderer ( sal_Int32 nRenderer, const css::uno::Any& rSelection, const css::uno::Sequence<css::beans::PropertyValue>& rxOptions) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual void SAL_CALL render ( sal_Int32 nRenderer, const css::uno::Any& rSelection, diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index da0b6ade7327..ea5f358e8de0 100755 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -198,20 +198,20 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); // XDrawView - virtual void SAL_CALL + virtual void SAL_CALL setCurrentPage ( - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage > SAL_CALL + ::com::sun::star::drawing::XDrawPage > SAL_CALL getCurrentPage (void) throw(::com::sun::star::uno::RuntimeException); // lang::XEventListener - virtual void SAL_CALL + virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) throw (::com::sun::star::uno::RuntimeException); @@ -223,7 +223,7 @@ public: // XControllerManager - + virtual css::uno::Reference<css::drawing::framework::XConfigurationController> SAL_CALL getConfigurationController (void) throw (::com::sun::star::uno::RuntimeException); @@ -231,8 +231,8 @@ public: virtual css::uno::Reference<css::drawing::framework::XModuleController> SAL_CALL getModuleController (void) throw (::com::sun::star::uno::RuntimeException); - - + + // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId) @@ -243,7 +243,7 @@ protected: contains all property names and types of this object. */ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); - + virtual void FillPropertyTable ( ::std::vector< ::com::sun::star::beans::Property>& rProperties); @@ -256,9 +256,9 @@ protected: sal_Int32 nHandle ) const; /** Convert the value rValue and return the result in rConvertedValue and the - old value in rOldValue. + old value in rOldValue. After this call the vetoable listeners are notified. - + @param rConvertedValue The converted value. Only set if return is true. @param rOldValue @@ -289,7 +289,7 @@ protected: */ void ThrowIfDisposed (void) const throw (::com::sun::star::lang::DisposedException); - + using cppu::OPropertySetHelper::disposing; using cppu::OPropertySetHelper::getFastPropertyValue; diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 4ad4b0d09392..2709340ffa4b 100755 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,11 +85,11 @@ public: virtual ~DrawDocShell(); void UpdateRefDevice(); - virtual void Activate( BOOL bMDI ); - virtual void Deactivate( BOOL bMDI ); + virtual void Activate( BOOL bMDI ); + virtual void Deactivate( BOOL bMDI ); virtual BOOL InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); - virtual BOOL ConvertFrom( SfxMedium &rMedium ); - virtual BOOL Save(); + virtual BOOL ConvertFrom( SfxMedium &rMedium ); + virtual BOOL Save(); virtual BOOL SaveAsOwnFormat( SfxMedium& rMedium ); virtual BOOL ConvertTo( SfxMedium &rMedium ); virtual BOOL SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); @@ -99,13 +99,13 @@ public: virtual sal_Bool SaveAs( SfxMedium &rMedium ); virtual Rectangle GetVisArea(USHORT nAspect) const; - virtual void Draw(OutputDevice*, const JobSetup& rSetup, USHORT nAspect = ASPECT_CONTENT); + virtual void Draw(OutputDevice*, const JobSetup& rSetup, USHORT nAspect = ASPECT_CONTENT); virtual SfxUndoManager* GetUndoManager(); virtual Printer* GetDocumentPrinter(); virtual void OnDocumentPrinterChanged(Printer* pNewPrinter); virtual SfxStyleSheetBasePool* GetStyleSheetPool(); - virtual void SetOrganizerSearchMask(SfxStyleSheetBasePool* pBasePool) const; - virtual Size GetFirstPageSize(); + virtual void SetOrganizerSearchMask(SfxStyleSheetBasePool* pBasePool) const; + virtual Size GetFirstPageSize(); virtual void FillClass(SvGlobalName* pClassName, sal_uInt32* pFormat, String* pAppName, String* pFullTypeName, String* pShortTypeName, sal_Int32 nFileFormat, sal_Bool bTemplate = sal_False ) const; virtual void SetModified( BOOL = TRUE ); @@ -115,28 +115,28 @@ public: sd::ViewShell* GetViewShell() { return mpViewShell; } ::sd::FrameView* GetFrameView(); - ::sd::FunctionReference GetDocShellFunction() const { return mxDocShellFunction; } + ::sd::FunctionReference GetDocShellFunction() const { return mxDocShellFunction; } void SetDocShellFunction( const ::sd::FunctionReference& xFunction ); SdDrawDocument* GetDoc(); DocumentType GetDocumentType() const { return meDocType; } SfxPrinter* GetPrinter(BOOL bCreate); - void SetPrinter(SfxPrinter *pNewPrinter); - void UpdateFontList(); + void SetPrinter(SfxPrinter *pNewPrinter); + void UpdateFontList(); BOOL IsInDestruction() const { return mbInDestruction; } - void CancelSearching(); + void CancelSearching(); - void Execute( SfxRequest& rReq ); - void GetState(SfxItemSet&); + void Execute( SfxRequest& rReq ); + void GetState(SfxItemSet&); - void Connect(sd::ViewShell* pViewSh); - void Disconnect(sd::ViewShell* pViewSh); - void UpdateTablePointers(); + void Connect(sd::ViewShell* pViewSh); + void Disconnect(sd::ViewShell* pViewSh); + void UpdateTablePointers(); - BOOL GotoBookmark(const String& rBookmark); + BOOL GotoBookmark(const String& rBookmark); Bitmap GetPagePreviewBitmap(SdPage* pPage, USHORT nMaxEdgePixel); @@ -155,17 +155,17 @@ public: a default name of a not-yet-existing slide (e.g. 'Slide 17'), TRUE is returned, but rName is set to an empty string. */ - BOOL CheckPageName(::Window* pWin, String& rName ); + BOOL CheckPageName(::Window* pWin, String& rName ); void SetSlotFilter(BOOL bEnable = FALSE, USHORT nCount = 0, const USHORT* pSIDs = NULL) { mbFilterEnable = bEnable; mnFilterCount = nCount; mpFilterSIDs = pSIDs; } void ApplySlotFilter() const; - UINT16 GetStyleFamily() const { return mnStyleFamily; } - void SetStyleFamily( UINT16 nSF ) { mnStyleFamily = nSF; } + UINT16 GetStyleFamily() const { return mnStyleFamily; } + void SetStyleFamily( UINT16 nSF ) { mnStyleFamily = nSF; } /** executes the SID_OPENDOC slot to let the framework open a document with the given URL and this document as a referer */ - void OpenBookmark( const String& rBookmarkURL ); + void OpenBookmark( const String& rBookmarkURL ); /** checks, if the given name is a valid new name for a slide @@ -204,28 +204,28 @@ public: // #91457# ExecuteSpellPopup now handled by DrawDocShell DECL_LINK( OnlineSpellCallback, SpellCallbackInfo* ); - void ClearUndoBuffer(); + void ClearUndoBuffer(); protected: - SdDrawDocument* mpDoc; - SfxUndoManager* mpUndoManager; - SfxPrinter* mpPrinter; - ::sd::ViewShell* mpViewShell; - FontList* mpFontList; - ::sd::FunctionReference mxDocShellFunction; + SdDrawDocument* mpDoc; + SfxUndoManager* mpUndoManager; + SfxPrinter* mpPrinter; + ::sd::ViewShell* mpViewShell; + FontList* mpFontList; + ::sd::FunctionReference mxDocShellFunction; DocumentType meDocType; - UINT16 mnStyleFamily; + UINT16 mnStyleFamily; const USHORT* mpFilterSIDs; USHORT mnFilterCount; BOOL mbFilterEnable; - BOOL mbSdDataObj; + BOOL mbSdDataObj; BOOL mbInDestruction; - BOOL mbOwnPrinter; + BOOL mbOwnPrinter; BOOL mbNewDocument; - bool mbOwnDocument; // if true, we own mpDoc and will delete it in our d'tor - void Construct(bool bClipboard); + bool mbOwnDocument; // if true, we own mpDoc and will delete it in our d'tor + void Construct(bool bClipboard); virtual void InPlaceActivate( BOOL bActive ); }; diff --git a/sd/source/ui/inc/DrawSubController.hxx b/sd/source/ui/inc/DrawSubController.hxx index 22d3afb5dd4a..186024573415 100755 --- a/sd/source/ui/inc/DrawSubController.hxx +++ b/sd/source/ui/inc/DrawSubController.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 4abb1a22946d..1fce00ee9145 100755 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,7 +99,7 @@ public: virtual void Init (bool bIsMainViewShell); virtual void Shutdown (void); - + void PrePaint(); virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin); @@ -121,7 +121,7 @@ public: @param rSize The new size in pixel. */ - // virtual void AdjustPosSizePixel(const Point &rPos, const Size &rSize); + // virtual void AdjustPosSizePixel(const Point &rPos, const Size &rSize); /** Arrange and resize the GUI elements like rulers, sliders, and buttons as well as the actual document view according to the size of @@ -130,7 +130,7 @@ public: */ virtual void ArrangeGUIElements (void); - void HidePage(); + void HidePage(); virtual BOOL KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); virtual void MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin); @@ -150,77 +150,77 @@ public: virtual void SetZoom( long nZoom ); virtual void SetZoomRect( const Rectangle& rZoomRect ); - void InsertURLField(const String& rURL, const String& rText, const String& rTarget, + void InsertURLField(const String& rURL, const String& rText, const String& rTarget, const Point* pPos); - void InsertURLButton(const String& rURL, const String& rText, const String& rTarget, + void InsertURLButton(const String& rURL, const String& rText, const String& rTarget, const Point* pPos); virtual void SetUIUnit(FieldUnit eUnit); - void SelectionHasChanged(); - void ModelHasChanged(); + void SelectionHasChanged(); + void ModelHasChanged(); virtual void Activate(BOOL bIsMDIActivate); virtual void Deactivate(BOOL IsMDIActivate); virtual void UIActivating( SfxInPlaceClient* ); virtual void UIDeactivated( SfxInPlaceClient* ); - virtual String GetSelectionText( BOOL bCompleteWords = FALSE ); + virtual String GetSelectionText( BOOL bCompleteWords = FALSE ); virtual BOOL HasSelection( BOOL bText = TRUE ) const; - void ExecCtrl(SfxRequest& rReq); - void GetCtrlState(SfxItemSet& rSet); - void GetMenuState(SfxItemSet& rSet); - void GetTableMenuState(SfxItemSet& rSet); + void ExecCtrl(SfxRequest& rReq); + void GetCtrlState(SfxItemSet& rSet); + void GetMenuState(SfxItemSet& rSet); + void GetTableMenuState(SfxItemSet& rSet); /** Set the items of the given item set that are related to switching the editing mode to the correct values. <p>This function also sets the states of the mode buttons (those at the upper right corner) accordingly.</p> */ void GetModeSwitchingMenuState (SfxItemSet &rSet); - void GetAttrState(SfxItemSet& rSet); - void GetSnapItemState(SfxItemSet& rSet); + void GetAttrState(SfxItemSet& rSet); + void GetSnapItemState(SfxItemSet& rSet); - void GetState (SfxItemSet& rSet); + void GetState (SfxItemSet& rSet); void Execute (SfxRequest& rReq); - void ExecStatusBar(SfxRequest& rReq); - void GetStatusBarState(SfxItemSet& rSet); + void ExecStatusBar(SfxRequest& rReq); + void GetStatusBarState(SfxItemSet& rSet); - void ExecOptionsBar(SfxRequest& rReq); - void GetOptionsBarState(SfxItemSet& rSet); + void ExecOptionsBar(SfxRequest& rReq); + void GetOptionsBarState(SfxItemSet& rSet); - void ExecRuler(SfxRequest& rReq); - void GetRulerState(SfxItemSet& rSet); + void ExecRuler(SfxRequest& rReq); + void GetRulerState(SfxItemSet& rSet); - void ExecFormText(SfxRequest& rReq); - void GetFormTextState(SfxItemSet& rSet); + void ExecFormText(SfxRequest& rReq); + void GetFormTextState(SfxItemSet& rSet); - void ExecAnimationWin(SfxRequest& rReq); - void GetAnimationWinState(SfxItemSet& rSet); + void ExecAnimationWin(SfxRequest& rReq); + void GetAnimationWinState(SfxItemSet& rSet); - void ExecNavigatorWin(SfxRequest& rReq); - void GetNavigatorWinState(SfxItemSet& rSet); + void ExecNavigatorWin(SfxRequest& rReq); + void GetNavigatorWinState(SfxItemSet& rSet); - void ExecEffectWin(SfxRequest& rReq); + void ExecEffectWin(SfxRequest& rReq); - void Update3DWindow(); - void AssignFrom3DWindow(); + void Update3DWindow(); + void AssignFrom3DWindow(); - void ExecGallery(SfxRequest& rReq); - void GetGalleryState(SfxItemSet& rSet); + void ExecGallery(SfxRequest& rReq); + void GetGalleryState(SfxItemSet& rSet); - void ExecBmpMask( SfxRequest& rReq ); - void GetBmpMaskState( SfxItemSet& rSet ); + void ExecBmpMask( SfxRequest& rReq ); + void GetBmpMaskState( SfxItemSet& rSet ); - void ExecIMap( SfxRequest& rReq ); - void GetIMapState( SfxItemSet& rSet ); + void ExecIMap( SfxRequest& rReq ); + void GetIMapState( SfxItemSet& rSet ); - void FuTemporary(SfxRequest& rReq); - void FuPermanent(SfxRequest& rReq); - void FuSupport(SfxRequest& rReq); - void FuTable(SfxRequest& rReq); + void FuTemporary(SfxRequest& rReq); + void FuPermanent(SfxRequest& rReq); + void FuSupport(SfxRequest& rReq); + void FuTable(SfxRequest& rReq); - void AttrExec (SfxRequest& rReq); - void AttrState (SfxItemSet& rSet); + void AttrExec (SfxRequest& rReq); + void AttrState (SfxItemSet& rSet); void ExecuteAnnotation (SfxRequest& rRequest); void GetAnnotationState (SfxItemSet& rItemSet); @@ -231,24 +231,24 @@ public: virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); - PageKind GetPageKind() { return mePageKind; } + PageKind GetPageKind() { return mePageKind; } - Point GetMousePos() { return maMousePos; } - BOOL IsMousePosFreezed() { return mbMousePosFreezed; } - void SetMousePosFreezed( BOOL bIn ) { mbMousePosFreezed = bIn; } + Point GetMousePos() { return maMousePos; } + BOOL IsMousePosFreezed() { return mbMousePosFreezed; } + void SetMousePosFreezed( BOOL bIn ) { mbMousePosFreezed = bIn; } - EditMode GetEditMode() const { return meEditMode; } - virtual SdPage* GetActualPage() { return mpActualPage; } + EditMode GetEditMode() const { return meEditMode; } + virtual SdPage* GetActualPage() { return mpActualPage; } /// inherited from sd::ViewShell virtual SdPage* getCurrentPage() const; - void ResetActualPage(); - void ResetActualLayer(); - BOOL SwitchPage(USHORT nPage); - BOOL IsSwitchPageAllowed() const; + void ResetActualPage(); + void ResetActualLayer(); + BOOL SwitchPage(USHORT nPage); + BOOL IsSwitchPageAllowed() const; - BOOL GotoBookmark(const String& rBookmark); + BOOL GotoBookmark(const String& rBookmark); void MakeVisible(const Rectangle& rRect, ::Window& rWin); virtual void ReadFrameViewData(FrameView* pView); @@ -257,22 +257,22 @@ public: virtual ErrCode DoVerb(long nVerb); virtual BOOL ActivateObject(SdrOle2Obj* pObj, long nVerb); - void SetZoomOnPage( BOOL bZoom = TRUE ) { mbZoomOnPage = bZoom; } - BOOL IsZoomOnPage() { return mbZoomOnPage; } - void CheckLineTo (SfxRequest& rReq); - void FuTemp01(SfxRequest& rReq); - void FuTemp02(SfxRequest& rReq); - void FuTemp03(SfxRequest& rReq); - void FuTemp04(SfxRequest& rReq); - void SetChildWindowState( SfxItemSet& rSet ); + void SetZoomOnPage( BOOL bZoom = TRUE ) { mbZoomOnPage = bZoom; } + BOOL IsZoomOnPage() { return mbZoomOnPage; } + void CheckLineTo (SfxRequest& rReq); + void FuTemp01(SfxRequest& rReq); + void FuTemp02(SfxRequest& rReq); + void FuTemp03(SfxRequest& rReq); + void FuTemp04(SfxRequest& rReq); + void SetChildWindowState( SfxItemSet& rSet ); - void UpdateIMapDlg( SdrObject* pObj ); + void UpdateIMapDlg( SdrObject* pObj ); - void LockInput(); - void UnlockInput(); - BOOL IsInputLocked() const { return mnLockCount > 0UL; } + void LockInput(); + void UnlockInput(); + BOOL IsInputLocked() const { return mnLockCount > 0UL; } - USHORT GetCurPageId() { return( maTabControl.GetCurPageId() ); } + USHORT GetCurPageId() { return( maTabControl.GetCurPageId() ); } /** Show controls of the UI or hide them, depending on the given flag. Do not call this method directly. Call the method at ViewShellBase @@ -280,11 +280,11 @@ public: */ virtual void ShowUIControls (bool bVisible = true); - void ScannerEvent( const ::com::sun::star::lang::EventObject& rEventObject ); + void ScannerEvent( const ::com::sun::star::lang::EventObject& rEventObject ); bool IsLayerModeActive (void) const; - USHORT* GetSlotArray() const { return mpSlotArray; } + USHORT* GetSlotArray() const { return mpSlotArray; } virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, USHORT nPage, USHORT nLayer ); @@ -359,8 +359,8 @@ public: void ModifyLayer( SdrLayer* pLayer, const String& rLayerName, const String& rLayerTitle, const String& rLayerDesc, bool bIsVisible, bool bIsLocked, bool bIsPrintable ); virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void); - - DrawView* GetDrawView() const { return mpDrawView; } + + DrawView* GetDrawView() const { return mpDrawView; } /** Relocation to a new parent window is not supported for DrawViewShell objects so this method always returns <FALSE/>. @@ -368,22 +368,22 @@ public: virtual bool RelocateToParentWindow (::Window* pParentWindow); protected: - DrawView* mpDrawView; - SdPage* mpActualPage; - Rectangle maMarkRect; - Point maMousePos; - BOOL mbMousePosFreezed; - TabControl maTabControl; - EditMode meEditMode; - PageKind mePageKind; - BOOL mbZoomOnPage; - BOOL mbIsRulerDrag; - ULONG mnLockCount; - Timer maCloseTimer; - BOOL mbReadOnly; - USHORT* mpSlotArray; - - static BOOL mbPipette; + DrawView* mpDrawView; + SdPage* mpActualPage; + Rectangle maMarkRect; + Point maMousePos; + BOOL mbMousePosFreezed; + TabControl maTabControl; + EditMode meEditMode; + PageKind mePageKind; + BOOL mbZoomOnPage; + BOOL mbIsRulerDrag; + ULONG mnLockCount; + Timer maCloseTimer; + BOOL mbReadOnly; + USHORT* mpSlotArray; + + static BOOL mbPipette; DECL_LINK( ClipboardChanged, TransferableDataHelper* ); DECL_LINK( CloseHdl, Timer* pTimer ); @@ -391,8 +391,8 @@ protected: DECL_LINK( NameObjectHdl, AbstractSvxNameDialog* ); DECL_LINK( RenameSlideHdl, AbstractSvxNameDialog* ); - void DeleteActualPage(); - void DeleteActualLayer(); + void DeleteActualPage(); + void DeleteActualLayer(); virtual SvxRuler* CreateHRuler(::sd::Window* pWin, BOOL bIsFirst); virtual SvxRuler* CreateVRuler(::sd::Window* pWin); @@ -405,13 +405,13 @@ protected: void SetupPage( Size &rSize, long nLeft, long nRight, long nUpper, long nLower, BOOL bSize, BOOL bMargin, BOOL bScaleAll ); - USHORT GetIdBySubId( USHORT nSId ); - void MapSlot( USHORT nSId ); - void UpdateToolboxImages( SfxItemSet &rSet, BOOL bPermanent = TRUE ); - USHORT GetMappedSlot( USHORT nSId ); - USHORT GetArrayId( USHORT nSId ); + USHORT GetIdBySubId( USHORT nSId ); + void MapSlot( USHORT nSId ); + void UpdateToolboxImages( SfxItemSet &rSet, BOOL bPermanent = TRUE ); + USHORT GetMappedSlot( USHORT nSId ); + USHORT GetArrayId( USHORT nSId ); - void GetMenuStateSel(SfxItemSet& rSet); + void GetMenuStateSel(SfxItemSet& rSet); private: /** This flag controls whether the layer mode is active, i.e. the layer @@ -445,10 +445,10 @@ private: PageKind ePageKind, SdPage* pPage); - ::com::sun::star::uno::Reference< ::com::sun::star::scanner::XScannerManager > mxScannerManager; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > mxScannerListener; + ::com::sun::star::uno::Reference< ::com::sun::star::scanner::XScannerManager > mxScannerManager; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > mxScannerListener; TransferableClipboardListener* mpClipEvtLstnr; - BOOL mbPastePossible; + BOOL mbPastePossible; virtual void Notify (SfxBroadcaster& rBC, const SfxHint& rHint); @@ -487,7 +487,7 @@ private: const Point& rMouseLocation); using ViewShell::Notify; - + ::std::auto_ptr< AnnotationManager > mpAnnotationManager; ::std::auto_ptr< ViewOverlayManager > mpViewOverlayManager; }; diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx index 8c177191c31f..8cffaa1d9b89 100644 --- a/sd/source/ui/inc/EventMultiplexer.hxx +++ b/sd/source/ui/inc/EventMultiplexer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,14 +47,14 @@ public: typedef sal_uInt32 EventId; /** The EventMultiplexer itself is being disposed. Called for a live EventMultiplexer. Removing a listener as response is not necessary, - though. + though. */ static const EventId EID_DISPOSING = 0x00000001; - + /** The selection in the center pane has changed. */ static const EventId EID_EDIT_VIEW_SELECTION = 0x00000002; - + /** The selection in the slide sorter has changed, regardless of whether the slide sorter is displayed in the left pane or the center pane. */ @@ -68,7 +68,7 @@ public: pane) has been removed. */ static const EventId EID_MAIN_VIEW_REMOVED = 0x00000010; - + /** A new ViewShell has been made the MainViewShell. */ static const EventId EID_MAIN_VIEW_ADDED = 0x00000020; @@ -101,7 +101,7 @@ public: /** Text editing in one of the shapes in the MainViewShell has started. */ static const EventId EID_BEGIN_TEXT_EDIT = 0x00000800; - + /** Text editing in one of the shapes in the MainViewShell has ended. */ static const EventId EID_END_TEXT_EDIT = 0x00001000; @@ -109,7 +109,7 @@ public: /** A UNO controller has been attached to the UNO frame. */ static const EventId EID_CONTROLLER_ATTACHED = 0x00002000; - + /** A UNO controller has been detached to the UNO frame. */ static const EventId EID_CONTROLLER_DETACHED = 0x00004000; @@ -119,7 +119,7 @@ public: static const EventId EID_SHAPE_CHANGED = 0x00008000; /** A shape has been inserted to a page. The page is available in the - user data. + user data. */ static const EventId EID_SHAPE_INSERTED = 0x00010000; @@ -156,7 +156,7 @@ public: When a listener is registered it can specify the events it wants to be informed of. This can be done with code like the following: - + mrViewShellBase.GetEventMultiplexer().AddEventListener ( LINK(this,MasterPagesSelector,EventMultiplexerListener), tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED @@ -186,7 +186,7 @@ public: be informed about. */ void AddEventListener ( - Link& rCallback, + Link& rCallback, EventMultiplexerEvent::EventId aEventTypeSet); /** Remove an event listener for the specified event types. @@ -197,7 +197,7 @@ public: for. */ void RemoveEventListener ( - Link& rCallback, + Link& rCallback, EventMultiplexerEvent::EventId aEventTypeSet = EID_FULL_SET); /** This method is used for out-of-line events. An event of the diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx index 261095642a51..f683f9e5c4b9 100644 --- a/sd/source/ui/inc/FormShellManager.hxx +++ b/sd/source/ui/inc/FormShellManager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ class ViewShellBase; The form shell is moved above the view shell when the form shell is activated, i.e. the FormControlActivated handler is called. - + It is moved below the view shell when the main window of the main view shell is focused. diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx index 70e34e20dfa7..738dfb7de2d3 100644 --- a/sd/source/ui/inc/FrameView.hxx +++ b/sd/source/ui/inc/FrameView.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace sd { |* View fuer den MDIFrame |* \************************************************************************/ -class FrameView +class FrameView : public SdrView { public: @@ -120,7 +120,7 @@ public: document is loaded. */ void SetViewShEditModeOnLoad (const EditMode eMode); - + /** Return the value of the edit mode as it was when the document was loaded. */ @@ -134,14 +134,14 @@ public: { mbQuickEdit = bQEdit; } BOOL IsQuickEdit() const { return mbQuickEdit; } - void SetBigHandles( BOOL bOn = TRUE ) { mbBigHandles = bOn; } - BOOL IsBigHandles() const { return mbBigHandles; } + void SetBigHandles( BOOL bOn = TRUE ) { mbBigHandles = bOn; } + BOOL IsBigHandles() const { return mbBigHandles; } - void SetDoubleClickTextEdit( BOOL bOn = TRUE ) { mbDoubleClickTextEdit = bOn; } - BOOL IsDoubleClickTextEdit() const { return mbDoubleClickTextEdit; } + void SetDoubleClickTextEdit( BOOL bOn = TRUE ) { mbDoubleClickTextEdit = bOn; } + BOOL IsDoubleClickTextEdit() const { return mbDoubleClickTextEdit; } - void SetClickChangeRotation( BOOL bOn = TRUE ) { mbClickChangeRotation = bOn; } - BOOL IsClickChangeRotation() const { return mbClickChangeRotation; } + void SetClickChangeRotation( BOOL bOn = TRUE ) { mbClickChangeRotation = bOn; } + BOOL IsClickChangeRotation() const { return mbClickChangeRotation; } /** Remember the type of the view shell that was (or soon will be) previously associated with this frame view. @@ -162,7 +162,7 @@ public: void SetViewShellTypeOnLoad (ViewShell::ShellType eType); ViewShell::ShellType GetViewShellTypeOnLoad (void) const; - + void SetPresentationViewShellId(USHORT nId) { mnPresViewShellId = nId; } USHORT GetPresentationViewShellId() const { return mnPresViewShellId; } @@ -186,41 +186,41 @@ public: virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); private: - USHORT mnRefCount; - VirtualDevice* mpVDev; - BOOL mbRuler; - SetOfByte maVisibleLayers; - SetOfByte maLockedLayers; - SetOfByte maPrintableLayers; + USHORT mnRefCount; + VirtualDevice* mpVDev; + BOOL mbRuler; + SetOfByte maVisibleLayers; + SetOfByte maLockedLayers; + SetOfByte maPrintableLayers; SdrHelpLineList maStandardHelpLines; SdrHelpLineList maNotesHelpLines; SdrHelpLineList maHandoutHelpLines; - BOOL mbNoColors; // Gliederungsmodus - BOOL mbNoAttribs; // Gliederungsmodus - Rectangle maVisArea; // Sichtbarer Bereich - PageKind mePageKind; // Seitentyp (Standard, Notizen, Handzettel) - USHORT mnSelectedPage; // Selektierte Seite - PageKind mePageKindOnLoad; - USHORT mnSelectedPageOnLoad; + BOOL mbNoColors; // Gliederungsmodus + BOOL mbNoAttribs; // Gliederungsmodus + Rectangle maVisArea; // Sichtbarer Bereich + PageKind mePageKind; // Seitentyp (Standard, Notizen, Handzettel) + USHORT mnSelectedPage; // Selektierte Seite + PageKind mePageKindOnLoad; + USHORT mnSelectedPageOnLoad; EditMode meStandardEditMode; // Editmode im Zeichenmodus (Page/MasterPage) EditMode meNotesEditMode; // Editmode im Notizen-Modus (Page/MasterPage) EditMode meHandoutEditMode; // Editmode im Handzettel-Modus (Page/MasterPage) EditMode meEditModeOnLoad; - BOOL mbLayerMode; // Layer an/aus - BOOL mbQuickEdit; // QuickEdit an/aus - BOOL mbBigHandles; // Grosse Handles - BOOL mbDoubleClickTextEdit; // Textmodus nach Doppelklick - BOOL mbClickChangeRotation; // Einfachklick wechselt Selektions-/Rotationsmodus - USHORT mnPresViewShellId; // ViewShell aus der die Pres. gestartet wurde - USHORT mnSlotId; // SlotId, welche initial ausgefuehrt wird + BOOL mbLayerMode; // Layer an/aus + BOOL mbQuickEdit; // QuickEdit an/aus + BOOL mbBigHandles; // Grosse Handles + BOOL mbDoubleClickTextEdit; // Textmodus nach Doppelklick + BOOL mbClickChangeRotation; // Einfachklick wechselt Selektions-/Rotationsmodus + USHORT mnPresViewShellId; // ViewShell aus der die Pres. gestartet wurde + USHORT mnSlotId; // SlotId, welche initial ausgefuehrt wird USHORT mnSlidesPerRow; // Dias pro Reihe auf dem Diatisch - ULONG mnDrawMode; // Drawmode fuer das normale Fenster + ULONG mnDrawMode; // Drawmode fuer das normale Fenster double mnTabCtrlPercent; /** Remember whether the navigator shows all shapes (<TRUE/>) or only the names ones (<FALSE/>). Not persistent. */ bool mbIsNavigatorShowingAllShapes; - + /** The type of the previous view shell. The (default) value ViewShell::ST_NONE indicates that there was no previous view shell. Note that this value is used only temporarily and is not saved or diff --git a/sd/source/ui/inc/GraphicDocShell.hxx b/sd/source/ui/inc/GraphicDocShell.hxx index 7b506c515185..a5758b2267c4 100644 --- a/sd/source/ui/inc/GraphicDocShell.hxx +++ b/sd/source/ui/inc/GraphicDocShell.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/GraphicObjectBar.hxx b/sd/source/ui/inc/GraphicObjectBar.hxx index 5a3c0cf4eb4d..74228e957f44 100644 --- a/sd/source/ui/inc/GraphicObjectBar.hxx +++ b/sd/source/ui/inc/GraphicObjectBar.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ class View; class ViewShell; -class GraphicObjectBar +class GraphicObjectBar : public SfxShell { public: @@ -48,16 +48,16 @@ public: GraphicObjectBar (ViewShell* pSdViewShell, ::sd::View* pSdView); virtual ~GraphicObjectBar (void); - void GetAttrState( SfxItemSet& rSet ); - void Execute( SfxRequest& rReq ); + void GetAttrState( SfxItemSet& rSet ); + void Execute( SfxRequest& rReq ); - void GetFilterState( SfxItemSet& rSet ); - void ExecuteFilter( SfxRequest& rReq ); + void GetFilterState( SfxItemSet& rSet ); + void ExecuteFilter( SfxRequest& rReq ); protected: ::sd::View* mpView; - ViewShell* mpViewSh; - USHORT nMappedSlotFilter; + ViewShell* mpViewSh; + USHORT nMappedSlotFilter; }; diff --git a/sd/source/ui/inc/GraphicViewShell.hxx b/sd/source/ui/inc/GraphicViewShell.hxx index 6b5d96be95c6..beeb8ca77020 100755 --- a/sd/source/ui/inc/GraphicViewShell.hxx +++ b/sd/source/ui/inc/GraphicViewShell.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ public: one view shell to the next. */ GraphicViewShell ( - SfxViewFrame* pFrame, + SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameView = NULL); diff --git a/sd/source/ui/inc/GraphicViewShellBase.hxx b/sd/source/ui/inc/GraphicViewShellBase.hxx index 294f5e1620c2..f05eafe54e9a 100644 --- a/sd/source/ui/inc/GraphicViewShellBase.hxx +++ b/sd/source/ui/inc/GraphicViewShellBase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/ImpressViewShellBase.hxx b/sd/source/ui/inc/ImpressViewShellBase.hxx index a3b187fe45bb..6dcc8a37d13d 100644 --- a/sd/source/ui/inc/ImpressViewShellBase.hxx +++ b/sd/source/ui/inc/ImpressViewShellBase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/LayerDialog.hrc b/sd/source/ui/inc/LayerDialog.hrc index 88323539fb99..74e29a789761 100644 --- a/sd/source/ui/inc/LayerDialog.hrc +++ b/sd/source/ui/inc/LayerDialog.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,4 +26,4 @@ ************************************************************************/ #define FLT_WIN_LAYER_DIALOG 791 -#define TB_LAYERS 1 +#define TB_LAYERS 1 diff --git a/sd/source/ui/inc/LayerDialogChildWindow.hxx b/sd/source/ui/inc/LayerDialogChildWindow.hxx index 826902a09152..4586ea99eaa5 100644 --- a/sd/source/ui/inc/LayerDialogChildWindow.hxx +++ b/sd/source/ui/inc/LayerDialogChildWindow.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,8 +40,8 @@ class LayerDialogChildWindow { public: LayerDialogChildWindow ( - ::Window*, - USHORT, + ::Window*, + USHORT, SfxBindings*, SfxChildWinInfo*); virtual ~LayerDialogChildWindow (void); diff --git a/sd/source/ui/inc/LayerDialogContent.hxx b/sd/source/ui/inc/LayerDialogContent.hxx index 3c0b00025307..9c88723b917e 100755 --- a/sd/source/ui/inc/LayerDialogContent.hxx +++ b/sd/source/ui/inc/LayerDialogContent.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,14 +38,14 @@ namespace sd { class ViewShellBase; -class LayerDialogContent +class LayerDialogContent : public SfxDockingWindow { public: LayerDialogContent ( - SfxBindings* pBindings, + SfxBindings* pBindings, SfxChildWindow *pCW, - ::Window* pParent, + ::Window* pParent, const SdResId& rSdResId, ViewShellBase& rBase); virtual ~LayerDialogContent (void); diff --git a/sd/source/ui/inc/LayerTabBar.hxx b/sd/source/ui/inc/LayerTabBar.hxx index 4653fcd17bfe..9a1282a8c317 100644 --- a/sd/source/ui/inc/LayerTabBar.hxx +++ b/sd/source/ui/inc/LayerTabBar.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,15 +42,15 @@ namespace sd { class DrawViewShell; class LayerTabBar - : public TabBar, + : public TabBar, public DropTargetHelper { public: LayerTabBar ( - DrawViewShell* pDrViewSh, + DrawViewShell* pDrViewSh, ::Window* pParent); LayerTabBar ( - DrawViewShell* pDrViewSh, + DrawViewShell* pDrViewSh, ::Window* pParent, const ResId& rResId); virtual ~LayerTabBar (void); @@ -71,21 +71,21 @@ protected: DrawViewShell* pDrViewSh; // TabBar - virtual void Select(); - virtual void DoubleClick(); - virtual void MouseButtonDown(const MouseEvent& rMEvt); - - virtual void Command(const CommandEvent& rCEvt); - - virtual long StartRenaming(); - virtual long AllowRenaming(); - virtual void EndRenaming(); - - virtual void ActivatePage(); + virtual void Select(); + virtual void DoubleClick(); + virtual void MouseButtonDown(const MouseEvent& rMEvt); + + virtual void Command(const CommandEvent& rCEvt); + + virtual long StartRenaming(); + virtual long AllowRenaming(); + virtual void EndRenaming(); + + virtual void ActivatePage(); // DropTargetHelper - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); }; } // end of namespace sd diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx index caaa8c175f68..de40a6949c1b 100755 --- a/sd/source/ui/inc/MasterPageObserver.hxx +++ b/sd/source/ui/inc/MasterPageObserver.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ public: document. */ void UnregisterDocument (SdDrawDocument& rDocument); - + /** Add a listener that is informed of master pages that are newly assigned to slides or become unassigned. @param rEventListener @@ -117,13 +117,13 @@ public: EventType meType; SdDrawDocument& mrDocument; const String& mrMasterPageName; - + MasterPageObserverEvent ( EventType eType, SdDrawDocument& rDocument, const String& rMasterPageName) - : meType(eType), - mrDocument(rDocument), + : meType(eType), + mrDocument(rDocument), mrMasterPageName(rMasterPageName) {} diff --git a/sd/source/ui/inc/MediaObjectBar.hxx b/sd/source/ui/inc/MediaObjectBar.hxx index 2ad60e22182a..b3f948df66a9 100644 --- a/sd/source/ui/inc/MediaObjectBar.hxx +++ b/sd/source/ui/inc/MediaObjectBar.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ class View; class ViewShell; -class MediaObjectBar +class MediaObjectBar : public SfxShell { public: @@ -48,12 +48,12 @@ public: MediaObjectBar (ViewShell* pSdViewShell, ::sd::View* pSdView); virtual ~MediaObjectBar (void); - void GetState( SfxItemSet& rSet ); - void Execute( SfxRequest& rReq ); + void GetState( SfxItemSet& rSet ); + void Execute( SfxRequest& rReq ); protected: ::sd::View* mpView; - ViewShell* mpViewSh; + ViewShell* mpViewSh; }; } // end of namespace sd diff --git a/sd/source/ui/inc/MutexOwner.hxx b/sd/source/ui/inc/MutexOwner.hxx index 4ed23b31fa08..b3d123861cb7 100644 --- a/sd/source/ui/inc/MutexOwner.hxx +++ b/sd/source/ui/inc/MutexOwner.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ namespace sd { satisfy some helper classes from cppuhelper who expect a mutex as argument to their constructor. */ -class MutexOwner +class MutexOwner { protected: mutable ::osl::Mutex maMutex; diff --git a/sd/source/ui/inc/NavigatorChildWindow.hxx b/sd/source/ui/inc/NavigatorChildWindow.hxx index a649a6f772a2..186e18faa0d9 100644 --- a/sd/source/ui/inc/NavigatorChildWindow.hxx +++ b/sd/source/ui/inc/NavigatorChildWindow.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,13 +41,13 @@ namespace sd { |* \************************************************************************/ -class NavigatorChildWindow +class NavigatorChildWindow : public SfxChildWindowContext { public: NavigatorChildWindow ( - ::Window*, - USHORT, + ::Window*, + USHORT, SfxBindings*, SfxChildWinInfo*); diff --git a/sd/source/ui/inc/NotesChildWindow.hrc b/sd/source/ui/inc/NotesChildWindow.hrc index c25109d81a22..30eeb8ffd112 100644 --- a/sd/source/ui/inc/NotesChildWindow.hrc +++ b/sd/source/ui/inc/NotesChildWindow.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/NotesChildWindow.hxx b/sd/source/ui/inc/NotesChildWindow.hxx index 0d25c6cf3273..90653bc8e61c 100644 --- a/sd/source/ui/inc/NotesChildWindow.hxx +++ b/sd/source/ui/inc/NotesChildWindow.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ class NotesChildWindow public: NotesChildWindow (::Window*, USHORT, SfxBindings*, SfxChildWinInfo*); virtual ~NotesChildWindow (void); - + SFX_DECL_CHILDWINDOW (NotesChildWindow); }; diff --git a/sd/source/ui/inc/OutlineBulletDlg.hxx b/sd/source/ui/inc/OutlineBulletDlg.hxx index 4d10c9a0cc7a..29acfac43017 100644 --- a/sd/source/ui/inc/OutlineBulletDlg.hxx +++ b/sd/source/ui/inc/OutlineBulletDlg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,13 +41,13 @@ class View; |* Bullet-Tab-Dialog |* \************************************************************************/ -class OutlineBulletDlg +class OutlineBulletDlg : public SfxTabDialog { public: OutlineBulletDlg ( - ::Window* pParent, - const SfxItemSet* pAttr, + ::Window* pParent, + const SfxItemSet* pAttr, ::sd::View* pView ); virtual ~OutlineBulletDlg (void); @@ -59,10 +59,10 @@ protected: private: using SfxTabDialog::GetOutputItemSet; - SfxItemSet aInputSet; - SfxItemSet *pOutputSet; - BOOL bTitle; - ::sd::View *pSdView; + SfxItemSet aInputSet; + SfxItemSet *pOutputSet; + BOOL bTitle; + ::sd::View *pSdView; }; } // end of namespace sd diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 78481294bf94..5f96a5bff375 100755 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,12 +61,12 @@ static const int MAX_OUTLINERVIEWS = 4; |* \************************************************************************/ -class OutlineView +class OutlineView : public ::sd::View { friend class OutlineViewModelChangeGuard; public: - OutlineView (DrawDocShell* pDocSh, + OutlineView (DrawDocShell* pDocSh, ::Window* pWindow, OutlineViewShell* pOutlineViewSh); ~OutlineView (void); @@ -81,30 +81,30 @@ public: TYPEINFO(); - SdrTextObj* GetTitleTextObject(SdrPage* pPage); - SdrTextObj* GetOutlineTextObject(SdrPage* pPage); + SdrTextObj* GetTitleTextObject(SdrPage* pPage); + SdrTextObj* GetOutlineTextObject(SdrPage* pPage); - SdrTextObj* CreateTitleTextObject(SdPage* pPage); - SdrTextObj* CreateOutlineTextObject(SdPage* pPage); + SdrTextObj* CreateTitleTextObject(SdPage* pPage); + SdrTextObj* CreateOutlineTextObject(SdPage* pPage); virtual void AddWindowToPaintView(OutputDevice* pWin); virtual void DeleteWindowFromPaintView(OutputDevice* pWin); - OutlinerView* GetViewByWindow (::Window* pWin) const; + OutlinerView* GetViewByWindow (::Window* pWin) const; SdrOutliner* GetOutliner() { return(mpOutliner) ; } - Paragraph* GetPrevTitle(const Paragraph* pPara); - Paragraph* GetNextTitle(const Paragraph* pPara); - SdPage* GetActualPage(); - SdPage* GetPageForParagraph( Paragraph* pPara ); - Paragraph* GetParagraphForPage( ::Outliner* pOutl, SdPage* pPage ); + Paragraph* GetPrevTitle(const Paragraph* pPara); + Paragraph* GetNextTitle(const Paragraph* pPara); + SdPage* GetActualPage(); + SdPage* GetPageForParagraph( Paragraph* pPara ); + Paragraph* GetParagraphForPage( ::Outliner* pOutl, SdPage* pPage ); /** selects the paragraph for the given page at the outliner view*/ - void SetActualPage( SdPage* pActual ); + void SetActualPage( SdPage* pActual ); virtual void Paint (const Rectangle& rRect, ::sd::Window* pWin); virtual void AdjustPosSizePixel( - const Point &rPos, + const Point &rPos, const Size &rSize, ::sd::Window* pWindow); @@ -121,15 +121,15 @@ public: DECL_LINK( EndDropHdl, void * ); DECL_LINK( PaintingFirstLineHdl, PaintFirstLineInfo* ); - ULONG GetPaperWidth() const { return 2*21000; } // DIN A4 Breite + ULONG GetPaperWidth() const { return 2*21000; } // DIN A4 Breite - BOOL PrepareClose(BOOL bUI = TRUE); + BOOL PrepareClose(BOOL bUI = TRUE); - virtual BOOL GetAttributes( SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE ) const; - virtual BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll = FALSE); + virtual BOOL GetAttributes( SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE ) const; + virtual BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll = FALSE); -// virtual BOOL HasMarkedObjUnused() const; - void FillOutliner(); +// virtual BOOL HasMarkedObjUnused() const; + void FillOutliner(); void SetLinks(); void ResetLinks() const; @@ -138,16 +138,16 @@ public: void SetSelectedPages(); virtual sal_Int8 AcceptDrop ( - const AcceptDropEvent& rEvt, - DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, + const AcceptDropEvent& rEvt, + DropTargetHelper& rTargetHelper, + ::sd::Window* pTargetWindow = NULL, + USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRPAGE_NOTFOUND); virtual sal_Int8 ExecuteDrop ( - const ExecuteDropEvent& rEvt, - DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, + const ExecuteDropEvent& rEvt, + DropTargetHelper& rTargetHelper, + ::sd::Window* pTargetWindow = NULL, + USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRPAGE_NOTFOUND); @@ -162,7 +162,7 @@ public: */ void IgnoreCurrentPageChanges (bool bIgnore); -#if 0 +#if 0 sal_Int32 GetPageNumberWidthPixel(); #endif @@ -178,7 +178,7 @@ protected: virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos ); private: - /** call this method before you do anything that can modify the outliner + /** call this method before you do anything that can modify the outliner and or the drawing document model. It will create needed undo actions */ void BeginModelChange(); @@ -192,19 +192,19 @@ private: /** updates all changes in the outliner model to the draw model */ void UpdateDocument(); - OutlineViewShell* mpOutlineViewShell; - SdrOutliner* mpOutliner; - OutlinerView* mpOutlinerView[MAX_OUTLINERVIEWS]; + OutlineViewShell* mpOutlineViewShell; + SdrOutliner* mpOutliner; + OutlinerView* mpOutlinerView[MAX_OUTLINERVIEWS]; - List* mpOldParaOrder; - List* mpSelectedParas; + List* mpOldParaOrder; + List* mpSelectedParas; - USHORT mnPagesToProcess; // fuer die Fortschrittsanzeige - USHORT mnPagesProcessed; + USHORT mnPagesToProcess; // fuer die Fortschrittsanzeige + USHORT mnPagesProcessed; - BOOL mbFirstPaint; + BOOL mbFirstPaint; - SfxProgress* mpProgress; + SfxProgress* mpProgress; /** stores the last used high contrast mode. this is changed in onUpdateStyleSettings() @@ -217,7 +217,7 @@ private: Color maDocColor; /** updates the high contrast settings and document color if they changed. - @param bForceUpdate forces the method to set all style settings + @param bForceUpdate forces the method to set all style settings */ void onUpdateStyleSettings( bool bForceUpdate = false ); diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index 6c3848f39926..6fcc19849b41 100755 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,11 +91,11 @@ public: virtual void Activate( BOOL IsMDIActivate ); virtual void Deactivate( BOOL IsMDIActivate ); - virtual SdPage* GetActualPage(); + virtual SdPage* GetActualPage(); /// inherited from sd::ViewShell - virtual SdPage* getCurrentPage() const; - + virtual SdPage* getCurrentPage() const; + /** Return a string that describes the currently selected pages. */ String GetPageRangeString (void); @@ -116,7 +116,7 @@ public: virtual void SetZoom(long nZoom); virtual void SetZoomRect(const Rectangle& rZoomRect); - virtual String GetSelectionText( BOOL bCompleteWords = FALSE ); + virtual String GetSelectionText( BOOL bCompleteWords = FALSE ); virtual BOOL HasSelection( BOOL bText = TRUE ) const; void Execute(SfxRequest& rReq); @@ -169,9 +169,9 @@ protected: private: OutlineView* pOlView; - SdPage* pLastPage; // Zur performanten Aufbereitung der Preview + SdPage* pLastPage; // Zur performanten Aufbereitung der Preview TransferableClipboardListener* pClipEvtLstnr; - BOOL bPastePossible; + BOOL bPastePossible; bool mbInitialized; void Construct (DrawDocShell* pDocSh); diff --git a/sd/source/ui/inc/OutlineViewShellBase.hxx b/sd/source/ui/inc/OutlineViewShellBase.hxx index 2486eb80254c..f381d19c82cf 100644 --- a/sd/source/ui/inc/OutlineViewShellBase.hxx +++ b/sd/source/ui/inc/OutlineViewShellBase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/OutlinerIteratorImpl.hxx b/sd/source/ui/inc/OutlinerIteratorImpl.hxx index 320f5c6878d9..c63d38dbe326 100644 --- a/sd/source/ui/inc/OutlinerIteratorImpl.hxx +++ b/sd/source/ui/inc/OutlinerIteratorImpl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ class SdDrawDocument; class SdPage; class SdrObjListIter; -namespace sd { +namespace sd { class ViewShell; @@ -51,7 +51,7 @@ class IteratorImplBase; */ class IteratorImplBase { -public: +public: /** The constructor stores the given arguments to be used by the derived classes. @param pDocument @@ -140,14 +140,14 @@ protected: <p>For documentation of the methods please refere to the base class <type>IteratorImplBase</type>.</p> */ -class SelectionIteratorImpl +class SelectionIteratorImpl : public IteratorImplBase { public: SelectionIteratorImpl ( const ::std::vector< SdrObjectWeakRef >& rObjectList, sal_Int32 nObjectIndex, - SdDrawDocument* pDocument, + SdDrawDocument* pDocument, const ::boost::weak_ptr<ViewShell>& rpViewShellWeak, bool bDirectionIsForward); SelectionIteratorImpl (const SelectionIteratorImpl& rObject); @@ -171,7 +171,7 @@ private: @return Returns <TRUE/> when both iterators point to the same object. */ - virtual bool IsEqual (const IteratorImplBase& rIterator, IteratorType aType) const; + virtual bool IsEqual (const IteratorImplBase& rIterator, IteratorType aType) const; IteratorImplBase& operator= (const IteratorImplBase& rIterator); }; @@ -189,16 +189,16 @@ class ViewIteratorImpl : public IteratorImplBase { public: ViewIteratorImpl ( - sal_Int32 nPageIndex, - SdDrawDocument* pDocument, + sal_Int32 nPageIndex, + SdDrawDocument* pDocument, const ::boost::weak_ptr<ViewShell>& rpViewShellWeak, bool bDirectionIsForward); ViewIteratorImpl ( - sal_Int32 nPageIndex, - SdDrawDocument* pDocument, + sal_Int32 nPageIndex, + SdDrawDocument* pDocument, const ::boost::weak_ptr<ViewShell>& rpViewShellWeak, - bool bDirectionIsForward, - PageKind ePageKind, + bool bDirectionIsForward, + PageKind ePageKind, EditMode eEditMode); virtual ~ViewIteratorImpl (void); @@ -249,9 +249,9 @@ class DocumentIteratorImpl : public ViewIteratorImpl public: DocumentIteratorImpl ( sal_Int32 nPageIndex, - PageKind ePageKind, + PageKind ePageKind, EditMode eEditMode, - SdDrawDocument* pDocument, + SdDrawDocument* pDocument, const ::boost::weak_ptr<ViewShell>& rpViewShellWeak, bool bDirectionIsForward); virtual ~DocumentIteratorImpl (void); diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx index 9ba0a1f03720..d88118cf1ca5 100755 --- a/sd/source/ui/inc/PaneChildWindows.hxx +++ b/sd/source/ui/inc/PaneChildWindows.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,8 +39,8 @@ class PaneChildWindow public: PaneChildWindow ( ::Window* pParentWindow, - USHORT nId, - SfxBindings* pBindings, + USHORT nId, + SfxBindings* pBindings, SfxChildWinInfo* pInfo, const USHORT nDockWinTitleResId, const USHORT nTitleBarResId, @@ -84,8 +84,8 @@ class ToolPanelChildWindow :public PaneChildWindow public: ToolPanelChildWindow( ::Window* i_pParentWindow, - USHORT i_nId, - SfxBindings* i_pBindings, + USHORT i_nId, + SfxBindings* i_pBindings, SfxChildWinInfo* i_pChildWindowInfo ); SFX_DECL_CHILDWINDOW( ToolPanelChildWindow ); diff --git a/sd/source/ui/inc/PaneDockingWindow.hrc b/sd/source/ui/inc/PaneDockingWindow.hrc index eb7c23c075ec..deb2de3613fa 100755 --- a/sd/source/ui/inc/PaneDockingWindow.hrc +++ b/sd/source/ui/inc/PaneDockingWindow.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index 1874df10dd53..5daa35ae1dde 100755 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/PaneShells.hxx b/sd/source/ui/inc/PaneShells.hxx index de410c2565bf..d982603c0e99 100755 --- a/sd/source/ui/inc/PaneShells.hxx +++ b/sd/source/ui/inc/PaneShells.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,9 +39,9 @@ namespace sd { /** Shell that displays the left pane for Impress. The shell does not do - anything else and has especially no slots. + anything else and has especially no slots. */ -class LeftImpressPaneShell +class LeftImpressPaneShell : public SfxShell { public: @@ -56,9 +56,9 @@ public: /** Shell that displays the left pane for Draw. The shell does not do - anything else and has especially no slots. + anything else and has especially no slots. */ -class LeftDrawPaneShell +class LeftDrawPaneShell : public SfxShell { public: diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx index 366026fe2e06..a76134aa6709 100644 --- a/sd/source/ui/inc/PresentationViewShell.hxx +++ b/sd/source/ui/inc/PresentationViewShell.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,10 +41,10 @@ class PresentationViewShell : public DrawViewShell { public: TYPEINFO(); - + SFX_DECL_VIEWFACTORY(PresViewShell); SFX_DECL_INTERFACE( SD_IF_SDPRESVIEWSHELL ) - + PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameView = NULL); virtual ~PresentationViewShell (void); @@ -65,7 +65,7 @@ protected: private: Rectangle maOldVisArea; - + virtual void Activate (BOOL bIsMDIActivate); virtual void Paint (const Rectangle& rRect, ::sd::Window* pWin); }; diff --git a/sd/source/ui/inc/PresentationViewShellBase.hxx b/sd/source/ui/inc/PresentationViewShellBase.hxx index 26b31e2bfd65..02fc7607c93f 100644 --- a/sd/source/ui/inc/PresentationViewShellBase.hxx +++ b/sd/source/ui/inc/PresentationViewShellBase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx index fc9b657f7796..9862a27177b7 100644 --- a/sd/source/ui/inc/PreviewRenderer.hxx +++ b/sd/source/ui/inc/PreviewRenderer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,7 +82,7 @@ public: rendered in high contrast mode. */ Image RenderPage ( - const SdPage* pPage, + const SdPage* pPage, const sal_Int32 nWidth, const String& sSubstitutionText, const bool bObeyHighContrastMode = true); @@ -103,7 +103,7 @@ public: rendered in high contrast mode. */ Image RenderPage ( - const SdPage* pPage, + const SdPage* pPage, const Size aPreviewPixelSize, const String& sSubstitutionText, const bool bObeyHighContrastMode = true); @@ -116,7 +116,7 @@ public: Image RenderSubstitution ( const Size& rPreviewPixelSize, const String& sSubstitutionText); - + /** Scale the given bitmap by keeping its aspect ratio to the desired width. Add a frame to it afterwards. */ diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx index 2c044f9ab176..e45fecff6c4b 100644 --- a/sd/source/ui/inc/Ruler.hxx +++ b/sd/source/ui/inc/Ruler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,15 +45,15 @@ class Window; |* \************************************************************************/ -class Ruler +class Ruler : public SvxRuler { public: Ruler ( - DrawViewShell& rViewSh, - ::Window* pParent, + DrawViewShell& rViewSh, + ::Window* pParent, ::sd::Window* pWin, - USHORT nRulerFlags, + USHORT nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle); virtual ~Ruler (void); @@ -70,10 +70,10 @@ protected: RulerCtrlItem* pCtrlItem; BOOL bHorz; - virtual void MouseButtonDown(const MouseEvent& rMEvt); - virtual void MouseButtonUp(const MouseEvent& rMEvt); - virtual void MouseMove(const MouseEvent& rMEvt); - virtual void Command(const CommandEvent& rCEvt); + virtual void MouseButtonDown(const MouseEvent& rMEvt); + virtual void MouseButtonUp(const MouseEvent& rMEvt); + virtual void MouseMove(const MouseEvent& rMEvt); + virtual void Command(const CommandEvent& rCEvt); virtual void ExtraDown(); }; diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx index d29ca3b09d32..1a8277d0d0d0 100755 --- a/sd/source/ui/inc/SdUnoDrawView.hxx +++ b/sd/source/ui/inc/SdUnoDrawView.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ class DrawViewShell; /** This class implements the DrawViewShell specific part of the controller. */ -class SdUnoDrawView +class SdUnoDrawView : private cppu::BaseMutex, public DrawSubControllerInterfaceBase { @@ -61,34 +61,34 @@ public: virtual ~SdUnoDrawView (void) throw(); // XSelectionSupplier - + virtual sal_Bool SAL_CALL select ( const css::uno::Any& aSelection) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Any SAL_CALL getSelection (void) throw(css::uno::RuntimeException); - + virtual void SAL_CALL addSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) throw(css::uno::RuntimeException); - + virtual void SAL_CALL removeSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) throw(css::uno::RuntimeException); - + // XDrawView - + virtual void SAL_CALL setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage >& xPage) throw(css::uno::RuntimeException); - + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) throw(css::uno::RuntimeException); - + // XFastPropertySet virtual void SAL_CALL setFastPropertyValue ( @@ -99,13 +99,13 @@ public: css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); - + virtual css::uno::Any SAL_CALL getFastPropertyValue ( sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - + // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx index d2a4d4bfd39d..be5c0960b8d5 100755 --- a/sd/source/ui/inc/SdUnoOutlineView.hxx +++ b/sd/source/ui/inc/SdUnoOutlineView.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ class View; /** This class implements the OutlineViewShell specific part of the controller. */ -class SdUnoOutlineView +class SdUnoOutlineView : private cppu::BaseMutex, public DrawSubControllerInterfaceBase { @@ -66,29 +66,29 @@ public: const css::uno::Any& aSelection) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Any SAL_CALL getSelection (void) throw(css::uno::RuntimeException); - + virtual void SAL_CALL addSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) throw(css::uno::RuntimeException); - + virtual void SAL_CALL removeSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) throw(css::uno::RuntimeException); // XDrawView - + virtual void SAL_CALL setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage >& xPage) throw(css::uno::RuntimeException); - + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) throw(css::uno::RuntimeException); - + // XFastPropertySet virtual void SAL_CALL setFastPropertyValue ( @@ -99,7 +99,7 @@ public: css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); - + virtual css::uno::Any SAL_CALL getFastPropertyValue ( sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, @@ -107,10 +107,10 @@ public: css::uno::RuntimeException); // lang::XEventListener - virtual void SAL_CALL + virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) throw (::com::sun::star::uno::RuntimeException); - + // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx index 6005704ec895..14ebbb61acad 100755 --- a/sd/source/ui/inc/SdUnoSlideView.hxx +++ b/sd/source/ui/inc/SdUnoSlideView.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ class View; /** This class implements the SlideSorter specific part of the controller. */ -class SdUnoSlideView +class SdUnoSlideView : private cppu::BaseMutex, public DrawSubControllerInterfaceBase { @@ -68,25 +68,25 @@ public: virtual sal_Bool SAL_CALL select (const ::com::sun::star::uno::Any& aSelection) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - + virtual ::com::sun::star::uno::Any SAL_CALL getSelection (void) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) throw(css::uno::RuntimeException); - + virtual void SAL_CALL removeSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) throw(css::uno::RuntimeException); - + // XDrawView - + virtual void SAL_CALL setCurrentPage ( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage) throw(::com::sun::star::uno::RuntimeException); - + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getCurrentPage (void) throw(::com::sun::star::uno::RuntimeException); @@ -102,7 +102,7 @@ public: css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); - + virtual css::uno::Any SAL_CALL getFastPropertyValue ( sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, diff --git a/sd/source/ui/inc/ShellFactory.hxx b/sd/source/ui/inc/ShellFactory.hxx index 2da34539891f..5de0b7144f14 100644 --- a/sd/source/ui/inc/ShellFactory.hxx +++ b/sd/source/ui/inc/ShellFactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index f52bbb48ab6a..a1c9dc18d5e0 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ namespace sd { namespace slidesorter { /** Show previews for all the slides in a document and allow the user to insert or delete slides and modify the order of the slides. - + This class is a facade for the model, view, and controller classes. It is a hub that allows access to the various parts of a slide sorter. @@ -87,7 +87,7 @@ public: shutdown (when that can be detected). */ bool IsValid (void) const; - + /** Create a new slide sorter that is strongly coupled to the given view shell. Use this function for a slide sorter in the left pane. @param rViewShell @@ -171,7 +171,7 @@ public: ViewShellBase* GetViewShellBase (void) const; void Paint (const Rectangle& rRepaintArea); - + /** Place and size the controls and windows. You may want to call this method when something has changed that for instance affects the visibility state of the scroll bars. @@ -186,7 +186,7 @@ public: /** Set the current function at the view shell or, when it is not present, set it at the content window. This method supports the use of functions even when there is no SlideSorterViewShell. - */ + */ void SetCurrentFunction (const FunctionReference& rpFunction); protected: diff --git a/sd/source/ui/inc/SlideSorterChildWindow.hrc b/sd/source/ui/inc/SlideSorterChildWindow.hrc index 541b0bd3a18c..3a827e7bde44 100644 --- a/sd/source/ui/inc/SlideSorterChildWindow.hrc +++ b/sd/source/ui/inc/SlideSorterChildWindow.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/SlideSorterChildWindow.hxx b/sd/source/ui/inc/SlideSorterChildWindow.hxx index 9f0f56a1b99d..025e2ee6611b 100644 --- a/sd/source/ui/inc/SlideSorterChildWindow.hxx +++ b/sd/source/ui/inc/SlideSorterChildWindow.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,13 +42,13 @@ class SlideSorterChildWindow { public: SlideSorterChildWindow ( - ::Window*, - USHORT, - SfxBindings*, + ::Window*, + USHORT, + SfxBindings*, SfxChildWinInfo*); virtual ~SlideSorterChildWindow (void); - + SFX_DECL_CHILDWINDOW (SlideBrowserChildWindow); }; diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index 4e6033d67ad1..54da9d8f5fe4 100755 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ public: SFX_DECL_INTERFACE(SD_IF_SDSLIDESORTERVIEWSHELL) static ::boost::shared_ptr<SlideSorterViewShell> Create( - SfxViewFrame* pFrame, + SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameView); @@ -77,10 +77,10 @@ public: virtual void GetFocus (void); virtual void LoseFocus (void); - virtual SdPage* GetActualPage (void); + virtual SdPage* GetActualPage (void); /// inherited from sd::ViewShell - virtual SdPage* getCurrentPage() const; + virtual SdPage* getCurrentPage() const; void ExecCtrl (SfxRequest& rRequest); virtual void GetCtrlState (SfxItemSet &rSet); @@ -129,15 +129,15 @@ public: sal_Int8 nDropAction); virtual sal_Int8 AcceptDrop ( const AcceptDropEvent& rEvt, - DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, + DropTargetHelper& rTargetHelper, + ::sd::Window* pTargetWindow = NULL, + USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRPAGE_NOTFOUND ); virtual sal_Int8 ExecuteDrop ( - const ExecuteDropEvent& rEvt, + const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, + ::sd::Window* pTargetWindow = NULL, + USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRPAGE_NOTFOUND); typedef ::std::vector<SdPage*> PageSelection; @@ -198,7 +198,7 @@ private: ::boost::shared_ptr<SlideSorter> mpSlideSorter; SlideSorterViewShell ( - SfxViewFrame* pFrame, + SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameView); diff --git a/sd/source/ui/inc/SlideSorterViewShellBase.hxx b/sd/source/ui/inc/SlideSorterViewShellBase.hxx index 04774e19ab9a..06be68d78143 100644 --- a/sd/source/ui/inc/SlideSorterViewShellBase.hxx +++ b/sd/source/ui/inc/SlideSorterViewShellBase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/SlideView.hxx b/sd/source/ui/inc/SlideView.hxx index 17f7f17e3a9a..10b73bcce316 100755 --- a/sd/source/ui/inc/SlideView.hxx +++ b/sd/source/ui/inc/SlideView.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,15 +58,15 @@ enum SlideViewFocusMove // - SdSlideView - // --------------- -class SlideView +class SlideView : public ::sd::View { public: TYPEINFO(); SlideView ( - SdDrawDocument* pDoc, - ::Window* pWindow, + SdDrawDocument* pDoc, + ::Window* pWindow, SlideViewShell* pSlideVShell); virtual ~SlideView (void); @@ -89,18 +89,18 @@ public: void Paint(const Rectangle& rRect, OutputDevice* pOut); void DrawSelectionRect(USHORT nPage); - Point CalcPagePos( USHORT nPageNo ) const; + Point CalcPagePos( USHORT nPageNo ) const; Rectangle GetPageArea( USHORT nPageNo ) const; - ULONG GetPageGap() const; + ULONG GetPageGap() const; Rectangle GetFadeIconArea( USHORT nPageNo ) const; SdPage* GetHitPage( const Point& rPos ) const; SdPage* GetFadePage( const Point& rPos ) const; SdPage* GetNearestPage( const Point& rPos ) const; - + void DeleteMarked(); void MoveMarked( USHORT nTargetPage ); - void AddToCache( SdPage* pPage, const Bitmap& rBitmap, long nZoom ); + void AddToCache( SdPage* pPage, const Bitmap& rBitmap, long nZoom ); const GraphicObject* GetFromCache( SdPage* pPage, long& rZoom, long nZoomTolerance ) const; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); @@ -111,29 +111,29 @@ public: virtual void StartDrag( const Point& rDragPt, ::Window* pWindow ); virtual void DragFinished( sal_Int8 nDropAction ); - - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, + + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, + ::sd::Window* pTargetWindow = NULL, + USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRPAGE_NOTFOUND ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, + ::sd::Window* pTargetWindow = NULL, + USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRPAGE_NOTFOUND ); - void UpdateAllPages(); + void UpdateAllPages(); private: - Timer aDelayedPaintTimer; - List aDelayedPaints; - SlideViewShell* pSlideViewShell; - BitmapCache* pCache; - VirtualDevice* mpVDev; - USHORT nAllowInvalidateSmph; - USHORT nPagesPerRow; + Timer aDelayedPaintTimer; + List aDelayedPaints; + SlideViewShell* pSlideViewShell; + BitmapCache* pCache; + VirtualDevice* mpVDev; + USHORT nAllowInvalidateSmph; + USHORT nPagesPerRow; USHORT nFocusPage; - BOOL bInPaint; - BOOL bInDelayedPaint; + BOOL bInPaint; + BOOL bInDelayedPaint; DECL_LINK( PaintDelayed, Timer * ); void CreateSlideTransferable (::Window* pWindow, BOOL bDrag); diff --git a/sd/source/ui/inc/SlideViewShell.hxx b/sd/source/ui/inc/SlideViewShell.hxx index ef8ab20fded3..ae67df27a53d 100644 --- a/sd/source/ui/inc/SlideViewShell.hxx +++ b/sd/source/ui/inc/SlideViewShell.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,12 +66,12 @@ public: The frame view that makes it possible to pass information from one view shell to the next. */ - SlideViewShell(SfxViewFrame* pFrame, + SlideViewShell(SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameView = NULL); - SlideViewShell(SfxViewFrame *pFrame, + SlideViewShell(SfxViewFrame *pFrame, ::Window* pParentWindow, const SlideViewShell& rShell); @@ -87,14 +87,14 @@ public: virtual void ArrangeGUIElements (void); virtual void AddWindow(::sd::Window* pWin) { pSlideView->AddWindowToPaintView((OutputDevice*) pWin); } virtual void RemoveWindow(::sd::Window* pWin) { pSlideView->DeleteWindowFromPaintView((OutputDevice*) pWin); } - + virtual BOOL KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); virtual void MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void Command(const CommandEvent& rCEvt, ::sd::Window* pWin); - virtual SdPage* GetActualPage(); + virtual SdPage* GetActualPage(); /** @returns current or selected page or 0. @@ -122,8 +122,8 @@ public: virtual void ReadFrameViewData(FrameView* pView); virtual void WriteFrameViewData(); - virtual void SetZoom(long nZoom); - virtual void SetZoomRect(const Rectangle& rZoomRect); + virtual void SetZoom(long nZoom); + virtual void SetZoomRect(const Rectangle& rZoomRect); virtual BOOL HasSelection( BOOL bText = TRUE ) const; @@ -137,8 +137,8 @@ public: @param nPage When the page number is invalid then the call is ignored. */ - void DrawSelectionRect( USHORT nPage ); - void DrawFocusRect( USHORT nPage ); + void DrawSelectionRect( USHORT nPage ); + void DrawFocusRect( USHORT nPage ); virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); @@ -164,11 +164,11 @@ protected: private: SlideView* pSlideView; - Point aDisplayPos; - Size aDisplaySize; + Point aDisplayPos; + Size aDisplaySize; USHORT nCurFocusPage; - bool bSetInitialZoomFactor; - bool bInitializeWinPos; + bool bSetInitialZoomFactor; + bool bInitializeWinPos; void Construct(SdDrawDocument* pDoc); void ImplDrawFocusRect( USHORT nPage, BOOL bVisible ); diff --git a/sd/source/ui/inc/SpellDialogChildWindow.hxx b/sd/source/ui/inc/SpellDialogChildWindow.hxx index 4e08dd99b063..700f6c01ec57 100755 --- a/sd/source/ui/inc/SpellDialogChildWindow.hxx +++ b/sd/source/ui/inc/SpellDialogChildWindow.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,9 +44,9 @@ class SpellDialogChildWindow { public: SpellDialogChildWindow ( - ::Window* pParent, + ::Window* pParent, USHORT nId, - SfxBindings* pBindings, + SfxBindings* pBindings, SfxChildWinInfo* pInfo); virtual ~SpellDialogChildWindow (void); diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx index 48de6910dece..48ade63f1b47 100644 --- a/sd/source/ui/inc/TabControl.hxx +++ b/sd/source/ui/inc/TabControl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,10 +41,10 @@ namespace sd { class DrawViewShell; -class TabControl - : public TabBar, - public DragSourceHelper, - public DropTargetHelper +class TabControl + : public TabBar, + public DragSourceHelper, + public DropTargetHelper { public: TabControl (DrawViewShell* pDrViewSh, ::Window* pParent); @@ -63,29 +63,29 @@ public: void SendDeactivatePageEvent (void); protected: - DrawViewShell* pDrViewSh; - BOOL bInternalMove; + DrawViewShell* pDrViewSh; + BOOL bInternalMove; // TabBar - virtual void Select(); - virtual void DoubleClick(); - virtual void MouseButtonDown(const MouseEvent& rMEvt); - - virtual void Command(const CommandEvent& rCEvt); - - virtual long StartRenaming(); - virtual long AllowRenaming(); - virtual void EndRenaming(); - - virtual void ActivatePage(); - virtual long DeactivatePage(); + virtual void Select(); + virtual void DoubleClick(); + virtual void MouseButtonDown(const MouseEvent& rMEvt); + + virtual void Command(const CommandEvent& rCEvt); + + virtual long StartRenaming(); + virtual long AllowRenaming(); + virtual void EndRenaming(); + + virtual void ActivatePage(); + virtual long DeactivatePage(); // DragSourceHelper - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); // DropTargetHelper - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); DECL_LINK(DeactivatePageHdl, void*); @@ -98,19 +98,19 @@ private: mrParent( rParent ) {} private: - TabControl& mrParent; - - virtual ~TabControlTransferable(); - - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void DragFinished( sal_Int8 nDropAction ); + TabControl& mrParent; + virtual ~TabControlTransferable(); + + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void DragFinished( sal_Int8 nDropAction ); + }; friend class TabControl::TabControlTransferable; - void DragFinished( sal_Int8 nDropAction ); + void DragFinished( sal_Int8 nDropAction ); private: using TabBar::StartDrag; diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx index 1c5f0cfe6f11..a24fd9094805 100644 --- a/sd/source/ui/inc/TemplateScanner.hxx +++ b/sd/source/ui/inc/TemplateScanner.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -165,7 +165,7 @@ private: */ class FolderDescriptorList; ::boost::scoped_ptr<FolderDescriptorList> mpFolderDescriptors; - + /** Set of state variables used by the methods InitializeFolderScanning(), GatherFolderList(), ScanFolder(), InitializeEntryScanning(), and ScanEntry(). diff --git a/sd/source/ui/inc/TextLogger.hxx b/sd/source/ui/inc/TextLogger.hxx index 0c2214935bb7..8b344c680e27 100644 --- a/sd/source/ui/inc/TextLogger.hxx +++ b/sd/source/ui/inc/TextLogger.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/TextObjectBar.hxx b/sd/source/ui/inc/TextObjectBar.hxx index afb9e88b16a2..5a9c463f89d7 100644 --- a/sd/source/ui/inc/TextObjectBar.hxx +++ b/sd/source/ui/inc/TextObjectBar.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ class View; class ViewShell; class Window; -class TextObjectBar +class TextObjectBar : public SfxShell { public: @@ -49,7 +49,7 @@ public: SFX_DECL_INTERFACE(SD_IF_SDDRAWTEXTOBJECTBAR) TextObjectBar ( - ViewShell* pSdViewShell, + ViewShell* pSdViewShell, SfxItemPool& rItemPool, ::sd::View* pSdView); virtual ~TextObjectBar (void); diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx index d8b84d1d7b61..e37143eb2e7a 100755 --- a/sd/source/ui/inc/ToolBarManager.hxx +++ b/sd/source/ui/inc/ToolBarManager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -130,7 +130,7 @@ public: const static ::rtl::OUString msBezierObjectBar; // RID_BEZIER_TOOLBOX, 23015 const static ::rtl::OUString msGraphicObjectBar; // RID_DRAW_GRAF_TOOLBOX, 23030 const static ::rtl::OUString msMediaObjectBar; // RID_DRAW_MEDIA_TOOLBOX, 23031 - const static ::rtl::OUString msTableObjectBar; // RID_DRAW_TABLE_TOOLBOX + const static ::rtl::OUString msTableObjectBar; // RID_DRAW_TABLE_TOOLBOX /** The set of tool bar groups. */ diff --git a/sd/source/ui/inc/UpdateLockManager.hxx b/sd/source/ui/inc/UpdateLockManager.hxx index 9a0f6b65b259..8ee4af44c7f3 100644 --- a/sd/source/ui/inc/UpdateLockManager.hxx +++ b/sd/source/ui/inc/UpdateLockManager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index f78051bdd719..238c41c32f15 100755 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ class ViewClipboard; struct SdViewRedrawRec { OutputDevice* mpOut; - Rectangle aRect; + Rectangle aRect; }; @@ -80,17 +80,17 @@ public: TYPEINFO(); View ( - SdDrawDocument* pDrawDoc, - OutputDevice* pOutDev, + SdDrawDocument* pDrawDoc, + OutputDevice* pOutDev, ViewShell* pViewSh=NULL); virtual ~View (void); void CompleteRedraw( OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L); - virtual BOOL GetAttributes( SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE ) const; - virtual BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll = FALSE); - virtual void MarkListHasChanged(); - virtual void ModelHasChanged(); + virtual BOOL GetAttributes( SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE ) const; + virtual BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll = FALSE); + virtual void MarkListHasChanged(); + virtual void ModelHasChanged(); virtual void SelectAll(); virtual void DoCut(::Window* pWindow=NULL); virtual void DoCopy(::Window* pWindow=NULL); @@ -100,24 +100,24 @@ public: virtual void StartDrag( const Point& rStartPos, ::Window* pWindow ); virtual void DragFinished( sal_Int8 nDropAction ); virtual sal_Int8 AcceptDrop ( - const AcceptDropEvent& rEvt, + const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, + ::sd::Window* pTargetWindow = NULL, + USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRPAGE_NOTFOUND); virtual sal_Int8 ExecuteDrop ( - const ExecuteDropEvent& rEvt, + const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, + ::sd::Window* pTargetWindow = NULL, + USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRPAGE_NOTFOUND); ::com::sun::star::uno::Reference< - ::com::sun::star::datatransfer::XTransferable> + ::com::sun::star::datatransfer::XTransferable> CreateClipboardDataObject (::sd::View*, ::Window& rWindow); - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable> - CreateDragDataObject (::sd::View*, ::Window& rWindow, + CreateDragDataObject (::sd::View*, ::Window& rWindow, const Point& rDragPos); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable> @@ -137,15 +137,15 @@ public: bool RestoreDefaultText( SdrTextObj* pTextObj ); - BOOL InsertData( const TransferableDataHelper& rDataHelper, + BOOL InsertData( const TransferableDataHelper& rDataHelper, const Point& rPos, sal_Int8& rDnDAction, BOOL bDrag, ULONG nFormat = 0, USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRLAYER_NOTFOUND ); /** gets the metafile from the given transferable helper and insert it as a graphic shape. @param bOptimize if set to true, the metafile is analyzed and if only one bitmap action is present, then is is inserted as a single graphic. */ - bool InsertMetaFile( TransferableDataHelper& rDataHelper, - const Point& rInsertPos, + bool InsertMetaFile( TransferableDataHelper& rDataHelper, + const Point& rInsertPos, ImageMap* pImageMap, bool bOptimize ); SdrGrafObj* InsertGraphic( const Graphic& rGraphic, @@ -156,23 +156,23 @@ public: bool PasteRTFTable( SotStorageStreamRef xStm, SdrPage* pPage, ULONG nPasteOptions ); - BOOL IsPresObjSelected(BOOL bOnPage=TRUE, BOOL bOnMasterPage=TRUE, BOOL bCheckPresObjListOnly=FALSE, BOOL bCheckLayoutOnly=FALSE) const; + BOOL IsPresObjSelected(BOOL bOnPage=TRUE, BOOL bOnMasterPage=TRUE, BOOL bCheckPresObjListOnly=FALSE, BOOL bCheckLayoutOnly=FALSE) const; - void SetMarkedOriginalSize(); + void SetMarkedOriginalSize(); - void LockRedraw(BOOL bLock); + void LockRedraw(BOOL bLock); - BOOL IsMorphingAllowed() const; - BOOL IsVectorizeAllowed() const; + BOOL IsMorphingAllowed() const; + BOOL IsVectorizeAllowed() const; virtual SfxStyleSheet* GetStyleSheet() const; - BOOL GetExchangeList( List*& rpExchangeList, List* pBookmarkList, USHORT nType ); + BOOL GetExchangeList( List*& rpExchangeList, List* pBookmarkList, USHORT nType ); virtual void onAccessibilityOptionsChanged(); virtual SdrModel* GetMarkedObjModel() const; - virtual BOOL Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0); + virtual BOOL Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0); using SdrExchangeView::Paste; /** returns true if we have an undo manager and there is an open list undo action */ @@ -213,21 +213,21 @@ protected: virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos ); virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos ); - SdDrawDocument* mpDoc; - DrawDocShell* mpDocSh; - ViewShell* mpViewSh; - SdrMarkList* mpDragSrcMarkList; - SdrObject* mpDropMarkerObj; - SdrDropMarkerOverlay* mpDropMarker; - USHORT mnDragSrcPgNum; - Point maDropPos; - ::std::vector< String > maDropFileVector; - sal_Int8 mnAction; - Timer maDropErrorTimer; - Timer maDropInsertFileTimer; - USHORT mnLockRedrawSmph; - List* mpLockedRedraws; - bool mbIsDropAllowed; + SdDrawDocument* mpDoc; + DrawDocShell* mpDocSh; + ViewShell* mpViewSh; + SdrMarkList* mpDragSrcMarkList; + SdrObject* mpDropMarkerObj; + SdrDropMarkerOverlay* mpDropMarker; + USHORT mnDragSrcPgNum; + Point maDropPos; + ::std::vector< String > maDropFileVector; + sal_Int8 mnAction; + Timer maDropErrorTimer; + Timer maDropInsertFileTimer; + USHORT mnLockRedrawSmph; + List* mpLockedRedraws; + bool mbIsDropAllowed; DECL_LINK( DropErrorHdl, Timer* ); DECL_LINK( DropInsertFileHdl, Timer* ); @@ -235,20 +235,20 @@ protected: void ImplClearDrawDropMarker(); - SmartTagSet maSmartTags; + SmartTagSet maSmartTags; private: ::std::auto_ptr<ViewClipboard> mpClipboard; }; -DrawDocShell* View::GetDocSh (void) const +DrawDocShell* View::GetDocSh (void) const { - return mpDocSh; + return mpDocSh; } -SdDrawDocument* View::GetDoc (void) const +SdDrawDocument* View::GetDoc (void) const { - return mpDoc; + return mpDoc; } ViewShell* View::GetViewShell (void) const diff --git a/sd/source/ui/inc/ViewClipboard.hxx b/sd/source/ui/inc/ViewClipboard.hxx index 216c4e8c1dbe..a9b646fc4d77 100644 --- a/sd/source/ui/inc/ViewClipboard.hxx +++ b/sd/source/ui/inc/ViewClipboard.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index ffefb9de7359..16605c4f7665 100755 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ class SdPage; class SvxRuler; -class SdrOle2Obj; // fuer die, die Teile von SVDRAW rausdefiniert haben +class SdrOle2Obj; // fuer die, die Teile von SVDRAW rausdefiniert haben class ScrollBarBox; class SdDrawDocument; class ScrollBar; @@ -111,33 +111,33 @@ public: ST_DRAW, // The Draw application. ST_IMPRESS, // Main view of the Impress application. ST_NOTES, - ST_HANDOUT, - ST_OUTLINE, + ST_HANDOUT, + ST_OUTLINE, ST_SLIDE_SORTER, ST_PRESENTATION, ST_TASK_PANE }; static const int MAX_HSPLIT_CNT = 1; static const int MAX_VSPLIT_CNT = 1; - static const int MIN_SCROLLBAR_SIZE = 50; + static const int MIN_SCROLLBAR_SIZE = 50; static const ULONG OUTPUT_DRAWMODE_COLOR = DRAWMODE_DEFAULT; - static const ULONG OUTPUT_DRAWMODE_GRAYSCALE - = DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL - | DRAWMODE_BLACKTEXT | DRAWMODE_GRAYBITMAP + static const ULONG OUTPUT_DRAWMODE_GRAYSCALE + = DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL + | DRAWMODE_BLACKTEXT | DRAWMODE_GRAYBITMAP | DRAWMODE_GRAYGRADIENT; - static const int OUTPUT_DRAWMODE_BLACKWHITE - = DRAWMODE_BLACKLINE | DRAWMODE_BLACKTEXT - | DRAWMODE_WHITEFILL | DRAWMODE_GRAYBITMAP + static const int OUTPUT_DRAWMODE_BLACKWHITE + = DRAWMODE_BLACKLINE | DRAWMODE_BLACKTEXT + | DRAWMODE_WHITEFILL | DRAWMODE_GRAYBITMAP | DRAWMODE_WHITEGRADIENT; - static const int OUTPUT_DRAWMODE_CONTRAST - = DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL + static const int OUTPUT_DRAWMODE_CONTRAST + = DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT; TYPEINFO(); ViewShell ( - SfxViewFrame *pFrame, + SfxViewFrame *pFrame, ::Window* pParentWindow, ViewShellBase& rViewShellBase, bool bAllowCenter = true); @@ -224,13 +224,13 @@ public: bar controls are not modified. */ virtual void UpdateScrollBars (void); - void Scroll(long nX, long nY); - void ScrollLines(long nX, long nY); - virtual void SetZoom(long nZoom); - virtual void SetZoomRect(const Rectangle& rZoomRect); - void InitWindows(const Point& rViewOrigin, const Size& rViewSize, + void Scroll(long nX, long nY); + void ScrollLines(long nX, long nY); + virtual void SetZoom(long nZoom); + virtual void SetZoomRect(const Rectangle& rZoomRect); + void InitWindows(const Point& rViewOrigin, const Size& rViewSize, const Point& rWinPos, BOOL bUpdate = FALSE); - void InvalidateWindows(); + void InvalidateWindows(); /** This method is still used by the OutlineViewShell to update the model according to the content of the outline view. This in turn updates the previews in the slide sorter. @@ -239,7 +239,7 @@ public: void DrawMarkRect(const Rectangle& rRect) const; - void ExecReq( SfxRequest &rReq ); + void ExecReq( SfxRequest &rReq ); ZoomList* GetZoomList (void); @@ -260,10 +260,10 @@ public: /** @returns current or selected page or 0. This method will fail in master page mode. - + @deprecated, please use getCurrentPage(); */ - virtual SdPage* GetActualPage() = 0; + virtual SdPage* GetActualPage() = 0; /** @returns current or selected page or 0. @@ -280,13 +280,13 @@ public: void SetOldFunction(const FunctionReference& xFunction); void DeactivateCurrentFunction( bool bPermanent = false ); - void SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, + void SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, long nLeft, long nRight, long nUpper, long nLower, BOOL bScaleAll, Orientation eOrient, USHORT nPaperBin, BOOL bBackgroundFullSize ); - void SetStartShowWithDialog( BOOL bIn = TRUE ) { mbStartShowWithDialog = bIn; } - BOOL IsStartShowWithDialog() const { return mbStartShowWithDialog; } + void SetStartShowWithDialog( BOOL bIn = TRUE ) { mbStartShowWithDialog = bIn; } + BOOL IsStartShowWithDialog() const { return mbStartShowWithDialog; } USHORT GetPrintedHandoutPageNum (void) const { return mnPrintedHandoutPageNum; } void SetPrintedHandoutPageNum (USHORT nPageNumber) {mnPrintedHandoutPageNum=nPageNumber; } @@ -371,7 +371,7 @@ public: The new size in pixel. */ // This is to be replaced by Resize. - // virtual void AdjustPosSizePixel(const Point &rPos, const Size &rSize); + // virtual void AdjustPosSizePixel(const Point &rPos, const Size &rSize); /** Set position and size of the GUI elements that are controllerd by the view shell like rulers and scroll bars as well as the actual @@ -380,8 +380,8 @@ public: */ virtual void ArrangeGUIElements (void); - // virtual void OuterResizePixel(const Point &rPos, const Size &rSize); - // virtual void InnerResizePixel(const Point &rPos, const Size &rSize); + // virtual void OuterResizePixel(const Point &rPos, const Size &rSize); + // virtual void InnerResizePixel(const Point &rPos, const Size &rSize); ViewShellBase& GetViewShellBase (void) const; @@ -409,8 +409,8 @@ public: /** This method is more or less an alias to Deactivate(). It is called before an object of this class is taken from the stack of view - shells. - + shells. + <p>When this method is not called before a view shell is taken from a stack then the Deactivate() call from the SFX as a response to RemoveSubShell() comes to late when the view shell is not on the @@ -475,24 +475,24 @@ protected: /// The active window. ::sd::Window* mpActiveWindow; ::sd::View* mpView; - FrameView* mpFrameView; + FrameView* mpFrameView; - FunctionReference mxCurrentFunction; - FunctionReference mxOldFunction; - ZoomList* mpZoomList; + FunctionReference mxCurrentFunction; + FunctionReference mxOldFunction; + ZoomList* mpZoomList; - Point maViewPos; - Size maViewSize; - Size maScrBarWH; + Point maViewPos; + Size maViewSize; + Size maScrBarWH; - BOOL mbCenterAllowed; // wird an Fenster weitergegeben + BOOL mbCenterAllowed; // wird an Fenster weitergegeben - BOOL mbStartShowWithDialog; // Praesentation wurde ueber Dialog gestartet - USHORT mnPrintedHandoutPageNum; // Page number of the handout page that is to be printed. + BOOL mbStartShowWithDialog; // Praesentation wurde ueber Dialog gestartet + USHORT mnPrintedHandoutPageNum; // Page number of the handout page that is to be printed. USHORT mnPrintedHandoutPageCount; // Page count of the handout pages that are to be printed. - //af BOOL bPrintDirectSelected; // Print only selected objects in direct print - //afString sPageRange; // pagerange if selected objects in direct print + //af BOOL bPrintDirectSelected; // Print only selected objects in direct print + //afString sPageRange; // pagerange if selected objects in direct print /** Area covered by all windows, i.e. the area of the parent window without the controls at the borders like rulers, scroll bars, tab @@ -586,12 +586,12 @@ private: return mpParentWindow; } -::sd::View* ViewShell::GetView (void) const +::sd::View* ViewShell::GetView (void) const { - return mpView; + return mpView; } -SdrView* ViewShell::GetDrawView (void) const +SdrView* ViewShell::GetDrawView (void) const { return static_cast<SdrView*>(mpView); } diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 38f7223f1d83..587a12e2ee44 100755 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -208,7 +208,7 @@ public: This is done by adding the border used by the ViewShellBase itself with the border used by the main view shell. - @param bForce if true the borders are also updated if old border + @param bForce if true the borders are also updated if old border and new border are same. */ void UpdateBorder ( bool bForce = false ); @@ -249,7 +249,7 @@ public: of that window remains with the called ViewShellBase object. */ ::Window* GetViewWindow (void); - + /** returns the ui descriptive name for the given uno slot. The result is taken from the configuration and not cached, so do not use it excessive (f.e. in status updates) */ ::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) const; diff --git a/sd/source/ui/inc/ViewShellHint.hxx b/sd/source/ui/inc/ViewShellHint.hxx index 6124a95c29c1..42410654377b 100644 --- a/sd/source/ui/inc/ViewShellHint.hxx +++ b/sd/source/ui/inc/ViewShellHint.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx index f4f07b5549dd..60704da89f20 100755 --- a/sd/source/ui/inc/ViewShellImplementation.hxx +++ b/sd/source/ui/inc/ViewShellImplementation.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -127,8 +127,8 @@ public: void AssignLayout ( SfxRequest& rRequest, PageKind ePageKind ); /** Determine the view id of the view shell. This corresponds to the - view id stored in the SfxViewFrame class. - + view id stored in the SfxViewFrame class. + We can not use the view of that class because with the introduction of the multi pane GUI we do not switch the SfxViewShell anymore when switching the view in the center pane. The view id of the diff --git a/sd/source/ui/inc/ViewShellManager.hxx b/sd/source/ui/inc/ViewShellManager.hxx index d674e7d07eff..1dcde8358f80 100755 --- a/sd/source/ui/inc/ViewShellManager.hxx +++ b/sd/source/ui/inc/ViewShellManager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ class ViewShellBase; view shells. The FormShell is a special case. With the SetFormShell() method it can be placed directly above or below one of the view shells.</p> - + <p>Shells managed by this class are created by factories or are given directly to Activate... methods. For the sub shells there is one factory for every view shell. Factories are added or removed via the @@ -98,7 +98,7 @@ public: use the ActivateViewShell() method. */ void ActivateShell (SfxShell* pShell); - + /** Deactivate the specified shell, i.e. take it and all of its object bars from the shell stack. @param pShell @@ -145,13 +145,13 @@ public: taken once off the stack and are then moved back on again.) */ void MoveSubShellToTop (const ViewShell& rParentShell, ShellId nId); - + /** Send all sub shells of the specified view shell an Invalidate() call. This does not modify the shell stack. */ void InvalidateAllSubShells ( ViewShell* pViewShell); - + /** Move the specified view shell to the top most position on the stack of view shells in relation to the other view shells. After this the only shells that are higher on the stack are its object bars. @@ -181,7 +181,7 @@ public: whether that is a view shell or a sub shell. */ SfxShell* GetTopShell (void) const; - + /** Use this class to safely lock updates of the view shell stack. */ class UpdateLock diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index 9c6077936f2c..afe5ad69fb9b 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,7 +71,7 @@ namespace sd { /** Tab control for switching between views in the center pane. */ -class ViewTabBar +class ViewTabBar : private sd::MutexOwner, public ViewTabBarInterfaceBase { @@ -91,12 +91,12 @@ public: //----- drawing::framework::XConfigurationChangeListener ------------------ - virtual void SAL_CALL + virtual void SAL_CALL notifyConfigurationChange ( const ::com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) throw (::com::sun::star::uno::RuntimeException); - + //----- XEventListener ---------------------------------------------------- virtual void SAL_CALL disposing( @@ -121,17 +121,17 @@ public: SAL_CALL removeTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton) throw (::com::sun::star::uno::RuntimeException); - + virtual sal_Bool SAL_CALL hasTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton) throw (::com::sun::star::uno::RuntimeException); - + virtual ::com::sun::star::uno::Sequence<com::sun::star::drawing::framework::TabBarButton> SAL_CALL getTabBarButtons (void) throw (::com::sun::star::uno::RuntimeException); - + //----- XResource --------------------------------------------------------- virtual ::com::sun::star::uno::Reference< @@ -171,7 +171,7 @@ public: const ::com::sun::star::drawing::framework::TabBarButton& rButton); ::com::sun::star::uno::Sequence<com::sun::star::drawing::framework::TabBarButton> GetTabBarButtons (void); - + private: ::boost::shared_ptr< ::TabControl> mpTabControl; ::com::sun::star::uno::Reference< diff --git a/sd/source/ui/inc/ViewTabControl.hxx b/sd/source/ui/inc/ViewTabControl.hxx index 4009edfd04d4..951edc5cf82b 100644 --- a/sd/source/ui/inc/ViewTabControl.hxx +++ b/sd/source/ui/inc/ViewTabControl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,10 +41,10 @@ namespace sd { class DrawViewShell; -class TabControl - : public TabBar, - public DragSourceHelper, - public DropTargetHelper +class TabControl + : public TabBar, + public DragSourceHelper, + public DropTargetHelper { public: TabControl (DrawViewShell* pDrViewSh, ::Window* pParent); @@ -63,29 +63,29 @@ public: void SendDeactivatePageEvent (void); protected: - DrawViewShell* pDrViewSh; - BOOL bInternalMove; + DrawViewShell* pDrViewSh; + BOOL bInternalMove; // TabBar - virtual void Select(); - virtual void DoubleClick(); - virtual void MouseButtonDown(const MouseEvent& rMEvt); - - virtual void Command(const CommandEvent& rCEvt); - - virtual long StartRenaming(); - virtual long AllowRenaming(); - virtual void EndRenaming(); - - virtual void ActivatePage(); - virtual long DeactivatePage(); + virtual void Select(); + virtual void DoubleClick(); + virtual void MouseButtonDown(const MouseEvent& rMEvt); + + virtual void Command(const CommandEvent& rCEvt); + + virtual long StartRenaming(); + virtual long AllowRenaming(); + virtual void EndRenaming(); + + virtual void ActivatePage(); + virtual long DeactivatePage(); // DragSourceHelper - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); // DropTargetHelper - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); DECL_LINK(DeactivatePageHdl, void*); @@ -98,19 +98,19 @@ private: mrParent( rParent ) {} private: - TabControl& mrParent; - - virtual ~TabControlTransferable(); - - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void DragFinished( sal_Int8 nDropAction ); + TabControl& mrParent; + virtual ~TabControlTransferable(); + + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void DragFinished( sal_Int8 nDropAction ); + }; friend class TabControl::TabControlTransferable; - void DragFinished( sal_Int8 nDropAction ); + void DragFinished( sal_Int8 nDropAction ); }; diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index 8dd522d8212d..14919dabcf9a 100755 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ class ViewShell; // #i2237# // removed old stuff here which still forced zoom to be // %BRUSH_SIZE which is outdated now -//#define BRUSH_SIZE 8 +//#define BRUSH_SIZE 8 /** An SdWindow contains the actual working area of ViewShell. @@ -56,26 +56,26 @@ class ViewShell; member of the <type>OutputDevice</type> base class. It is calculated to be an integer percent value. */ -class Window - : public ::Window, +class Window + : public ::Window, public ::DropTargetHelper { public: Window (::Window* pParent); virtual ~Window (void); - void SetViewShell (ViewShell* pViewSh); + void SetViewShell (ViewShell* pViewSh); /** Set the zoom factor to the specified value and center the display - area arround the zoom center. - @param nZoom + area arround the zoom center. + @param nZoom The zoom factor is given as integral percent value. */ - void SetZoomIntegral(long nZoom); + void SetZoomIntegral(long nZoom); /** This internally used method performs the actual adaption of the - window's map mode to the specified zoom factor. - @param nZoom + window's map mode to the specified zoom factor. + @param nZoom The zoom factor is given as integral percent value. @return When the given zoom factor lies outside the valid range enclosed @@ -84,7 +84,7 @@ public: forced into that interval. Therefore the returned value is a valid zoom factor. */ - long SetZoomFactor(long nZoom); + long SetZoomFactor(long nZoom); /** This method is called when the whole page shall be displayed in the window. Position and zoom factor are set so that the given @@ -95,7 +95,7 @@ public: @param rZoomRect The rectangle is expected to be given relative to the upper left corner of the window in logical coordinates (100th of mm). - @return + @return The new zoom factor is returned as integral percent value. */ long SetZoomRect (const Rectangle& rZoomRect); @@ -111,8 +111,8 @@ public: manually or programatically are set to this value if they are smaller. If the currently used zoom factor is smaller than the minimal zoom factor than set the minimal zoom factor as the new current zoom - factor. - + factor. + <p>This calculation is performed only when the <member>bMinZoomAutoCalc</member> is set (to <TRUE/>).</p> */ @@ -143,21 +143,21 @@ public: void UpdateMapMode (void); - double GetVisibleX(); // Interface fuer ScrollBars - double GetVisibleY(); - void SetVisibleXY(double fX, double fY); - double GetVisibleWidth(); - double GetVisibleHeight(); - double GetScrlLineWidth(); - double GetScrlLineHeight(); - double GetScrlPageWidth(); - double GetScrlPageHeight(); + double GetVisibleX(); // Interface fuer ScrollBars + double GetVisibleY(); + void SetVisibleXY(double fX, double fY); + double GetVisibleWidth(); + double GetVisibleHeight(); + double GetScrlLineWidth(); + double GetScrlLineHeight(); + double GetScrlPageWidth(); + double GetScrlPageHeight(); virtual void GrabFocus(); virtual void DataChanged( const DataChangedEvent& rDCEvt ); // DropTargetHelper - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); /** The DropScroll() method is used by AcceptDrop() to scroll the content of the window while dragging and dropping. With this method @@ -198,13 +198,13 @@ protected: virtual long Notify( NotifyEvent& rNEvt ); /** Create an accessibility object that makes this window accessible. - + @return The returned reference is empty if an accessible object could not be created. */ virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> + ::com::sun::star::accessibility::XAccessible> CreateAccessible (void); XubString GetSurroundingText() const; diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx index 9f817de6a6c4..791c468d200b 100644 --- a/sd/source/ui/inc/WindowUpdater.hxx +++ b/sd/source/ui/inc/WindowUpdater.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/animobjs.hrc b/sd/source/ui/inc/animobjs.hrc index 5c5c8e7852cc..7542dbe73882 100644 --- a/sd/source/ui/inc/animobjs.hrc +++ b/sd/source/ui/inc/animobjs.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index 7a7a34362c48..fc3e19518079 100755 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,8 +77,8 @@ enum BitmapAdjustment class SdDisplay : public Control { private: - BitmapEx aBitmapEx; - Fraction aScale; + BitmapEx aBitmapEx; + Fraction aScale; public: SdDisplay( ::Window* pWin, SdResId Id ); @@ -86,8 +86,8 @@ public: virtual void Paint( const Rectangle& rRect ); - void SetBitmapEx( BitmapEx* pBmpEx ); - void SetScale( const Fraction& rFrac ); + void SetBitmapEx( BitmapEx* pBmpEx ); + void SetScale( const Fraction& rFrac ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; @@ -104,59 +104,59 @@ public: ::Window* pParent, const SdResId& rSdResId ); virtual ~AnimationWindow(); - void AddObj( ::sd::View& rView ); - void CreateAnimObj( ::sd::View& rView ); + void AddObj( ::sd::View& rView ); + void CreateAnimObj( ::sd::View& rView ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); protected: - virtual BOOL Close(); - virtual void Resize(); - virtual void FillInfo( SfxChildWinInfo& ) const; + virtual BOOL Close(); + virtual void Resize(); + virtual void FillInfo( SfxChildWinInfo& ) const; private: - SdDisplay aCtlDisplay; - ImageButton aBtnFirst; - ImageButton aBtnReverse; - ImageButton aBtnStop; - ImageButton aBtnPlay; - ImageButton aBtnLast; - NumericField aNumFldBitmap; - TimeField aTimeField; - ListBox aLbLoopCount; - - ImageButton aBtnGetOneObject; - ImageButton aBtnGetAllObjects; - ImageButton aBtnRemoveBitmap; - ImageButton aBtnRemoveAll; - FixedText aFtCount; - FixedInfo aFiCount; - FixedLine aGrpBitmap; - - RadioButton aRbtGroup; - RadioButton aRbtBitmap; - FixedText aFtAdjustment; - ListBox aLbAdjustment; - PushButton aBtnCreateGroup; - FixedLine aGrpAnimation; - - ::Window* pWin; - List aBmpExList; - List aTimeList; + SdDisplay aCtlDisplay; + ImageButton aBtnFirst; + ImageButton aBtnReverse; + ImageButton aBtnStop; + ImageButton aBtnPlay; + ImageButton aBtnLast; + NumericField aNumFldBitmap; + TimeField aTimeField; + ListBox aLbLoopCount; + + ImageButton aBtnGetOneObject; + ImageButton aBtnGetAllObjects; + ImageButton aBtnRemoveBitmap; + ImageButton aBtnRemoveAll; + FixedText aFtCount; + FixedInfo aFiCount; + FixedLine aGrpBitmap; + + RadioButton aRbtGroup; + RadioButton aRbtBitmap; + FixedText aFtAdjustment; + ListBox aLbAdjustment; + PushButton aBtnCreateGroup; + FixedLine aGrpAnimation; + + ::Window* pWin; + List aBmpExList; + List aTimeList; SdDrawDocument* pMyDoc; - BitmapEx* pBitmapEx; + BitmapEx* pBitmapEx; - Size aSize; - Size aFltWinSize; - Size aDisplaySize; - Size aBmpSize; - BOOL bMovie; - BOOL bAllObjects; + Size aSize; + Size aFltWinSize; + Size aDisplaySize; + Size aBmpSize; + BOOL bMovie; + BOOL bAllObjects; - SfxBindings* pBindings; - AnimationControllerItem* pControllerItem; + SfxBindings* pBindings; + AnimationControllerItem* pControllerItem; - ScopeLock maPlayLock; + ScopeLock maPlayLock; //------------------------------------ DECL_LINK( ClickFirstHdl, void * ); @@ -170,11 +170,11 @@ private: DECL_LINK( ModifyBitmapHdl, void * ); DECL_LINK( ModifyTimeHdl, void * ); - void UpdateControl( ULONG nPos, BOOL bDisableCtrls = FALSE ); - void ResetAttrs(); - void WaitInEffect( ULONG nMilliSeconds, ULONG nTime, + void UpdateControl( ULONG nPos, BOOL bDisableCtrls = FALSE ); + void ResetAttrs(); + void WaitInEffect( ULONG nMilliSeconds, ULONG nTime, SfxProgress* pStbMgr ) const; - Fraction GetScale(); + Fraction GetScale(); }; /************************************************************************* diff --git a/sd/source/ui/inc/annotationmanager.hxx b/sd/source/ui/inc/annotationmanager.hxx index 6f0fdaa11180..be7cd03a6b3a 100755 --- a/sd/source/ui/inc/annotationmanager.hxx +++ b/sd/source/ui/inc/annotationmanager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,13 +46,13 @@ class AnnotationManager public: AnnotationManager( ViewShellBase& rViewShellBase ); ~AnnotationManager(); - + void ExecuteAnnotation (SfxRequest& rRequest); void GetAnnotationState (SfxItemSet& rItemSet); private: ::rtl::Reference< AnnotationManagerImpl > mxImpl; -}; +}; } diff --git a/sd/source/ui/inc/assclass.hxx b/sd/source/ui/inc/assclass.hxx index fca386485faa..1bbe3eee3e17 100644 --- a/sd/source/ui/inc/assclass.hxx +++ b/sd/source/ui/inc/assclass.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/bmcache.hxx b/sd/source/ui/inc/bmcache.hxx index c04f7d2ed2c4..6a908fff5930 100755 --- a/sd/source/ui/inc/bmcache.hxx +++ b/sd/source/ui/inc/bmcache.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,17 +36,17 @@ class GraphicObject; class BitmapCache { - ULONG nMaxSize; - ULONG nCurSize; - List aEntries; - -public: + ULONG nMaxSize; + ULONG nCurSize; + List aEntries; + +public: BitmapCache(ULONG nMaxSizeKB) : nMaxSize(nMaxSizeKB), nCurSize(0) {} - virtual ~BitmapCache(); + virtual ~BitmapCache(); void Remove(const SdPage* pPage); }; -#endif // _SD_BMCACHE_HXX +#endif // _SD_BMCACHE_HXX diff --git a/sd/source/ui/inc/brkdlg.hrc b/sd/source/ui/inc/brkdlg.hrc index 02f2311a39ff..934b50d30ddd 100644 --- a/sd/source/ui/inc/brkdlg.hrc +++ b/sd/source/ui/inc/brkdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,10 +25,10 @@ * ************************************************************************/ #define FT_OBJ_INFO 1 -#define FT_ACT_INFO 2 -#define FT_INS_INFO 3 +#define FT_ACT_INFO 2 +#define FT_INS_INFO 3 #define FI_OBJ_INFO 4 -#define FI_ACT_INFO 5 -#define FI_INS_INFO 6 +#define FI_ACT_INFO 5 +#define FI_INS_INFO 6 #define BTN_CANCEL 7 #define DLG_BREAK 6197 diff --git a/sd/source/ui/inc/bulmaper.hxx b/sd/source/ui/inc/bulmaper.hxx index 93f86fbcd0f9..b02072b3ef39 100644 --- a/sd/source/ui/inc/bulmaper.hxx +++ b/sd/source/ui/inc/bulmaper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/celltempl.hrc b/sd/source/ui/inc/celltempl.hrc index ee3c596a494d..c82d60452b56 100644 --- a/sd/source/ui/inc/celltempl.hrc +++ b/sd/source/ui/inc/celltempl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,5 +25,5 @@ * ************************************************************************/ #include <sfx2/sfx.hrc> -#define TAB_CELL_TEMPLATE 910 +#define TAB_CELL_TEMPLATE 910 #define TAB_CONTROL 1 diff --git a/sd/source/ui/inc/celltempl.hxx b/sd/source/ui/inc/celltempl.hxx index e0c6262d603a..957acfe45173 100644 --- a/sd/source/ui/inc/celltempl.hxx +++ b/sd/source/ui/inc/celltempl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,13 +40,13 @@ class SdrModel; class SdPresCellTemplateDlg : public SfxStyleDialog { private: - XColorTable* mpColorTab; - XGradientList* mpGradientList; - XHatchList* mpHatchingList; - XBitmapList* mpBitmapList; + XColorTable* mpColorTab; + XGradientList* mpGradientList; + XHatchList* mpHatchingList; + XBitmapList* mpBitmapList; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); - virtual const SfxItemSet* GetRefreshedSet(); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual const SfxItemSet* GetRefreshedSet(); public: SdPresCellTemplateDlg( SdrModel* pModel, Window* pParent, SfxStyleSheetBase& rStyleBase ); diff --git a/sd/source/ui/inc/cfgids.hxx b/sd/source/ui/inc/cfgids.hxx index ef49c4928b48..12e51fce0091 100644 --- a/sd/source/ui/inc/cfgids.hxx +++ b/sd/source/ui/inc/cfgids.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,40 +36,40 @@ #define SDCFG_DRAW (SFX_ITEMTYPE_SD_BEGIN + 3) // Acceleratoren, Menus, ... -#define RID_DRAW_DEFAULTACCEL (SFX_ITEMTYPE_SD_BEGIN + 5) -#define RID_DRAW_DEFAULTMENU (SFX_ITEMTYPE_SD_BEGIN + 6) -#define RID_DRAW_PORTALMENU (SFX_ITEMTYPE_SD_BEGIN + 35) -#define RID_DRAW_STATUSBAR (SFX_ITEMTYPE_SD_BEGIN + 7) +#define RID_DRAW_DEFAULTACCEL (SFX_ITEMTYPE_SD_BEGIN + 5) +#define RID_DRAW_DEFAULTMENU (SFX_ITEMTYPE_SD_BEGIN + 6) +#define RID_DRAW_PORTALMENU (SFX_ITEMTYPE_SD_BEGIN + 35) +#define RID_DRAW_STATUSBAR (SFX_ITEMTYPE_SD_BEGIN + 7) // Acceleratoren, Menus, ... (fuers Draw (Graphic)) -#define RID_GRAPHIC_DEFAULTACCEL (SFX_ITEMTYPE_SD_BEGIN + 8) -#define RID_GRAPHIC_DEFAULTMENU (SFX_ITEMTYPE_SD_BEGIN + 9) -#define RID_GRAPHIC_PORTALMENU (SFX_ITEMTYPE_SD_BEGIN + 36) -//#define RID_GRAPHIC_STATUSBAR (SFX_ITEMTYPE_SD_BEGIN + 30) +#define RID_GRAPHIC_DEFAULTACCEL (SFX_ITEMTYPE_SD_BEGIN + 8) +#define RID_GRAPHIC_DEFAULTMENU (SFX_ITEMTYPE_SD_BEGIN + 9) +#define RID_GRAPHIC_PORTALMENU (SFX_ITEMTYPE_SD_BEGIN + 36) +//#define RID_GRAPHIC_STATUSBAR (SFX_ITEMTYPE_SD_BEGIN + 30) // Toolbars -#define RID_DRAW_DEFAULTTOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 10) -#define RID_DRAW_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 11) -#define RID_SLIDE_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 12) -#define RID_DRAW_OBJ_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 13) -#define RID_SLIDE_OBJ_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 14) -#define RID_BEZIER_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 15) -#define RID_DRAW_TEXT_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 16) -#define RID_OUTLINE_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 17) -#define RID_DRAW_TABLE_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 18) -#define RID_GLUEPOINTS_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 19) -#define RID_DRAW_OPTIONS_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 20) -#define RID_DRAW_COMMONTASK_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 21) -#define RID_FORMLAYER_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 22) -#define RID_DRAW_VIEWER_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 23) +#define RID_DRAW_DEFAULTTOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 10) +#define RID_DRAW_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 11) +#define RID_SLIDE_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 12) +#define RID_DRAW_OBJ_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 13) +#define RID_SLIDE_OBJ_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 14) +#define RID_BEZIER_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 15) +#define RID_DRAW_TEXT_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 16) +#define RID_OUTLINE_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 17) +#define RID_DRAW_TABLE_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 18) +#define RID_GLUEPOINTS_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 19) +#define RID_DRAW_OPTIONS_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 20) +#define RID_DRAW_COMMONTASK_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 21) +#define RID_FORMLAYER_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 22) +#define RID_DRAW_VIEWER_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 23) #define RID_GRAPHIC_VIEWER_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 24) -#define RID_GRAPHIC_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 25) -#define RID_GRAPHIC_OPTIONS_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 26) -#define RID_GRAPHIC_OBJ_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 27) +#define RID_GRAPHIC_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 25) +#define RID_GRAPHIC_OPTIONS_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 26) +#define RID_GRAPHIC_OBJ_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 27) #define RID_GRAPHIC_TEXT_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 28) -#define RID_DRAW_GRAF_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 30) -#define RID_DRAW_MEDIA_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 31) +#define RID_DRAW_GRAF_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 30) +#define RID_DRAW_MEDIA_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 31) #endif diff --git a/sd/source/ui/inc/copydlg.hrc b/sd/source/ui/inc/copydlg.hrc index f0067bd47cee..77a77694c5c4 100644 --- a/sd/source/ui/inc/copydlg.hrc +++ b/sd/source/ui/inc/copydlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx index 2732f4f76c38..8a8d660492c9 100644 --- a/sd/source/ui/inc/copydlg.hxx +++ b/sd/source/ui/inc/copydlg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ class View; |* Dialog zum Einstellen des Bildschirms |* \************************************************************************/ -class CopyDlg +class CopyDlg : public SfxModalDialog { public: @@ -56,43 +56,43 @@ public: XColorTable* pColTab, ::sd::View* pView ); ~CopyDlg(); - void GetAttr( SfxItemSet& rOutAttrs ); + void GetAttr( SfxItemSet& rOutAttrs ); DECL_LINK( Reset, void* ); private: - FixedText maFtCopies; - NumericField maNumFldCopies; - ImageButton maBtnSetViewData; - - FixedText maFtMoveX; - MetricField maMtrFldMoveX; - FixedText maFtMoveY; - MetricField maMtrFldMoveY; - FixedText maFtAngle; - MetricField maMtrFldAngle; - FixedLine maGrpMovement; - - FixedText maFtWidth; - MetricField maMtrFldWidth; - FixedText maFtHeight; - MetricField maMtrFldHeight; - FixedLine maGrpEnlargement; - - FixedText maFtStartColor; - ColorLB maLbStartColor; - FixedText maFtEndColor; - ColorLB maLbEndColor; - FixedLine maGrpColor; - - OKButton maBtnOK; - CancelButton maBtnCancel; - HelpButton maBtnHelp; - PushButton maBtnSetDefault; - - const SfxItemSet& mrOutAttrs; - XColorTable* mpColorTab; - Fraction maUIScale; - ::sd::View* mpView; + FixedText maFtCopies; + NumericField maNumFldCopies; + ImageButton maBtnSetViewData; + + FixedText maFtMoveX; + MetricField maMtrFldMoveX; + FixedText maFtMoveY; + MetricField maMtrFldMoveY; + FixedText maFtAngle; + MetricField maMtrFldAngle; + FixedLine maGrpMovement; + + FixedText maFtWidth; + MetricField maMtrFldWidth; + FixedText maFtHeight; + MetricField maMtrFldHeight; + FixedLine maGrpEnlargement; + + FixedText maFtStartColor; + ColorLB maLbStartColor; + FixedText maFtEndColor; + ColorLB maLbEndColor; + FixedLine maGrpColor; + + OKButton maBtnOK; + CancelButton maBtnCancel; + HelpButton maBtnHelp; + PushButton maBtnSetDefault; + + const SfxItemSet& mrOutAttrs; + XColorTable* mpColorTab; + Fraction maUIScale; + ::sd::View* mpView; DECL_LINK( SelectColorHdl, void * ); DECL_LINK( SetViewData, void * ); diff --git a/sd/source/ui/inc/custsdlg.hrc b/sd/source/ui/inc/custsdlg.hrc index 2ce79cdae877..2945740b951d 100644 --- a/sd/source/ui/inc/custsdlg.hrc +++ b/sd/source/ui/inc/custsdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,8 +26,8 @@ ************************************************************************/ #include <sfx2/sfx.hrc> -#define DLG_CUSTOMSHOW 843 -#define DLG_DEFINE_CUSTOMSHOW 890 +#define DLG_CUSTOMSHOW 843 +#define DLG_DEFINE_CUSTOMSHOW 890 #define BTN_OK 1 #define BTN_NEW 1 #define BTN_EDIT 2 diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index 020232ddced3..45ade9a2eec2 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,22 +46,22 @@ class SdCustomShow; class SdCustomShowDlg : public ModalDialog { private: - ListBox aLbCustomShows; - CheckBox aCbxUseCustomShow; - PushButton aBtnNew; - PushButton aBtnEdit; - PushButton aBtnRemove; - PushButton aBtnCopy; - HelpButton aBtnHelp; - PushButton aBtnStartShow; - OKButton aBtnOK; - - SdDrawDocument& rDoc; - List* pCustomShowList; - SdCustomShow* pCustomShow; - BOOL bModified; - - void CheckState(); + ListBox aLbCustomShows; + CheckBox aCbxUseCustomShow; + PushButton aBtnNew; + PushButton aBtnEdit; + PushButton aBtnRemove; + PushButton aBtnCopy; + HelpButton aBtnHelp; + PushButton aBtnStartShow; + OKButton aBtnOK; + + SdDrawDocument& rDoc; + List* pCustomShowList; + SdCustomShow* pCustomShow; + BOOL bModified; + + void CheckState(); DECL_LINK( ClickButtonHdl, void * ); DECL_LINK( StartShowHdl, Button* ); @@ -70,8 +70,8 @@ public: SdCustomShowDlg( Window* pWindow, SdDrawDocument& rDrawDoc ); ~SdCustomShowDlg(); - BOOL IsModified() const { return( bModified ); } - BOOL IsCustomShow() const; + BOOL IsModified() const { return( bModified ); } + BOOL IsCustomShow() const; }; @@ -80,25 +80,25 @@ public: class SdDefineCustomShowDlg : public ModalDialog { private: - FixedText aFtName; - Edit aEdtName; - FixedText aFtPages; - MultiListBox aLbPages; - PushButton aBtnAdd; - PushButton aBtnRemove; - FixedText aFtCustomPages; - SvTreeListBox aLbCustomPages; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - - SdDrawDocument& rDoc; - SdCustomShow*& rpCustomShow; - BOOL bModified; - String aOldName; - - void CheckState(); - void CheckCustomShow(); + FixedText aFtName; + Edit aEdtName; + FixedText aFtPages; + MultiListBox aLbPages; + PushButton aBtnAdd; + PushButton aBtnRemove; + FixedText aFtCustomPages; + SvTreeListBox aLbCustomPages; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + + SdDrawDocument& rDoc; + SdCustomShow*& rpCustomShow; + BOOL bModified; + String aOldName; + + void CheckState(); + void CheckCustomShow(); DECL_LINK( ClickButtonHdl, void * ); DECL_LINK( OKHdl, Button* ); @@ -109,7 +109,7 @@ public: SdDrawDocument& rDrawDoc, SdCustomShow*& rpCS ); ~SdDefineCustomShowDlg(); - BOOL IsModified() const { return( bModified ); } + BOOL IsModified() const { return( bModified ); } }; #endif // _SD_CUSTSDLG_HXX diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx index a5da8b4a10fc..de5299948221 100644 --- a/sd/source/ui/inc/diactrl.hxx +++ b/sd/source/ui/inc/diactrl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,15 +46,15 @@ class SdPagesField : public SvxMetricField private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; protected: - virtual void Modify(); + virtual void Modify(); public: - SdPagesField( Window* pParent, + SdPagesField( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, WinBits nBits = WB_BORDER | WB_SPIN | WB_REPEAT ); ~SdPagesField(); - void UpdatePagesField( const SfxUInt16Item* pItem ); + void UpdatePagesField( const SfxUInt16Item* pItem ); }; //======================================================================== @@ -64,9 +64,9 @@ public: class SdTbxCtlDiaPages : public SfxToolBoxControl { public: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual Window* CreateItemWindow( Window *pParent ); + virtual Window* CreateItemWindow( Window *pParent ); SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sd/source/ui/inc/dialogs.hrc b/sd/source/ui/inc/dialogs.hrc index af233ad3b52c..48e2c67d602b 100644 --- a/sd/source/ui/inc/dialogs.hrc +++ b/sd/source/ui/inc/dialogs.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,11 +26,11 @@ ************************************************************************/ /** module unique resource ids for dialogs */ -#define RID_SD_DLG_HEADERFOOTER (1000) -#define RID_SD_DLG_MASTER_LAYOUT (1001) +#define RID_SD_DLG_HEADERFOOTER (1000) +#define RID_SD_DLG_MASTER_LAYOUT (1001) /** module unique resource ids for tabpages */ -#define RID_SD_TABPAGE_HEADERFOOTER (1000) -#define RID_SD_TABPAGE_HEADERFOOTER_SLIDE (1001) -#define RID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT (1002) +#define RID_SD_TABPAGE_HEADERFOOTER (1000) +#define RID_SD_TABPAGE_HEADERFOOTER_SLIDE (1001) +#define RID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT (1002) diff --git a/sd/source/ui/inc/dlg_char.hrc b/sd/source/ui/inc/dlg_char.hrc index dccf0570f1a7..6f9ede93df38 100644 --- a/sd/source/ui/inc/dlg_char.hrc +++ b/sd/source/ui/inc/dlg_char.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,5 +24,5 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define TAB_CHAR 20600 +#define TAB_CHAR 20600 diff --git a/sd/source/ui/inc/dlg_char.hxx b/sd/source/ui/inc/dlg_char.hxx index a427157c997c..bd1f9b84c79c 100644 --- a/sd/source/ui/inc/dlg_char.hxx +++ b/sd/source/ui/inc/dlg_char.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,10 +45,10 @@ class SfxObjectShell; class SdCharDlg : public SfxTabDialog { private: - const SfxItemSet& rOutAttrs; + const SfxItemSet& rOutAttrs; const SfxObjectShell& rDocShell; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); public: diff --git a/sd/source/ui/inc/dlgass.hrc b/sd/source/ui/inc/dlgass.hrc index 5e406cfbc121..9ce7e72537bc 100644 --- a/sd/source/ui/inc/dlgass.hrc +++ b/sd/source/ui/inc/dlgass.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,56 +33,56 @@ #define CB_PREVIEW 7 #define CB_STARTWITH 8 -#define FB_PAGE1 9 -#define FL_PAGE1_ARTGROUP 10 -#define RB_PAGE1_EMPTY 11 -#define RB_PAGE1_TEMPLATE 12 -#define LB_PAGE1_REGION 13 -#define LB_PAGE1_TEMPLATES 14 -#define RB_PAGE1_OPEN 15 -#define LB_PAGE1_OPEN 16 +#define FB_PAGE1 9 +#define FL_PAGE1_ARTGROUP 10 +#define RB_PAGE1_EMPTY 11 +#define RB_PAGE1_TEMPLATE 12 +#define LB_PAGE1_REGION 13 +#define LB_PAGE1_TEMPLATES 14 +#define RB_PAGE1_OPEN 15 +#define LB_PAGE1_OPEN 16 #define PB_PAGE1_OPEN 17 -#define FB_PAGE2 30 -#define FL_PAGE2_LAYOUT 31 -#define LB_PAGE2_REGION 32 -#define LB_PAGE2_LAYOUT 33 -#define FL_PAGE2_OUTPUTTYPES 34 -#define RB_PAGE2_MEDIUM1 35 -#define RB_PAGE2_MEDIUM2 36 -#define RB_PAGE2_MEDIUM3 37 -#define RB_PAGE2_MEDIUM4 38 -#define RB_PAGE2_MEDIUM5 39 +#define FB_PAGE2 30 +#define FL_PAGE2_LAYOUT 31 +#define LB_PAGE2_REGION 32 +#define LB_PAGE2_LAYOUT 33 +#define FL_PAGE2_OUTPUTTYPES 34 +#define RB_PAGE2_MEDIUM1 35 +#define RB_PAGE2_MEDIUM2 36 +#define RB_PAGE2_MEDIUM3 37 +#define RB_PAGE2_MEDIUM4 38 +#define RB_PAGE2_MEDIUM5 39 -#define FB_PAGE3 40 -#define FL_PAGE3_EFFECT 41 -#define FT_PAGE3_EFFECT 42 -#define LB_PAGE3_EFFECT 43 -#define FT_PAGE3_SPEED 44 -#define LB_PAGE3_SPEED 45 -#define FL_PAGE3_PRESTYPE 46 -#define RB_PAGE3_LIVE 47 -#define RB_PAGE3_KIOSK 48 -#define FT_PAGE3_TIME 49 -#define TMF_PAGE3_TIME 50 -#define FT_PAGE3_BREAK 51 -#define TMF_PAGE3_BREAK 52 -#define CB_PAGE3_LOGO 53 +#define FB_PAGE3 40 +#define FL_PAGE3_EFFECT 41 +#define FT_PAGE3_EFFECT 42 +#define LB_PAGE3_EFFECT 43 +#define FT_PAGE3_SPEED 44 +#define LB_PAGE3_SPEED 45 +#define FL_PAGE3_PRESTYPE 46 +#define RB_PAGE3_LIVE 47 +#define RB_PAGE3_KIOSK 48 +#define FT_PAGE3_TIME 49 +#define TMF_PAGE3_TIME 50 +#define FT_PAGE3_BREAK 51 +#define TMF_PAGE3_BREAK 52 +#define CB_PAGE3_LOGO 53 -#define FB_PAGE4 20 -#define FL_PAGE4_PERSONAL 21 -#define FT_PAGE4_ASKNAME 22 -#define EDT_PAGE4_ASKNAME 23 -#define FT_PAGE4_ASKTOPIC 24 -#define EDT_PAGE4_ASKTOPIC 25 -#define FT_PAGE4_ASKINFORMATION 26 -#define EDT_PAGE4_ASKINFORMATION 27 +#define FB_PAGE4 20 +#define FL_PAGE4_PERSONAL 21 +#define FT_PAGE4_ASKNAME 22 +#define EDT_PAGE4_ASKNAME 23 +#define FT_PAGE4_ASKTOPIC 24 +#define EDT_PAGE4_ASKTOPIC 25 +#define FT_PAGE4_ASKINFORMATION 26 +#define EDT_PAGE4_ASKINFORMATION 27 -#define FB_PAGE5 60 -#define FT_PAGE5_PAGELIST 61 -#define CT_PAGE5_PAGELIST 62 -#define CB_PAGE5_SUMMARY 63 +#define FB_PAGE5 60 +#define FT_PAGE5_PAGELIST 61 +#define CT_PAGE5_PAGELIST 62 +#define CB_PAGE5_SUMMARY 63 -#define STR_CREATE 64 -#define STR_OPEN 65 +#define STR_CREATE 64 +#define STR_OPEN 65 #define DLG_ASS 900 diff --git a/sd/source/ui/inc/dlgass.hxx b/sd/source/ui/inc/dlgass.hxx index 523b86cf66a8..aff737f8f867 100755 --- a/sd/source/ui/inc/dlgass.hxx +++ b/sd/source/ui/inc/dlgass.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/dlgctrls.hxx b/sd/source/ui/inc/dlgctrls.hxx index 72b5921d8e86..e7d4286f7be1 100755 --- a/sd/source/ui/inc/dlgctrls.hxx +++ b/sd/source/ui/inc/dlgctrls.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,12 +51,12 @@ class SD_DLLPUBLIC FadeEffectLB : public ListBox public: FadeEffectLB( Window* pParent, SdResId Id ); ~FadeEffectLB(); - virtual void Fill(); + virtual void Fill(); -/* void selectEffectFromPage( SdPage* pPage ); */ - void applySelected( SdPage* pSlide ) const; +/* void selectEffectFromPage( SdPage* pPage ); */ + void applySelected( SdPage* pSlide ) const; - FadeEffectLBImpl* mpImpl; + FadeEffectLBImpl* mpImpl; }; #endif // SD_DLGCTRLS_HXX diff --git a/sd/source/ui/inc/dlgfield.hrc b/sd/source/ui/inc/dlgfield.hrc index 61585c8fc17f..9a21f7e152f1 100644 --- a/sd/source/ui/inc/dlgfield.hrc +++ b/sd/source/ui/inc/dlgfield.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx index b7f87348ad76..2610b9486d4c 100644 --- a/sd/source/ui/inc/dlgfield.hxx +++ b/sd/source/ui/inc/dlgfield.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,22 +57,22 @@ class SvxFieldData; class SdModifyFieldDlg : public ModalDialog { private: - RadioButton aRbtFix; - RadioButton aRbtVar; - FixedLine aGrpType; - FixedText maFtLanguage; - SvxLanguageBox maLbLanguage; - FixedText aFtFormat; - ListBox aLbFormat; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - SfxItemSet maInputSet; + RadioButton aRbtFix; + RadioButton aRbtVar; + FixedLine aGrpType; + FixedText maFtLanguage; + SvxLanguageBox maLbLanguage; + FixedText aFtFormat; + ListBox aLbFormat; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + SfxItemSet maInputSet; - const SvxFieldData* pField; + const SvxFieldData* pField; - void FillFormatList(); - void FillControls(); + void FillFormatList(); + void FillControls(); DECL_LINK( LanguageChangeHdl, void * ); @@ -80,10 +80,10 @@ public: SdModifyFieldDlg( Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ); ~SdModifyFieldDlg() {} - SvxFieldData* GetField(); - SfxItemSet GetItemSet(); + SvxFieldData* GetField(); + SfxItemSet GetItemSet(); }; -#endif // _SD_DLGFIELD_HXX +#endif // _SD_DLGFIELD_HXX diff --git a/sd/source/ui/inc/dlgolbul.hrc b/sd/source/ui/inc/dlgolbul.hrc index 0dffa9cb2f07..670b95b0343a 100644 --- a/sd/source/ui/inc/dlgolbul.hrc +++ b/sd/source/ui/inc/dlgolbul.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,4 +24,4 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define TAB_OUTLINEBULLET 20601 +#define TAB_OUTLINEBULLET 20601 diff --git a/sd/source/ui/inc/dlgpage.hrc b/sd/source/ui/inc/dlgpage.hrc index e12333c6310e..9dc0c52361f9 100644 --- a/sd/source/ui/inc/dlgpage.hrc +++ b/sd/source/ui/inc/dlgpage.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,4 +24,4 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define TAB_PAGE 20625 +#define TAB_PAGE 20625 diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx index 1b462f284386..4c108945b8e5 100644 --- a/sd/source/ui/inc/dlgpage.hxx +++ b/sd/source/ui/inc/dlgpage.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,14 +48,14 @@ typedef USHORT ChangeType; class SdPageDlg : public SfxTabDialog { private: - const SfxItemSet& mrOutAttrs; + const SfxItemSet& mrOutAttrs; const SfxObjectShell* mpDocShell; - XColorTable* mpColorTab; - XGradientList* mpGradientList; - XHatchList* mpHatchingList; - XBitmapList* mpBitmapList; + XColorTable* mpColorTab; + XGradientList* mpGradientList; + XHatchList* mpHatchingList; + XBitmapList* mpBitmapList; public: SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, BOOL bAreaPage = TRUE ); diff --git a/sd/source/ui/inc/dlgsnap.hrc b/sd/source/ui/inc/dlgsnap.hrc index 1d7f5bf7c164..f7a20249eeff 100644 --- a/sd/source/ui/inc/dlgsnap.hrc +++ b/sd/source/ui/inc/dlgsnap.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx index 970a54b24339..177ea82c9550 100644 --- a/sd/source/ui/inc/dlgsnap.hxx +++ b/sd/source/ui/inc/dlgsnap.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,23 +66,23 @@ namespace sd { class SdSnapLineDlg : public ModalDialog { private: - FixedLine aFlPos; - FixedText aFtX; - MetricField aMtrFldX; - FixedText aFtY; - MetricField aMtrFldY; - FixedLine aFlDir; - ImageRadioButton aRbPoint; - ImageRadioButton aRbVert; - ImageRadioButton aRbHorz; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - PushButton aBtnDelete; - long nXValue; - long nYValue; - FieldUnit eUIUnit; - Fraction aUIScale; + FixedLine aFlPos; + FixedText aFtX; + MetricField aMtrFldX; + FixedText aFtY; + MetricField aMtrFldY; + FixedLine aFlDir; + ImageRadioButton aRbPoint; + ImageRadioButton aRbVert; + ImageRadioButton aRbHorz; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + PushButton aBtnDelete; + long nXValue; + long nYValue; + FieldUnit eUIUnit; + Fraction aUIScale; DECL_LINK( ClickHdl, Button * ); @@ -98,4 +98,4 @@ public: -#endif // _SD_DLGSNAP_HXX +#endif // _SD_DLGSNAP_HXX diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index 76b8fe06f318..e37bfef4b527 100755 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,16 +49,16 @@ class SD_DLLPUBLIC SdDocPreviewWin : public Control, public SfxListener { protected: GDIMetaFile* pMetaFile; - BOOL bInEffect; - Link aClickHdl; + BOOL bInEffect; + Link aClickHdl; SfxObjectShell* mpObj; - sal_uInt16 mnShowPage; - Color maDocumentColor; + sal_uInt16 mnShowPage; + Color maDocumentColor; rtl::Reference< sd::SlideShow > mxSlideShow; - virtual void Paint( const Rectangle& rRect ); - static void CalcSizeAndPos( GDIMetaFile* pFile, Size& rSize, Point& rPoint ); - void ImpPaint( GDIMetaFile* pFile, OutputDevice* pVDev ); + virtual void Paint( const Rectangle& rRect ); + static void CalcSizeAndPos( GDIMetaFile* pFile, Size& rSize, Point& rPoint ); + void ImpPaint( GDIMetaFile* pFile, OutputDevice* pVDev ); static const int FRAME; @@ -73,12 +73,12 @@ public: ~SdDocPreviewWin(); void SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage = 0 ); virtual void Resize(); - void startPreview(); + void startPreview(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual long Notify( NotifyEvent& rNEvt ); - void SetClickHdl( const Link& rLink ) { aClickHdl = rLink; } - const Link& GetClickHdl() const { return aClickHdl; } + void SetClickHdl( const Link& rLink ) { aClickHdl = rLink; } + const Link& GetClickHdl() const { return aClickHdl; } virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index f2b621814c49..cef855af6058 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ public: TYPEINFO(); DrawView ( - DrawDocShell* pDocSh, + DrawDocShell* pDocSh, OutputDevice* pOutDev, DrawViewShell* pShell); virtual ~DrawView (void); @@ -64,9 +64,9 @@ public: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); - void BlockPageOrderChangedHint(BOOL bBlock); + void BlockPageOrderChangedHint(BOOL bBlock); - BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr = FALSE); + BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr = FALSE); virtual BOOL IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const; virtual void MakeVisible(const Rectangle& rRect, ::Window& rWin); @@ -81,11 +81,11 @@ protected: private: friend class DrawViewRedirector; - DrawDocShell* mpDocShell; - DrawViewShell* mpDrawViewShell; - VirtualDevice* mpVDev; + DrawDocShell* mpDocShell; + DrawViewShell* mpDrawViewShell; + VirtualDevice* mpVDev; - USHORT mnPOCHSmph; // zum blockieren des PageOrderChangedHint + USHORT mnPOCHSmph; // zum blockieren des PageOrderChangedHint }; } // end of namespace sd diff --git a/sd/source/ui/inc/enumdlg.hrc b/sd/source/ui/inc/enumdlg.hrc index 5b3b4e127b06..46db72ad5318 100644 --- a/sd/source/ui/inc/enumdlg.hrc +++ b/sd/source/ui/inc/enumdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/filedlg.hxx b/sd/source/ui/inc/filedlg.hxx index 2aaa7be9f123..6061ca8ce27f 100755 --- a/sd/source/ui/inc/filedlg.hxx +++ b/sd/source/ui/inc/filedlg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,14 +44,14 @@ class SdFileDialog_Imp; /******************************************************************************/ /** - The class SdOpenSoundFileDialog wraps the FileDialogHelper, displaying the - FILEOPEN_PLAY dialog template and performing the 'preview' functionality - (playing the selected sound file). The interface is a downstripped version + The class SdOpenSoundFileDialog wraps the FileDialogHelper, displaying the + FILEOPEN_PLAY dialog template and performing the 'preview' functionality + (playing the selected sound file). The interface is a downstripped version of the aforementioned class, with similar semantics. */ class SD_DLLPUBLIC SdOpenSoundFileDialog { - const std::auto_ptr< SdFileDialog_Imp > mpImpl; + const std::auto_ptr< SdFileDialog_Imp > mpImpl; // forbidden and not implemented SdOpenSoundFileDialog (const SdOpenSoundFileDialog &); @@ -61,8 +61,8 @@ public: SdOpenSoundFileDialog(); ~SdOpenSoundFileDialog(); - ErrCode Execute(); - String GetPath() const; + ErrCode Execute(); + String GetPath() const; void SetPath( const String& rPath ); String ReqDisplayDirectory() const; diff --git a/sd/source/ui/inc/fontwork.hrc b/sd/source/ui/inc/fontwork.hrc index 0f7406cd8b7e..693c3ae9f23f 100644 --- a/sd/source/ui/inc/fontwork.hrc +++ b/sd/source/ui/inc/fontwork.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx index 57a6c838feab..50c0fc0f7924 100644 --- a/sd/source/ui/inc/framework/Configuration.hxx +++ b/sd/source/ui/inc/framework/Configuration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ namespace sd { namespace framework { */ class Configuration : private sd::MutexOwner, - public ConfigurationInterfaceBase + public ConfigurationInterfaceBase { public: /** Create a new configuration with a broadcaster that is used to send @@ -91,12 +91,12 @@ public: ::com::sun::star::drawing::framework::XConfigurationControllerBroadcaster>& rxBroadcaster, bool bBroadcastRequestEvents); virtual ~Configuration (void); - + virtual void SAL_CALL disposing (void); // XConfiguration - + virtual void SAL_CALL addResource ( const ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>& rxResourceId) @@ -106,7 +106,7 @@ public: const ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>& rxResourceId) throw (::com::sun::star::uno::RuntimeException); - + virtual ::com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResourceId> > SAL_CALL getResources ( const ::com::sun::star::uno::Reference< @@ -120,14 +120,14 @@ public: rxResourceId) throw (::com::sun::star::uno::RuntimeException); - + // XCloneable virtual ::com::sun::star::uno::Reference<com::sun::star::util::XCloneable> SAL_CALL createClone (void) throw (::com::sun::star::uno::RuntimeException); - + // XNamed /** Return a human readable string representation. This is used for @@ -168,7 +168,7 @@ private: ::com::sun::star::drawing::framework::XConfigurationControllerBroadcaster>& rxBroadcaster, bool bBroadcastRequestEvents, const ResourceContainer& rResourceContainer); - + /** Send an event to all interested listeners that a resource has been added or removed. The event is sent to the listeners via the ConfigurationController. diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx index d5e8dda059d2..faec19d02eb5 100644 --- a/sd/source/ui/inc/framework/ConfigurationController.hxx +++ b/sd/source/ui/inc/framework/ConfigurationController.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ class ConfigurationUpdaterLock; class ConfigurationController : private sd::MutexOwner, private boost::noncopyable, - public ConfigurationControllerInterfaceBase + public ConfigurationControllerInterfaceBase { public: ConfigurationController (void) throw(); @@ -101,18 +101,18 @@ public: void RequestSynchronousUpdate (void); // XConfigurationController - + virtual void SAL_CALL lock (void) throw (css::uno::RuntimeException); virtual void SAL_CALL unlock (void) throw (css::uno::RuntimeException); - + virtual void SAL_CALL requestResourceActivation ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, css::drawing::framework::ResourceActivationMode eMode) throw (css::uno::RuntimeException); - + virtual void SAL_CALL requestResourceDeactivation ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId) @@ -143,14 +143,14 @@ public: // XConfigurationControllerBroadcaster - + virtual void SAL_CALL addConfigurationChangeListener ( const css::uno::Reference< css::drawing::framework::XConfigurationChangeListener>& rxListener, const ::rtl::OUString& rsEventType, const css::uno::Any& rUserData) throw (css::uno::RuntimeException); - + virtual void SAL_CALL removeConfigurationChangeListener ( const css::uno::Reference< css::drawing::framework::XConfigurationChangeListener>& rxListener) @@ -165,7 +165,7 @@ public: virtual sal_Bool SAL_CALL hasPendingRequests (void) throw (css::uno::RuntimeException); - + virtual void SAL_CALL postChangeRequest ( const css::uno::Reference< css::drawing::framework::XConfigurationChangeRequest>& rxRequest) @@ -173,12 +173,12 @@ public: // XResourceFactoryManager - + virtual void SAL_CALL addResourceFactory( const ::rtl::OUString& sResourceURL, const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxResourceFactory) throw (css::uno::RuntimeException); - + virtual void SAL_CALL removeResourceFactoryForURL( const ::rtl::OUString& sResourceURL) throw (css::uno::RuntimeException); @@ -194,7 +194,7 @@ public: // XInitialization - + virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& rArguments) throw (css::uno::Exception, css::uno::RuntimeException); @@ -213,7 +213,7 @@ public: css::uno::Reference< css::drawing::framework::XConfigurationController> mxController; }; - + private: class Implementation; ::boost::scoped_ptr<Implementation> mpImplementation; diff --git a/sd/source/ui/inc/framework/DrawModule.hxx b/sd/source/ui/inc/framework/DrawModule.hxx index 08fd339df77a..f5e97f365195 100644 --- a/sd/source/ui/inc/framework/DrawModule.hxx +++ b/sd/source/ui/inc/framework/DrawModule.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index 58c663449bbc..15e2b55ab9e5 100755 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -125,14 +125,14 @@ public: /** Mark the FrameworkHelper object for the given ViewShellBase as disposed. A following ReleaseInstance() call will destroy the FrameworkHelper object. - + Do not call this method. It is an internally used method that can not be made private. */ static void DisposeInstance (ViewShellBase& rBase); /** Destroy the FrameworkHelper object for the given ViewShellBase. - + Do not call this method. It is an internally used method that can not be made private. */ @@ -226,7 +226,7 @@ public: */ void RequestTaskPanel ( const ::rtl::OUString& rsTaskPanelURL); - + /** Process a slot call that requests a view shell change. */ void HandleModeChangeSlot ( @@ -252,7 +252,7 @@ public: rCallback. @param rCallback The callback to be called when the resource is activated. - + */ void RunOnResourceActivation( const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, @@ -268,7 +268,7 @@ public: Do not use this method until there is absolutely no other way. */ void RequestSynchronousUpdate (void); - + /** Block until the specified event is notified by the configuration controller. When the configuration controller is not processing any requests the method returns immediately. @@ -309,7 +309,7 @@ public: CreateResourceId ( const ::rtl::OUString& rsResourceURL, const ::rtl::OUString& rsAnchorURL); - + /** Create a new XResourceId object for the given resource URL and the two given anchor URLs. */ @@ -352,7 +352,7 @@ private: friend class DisposeListener; css::uno::Reference<css::lang::XComponent> mxDisposeListener; - + FrameworkHelper (ViewShellBase& rBase); FrameworkHelper (const FrameworkHelper& rHelper); // Not implemented. FrameworkHelper& operator= (const FrameworkHelper& rHelper); // Not implemented. diff --git a/sd/source/ui/inc/framework/ImpressModule.hxx b/sd/source/ui/inc/framework/ImpressModule.hxx index f5b309760c4a..03a507a59a5a 100644 --- a/sd/source/ui/inc/framework/ImpressModule.hxx +++ b/sd/source/ui/inc/framework/ImpressModule.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx index 4e9517500abc..9c85c8dc3e10 100644 --- a/sd/source/ui/inc/framework/ModuleController.hxx +++ b/sd/source/ui/inc/framework/ModuleController.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ namespace sd { namespace framework { */ class ModuleController : private sd::MutexOwner, - public ModuleControllerInterfaceBase + public ModuleControllerInterfaceBase { public: static css::uno::Reference< @@ -86,15 +86,15 @@ public: virtual void SAL_CALL disposing (void); - + // XModuleController virtual void SAL_CALL requestResource(const ::rtl::OUString& rsResourceURL) throw (css::uno::RuntimeException); - + // XInitialization - + virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments) throw (css::uno::Exception, css::uno::RuntimeException); @@ -107,14 +107,14 @@ private: ::boost::scoped_ptr<ResourceToFactoryMap> mpResourceToFactoryMap; class LoadedFactoryContainer; ::boost::scoped_ptr<LoadedFactoryContainer> mpLoadedFactories; - + ModuleController ( const css::uno::Reference<css::uno::XComponentContext>& rxContext) throw(); ModuleController (void); // Not implemented. ModuleController (const ModuleController&); // Not implemented. virtual ~ModuleController (void) throw(); - + /** Load a list of URL to service mappings from the /org.openoffice.Office.Impress/MultiPaneGUI/Framework/ResourceFactories configuration entry. The mappings are stored in the @@ -125,7 +125,7 @@ private: /** Called for every entry in the ResourceFactories configuration entry. */ void ProcessFactory (const ::std::vector<css::uno::Any>& rValues); - + /** Instantiate all startup services that are found in the /org.openoffice.Office.Impress/MultiPaneGUI/Framework/StartupServices configuration entry. This method is called once when a new diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx index f12f0ca118f0..d3a65ba6a097 100644 --- a/sd/source/ui/inc/framework/Pane.hxx +++ b/sd/source/ui/inc/framework/Pane.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ namespace sd { namespace framework { This class has two responsibilities: 1. It implements the XPane interface. This is the most important interface of this class for API based views (of which there not that - many yet) because it gives access to the XWindow. + many yet) because it gives access to the XWindow. 2. It gives access to the underlying VCL Window by implementing the XUnoTunnel interface. This is necessary at the moment and in the foreseeable future because many parts of the Draw and Impress views rely @@ -90,7 +90,7 @@ public: virtual ~Pane (void) throw(); virtual void SAL_CALL disposing (void); - + static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId (void); /** This method is typically used together with the XUnoTunnel to obtain @@ -98,7 +98,7 @@ public: */ virtual ::Window* GetWindow (void); - + //----- XPane ------------------------------------------------------------- /** For a UNO API based implementation of a view this may the most @@ -115,7 +115,7 @@ public: //----- XPane2 ------------------------------------------------------------- - + virtual sal_Bool SAL_CALL isVisible (void) throw (cssu::RuntimeException); @@ -131,7 +131,7 @@ public: //----- XResource --------------------------------------------------------- - + virtual ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> SAL_CALL getResourceId (void) throw (::com::sun::star::uno::RuntimeException); @@ -142,7 +142,7 @@ public: virtual sal_Bool SAL_CALL isAnchorOnly (void) throw (com::sun::star::uno::RuntimeException); - + //----- XUnoTunnel -------------------------------------------------------- virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId) diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx index a607542f2df0..e63edf88a451 100755 --- a/sd/source/ui/inc/framework/PresentationFactory.hxx +++ b/sd/source/ui/inc/framework/PresentationFactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ namespace sd { namespace framework { */ class PresentationFactory : private sd::MutexOwner, - public PresentationFactoryInterfaceBase + public PresentationFactoryInterfaceBase { public: static const ::rtl::OUString msPresentationViewURL; @@ -72,10 +72,10 @@ public: PresentationFactory ( const css::uno::Reference<css::frame::XController>& rxController); virtual ~PresentationFactory (void); - + virtual void SAL_CALL disposing (void); - + // XResourceFactory virtual css::uno::Reference<css::drawing::framework::XResource> @@ -97,7 +97,7 @@ public: // lang::XEventListener - + virtual void SAL_CALL disposing ( const css::lang::EventObject& rEventObject) throw (css::uno::RuntimeException); diff --git a/sd/source/ui/inc/framework/PresentationModule.hxx b/sd/source/ui/inc/framework/PresentationModule.hxx index ac96f9c44b2e..350019acce6b 100644 --- a/sd/source/ui/inc/framework/PresentationModule.hxx +++ b/sd/source/ui/inc/framework/PresentationModule.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx index e8124e895ee6..30db09834654 100755 --- a/sd/source/ui/inc/framework/ResourceId.hxx +++ b/sd/source/ui/inc/framework/ResourceId.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -124,7 +124,7 @@ public: URLs. */ const ::std::vector<rtl::OUString>& GetResourceURLs (void) const; - + //===== XResourceId ======================================================= virtual ::rtl::OUString SAL_CALL @@ -163,7 +163,7 @@ public: css::drawing::framework::XResourceId>& rxResourceId, css::drawing::framework::AnchorBindingMode eMode) throw(css::uno::RuntimeException); - + virtual sal_Bool SAL_CALL isBoundToURL ( const ::rtl::OUString& rsAnchorURL, diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx index 12483f462d5e..376219ff5501 100755 --- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx +++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ public: ::com::sun::star::drawing::framework::XResourceId>& rxViewId, const ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow>& rxWindow); virtual ~ViewShellWrapper (void); - + virtual void SAL_CALL disposing (void); static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId (void); @@ -103,7 +103,7 @@ public: virtual sal_Bool SAL_CALL isAnchorOnly (void) throw (com::sun::star::uno::RuntimeException); - + // XRelocatableResource virtual sal_Bool SAL_CALL relocateToAnchor ( @@ -117,15 +117,15 @@ public: virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& rEvent) throw (::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& rEvent) throw (::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& rEvent) throw (::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& rEvent) throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/fuarea.hxx b/sd/source/ui/inc/fuarea.hxx index f109f4792ad2..4ced2de1b021 100644 --- a/sd/source/ui/inc/fuarea.hxx +++ b/sd/source/ui/inc/fuarea.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,10 +44,10 @@ public: private: FuArea ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fubullet.hxx b/sd/source/ui/inc/fubullet.hxx index d01b9f7fe86e..b72224d20d97 100644 --- a/sd/source/ui/inc/fubullet.hxx +++ b/sd/source/ui/inc/fubullet.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,8 +49,8 @@ public: private: FuBullet ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); diff --git a/sd/source/ui/inc/fuchar.hxx b/sd/source/ui/inc/fuchar.hxx index a207603ec270..03ec4a0b6631 100644 --- a/sd/source/ui/inc/fuchar.hxx +++ b/sd/source/ui/inc/fuchar.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ namespace sd { -class FuChar +class FuChar : public FuPoor { public: @@ -47,10 +47,10 @@ public: private: FuChar ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fucon3d.hxx b/sd/source/ui/inc/fucon3d.hxx index cb1f17d4131d..6ebadded4db1 100644 --- a/sd/source/ui/inc/fucon3d.hxx +++ b/sd/source/ui/inc/fucon3d.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,17 +52,17 @@ public: virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren // #97016# virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); private: FuConstruct3dObject ( - ViewShell* pViewSh, + ViewShell* pViewSh, ::sd::Window* pWin, - ::sd::View* pView, + ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); diff --git a/sd/source/ui/inc/fuconarc.hxx b/sd/source/ui/inc/fuconarc.hxx index 24cf0d46e85f..fa82113ed301 100644 --- a/sd/source/ui/inc/fuconarc.hxx +++ b/sd/source/ui/inc/fuconarc.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ namespace sd { -class FuConstructArc +class FuConstructArc : public FuConstruct { public: @@ -48,17 +48,17 @@ public: virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren // #97016# virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); protected: FuConstructArc ( - ViewShell* pViewSh, + ViewShell* pViewSh, ::sd::Window* pWin, - ::sd::View* pView, + ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx index 0bf18a20a5da..8ee8fccb9f3c 100644 --- a/sd/source/ui/inc/fuconbez.hxx +++ b/sd/source/ui/inc/fuconbez.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ class DrawViewShell; class Window; -class FuConstructBezierPolygon +class FuConstructBezierPolygon : public FuConstruct { public: @@ -55,8 +55,8 @@ public: virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren virtual void SelectionHasChanged(); @@ -68,15 +68,15 @@ public: protected: FuConstructBezierPolygon ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); USHORT nEditMode; - ::com::sun::star::uno::Any maTargets; // used for creating a path for custom animations + ::com::sun::star::uno::Any maTargets; // used for creating a path for custom animations }; } // end of namespace sd diff --git a/sd/source/ui/inc/fuconcs.hxx b/sd/source/ui/inc/fuconcs.hxx index da96a4d1ddfd..02ec69ab6c0c 100644 --- a/sd/source/ui/inc/fuconcs.hxx +++ b/sd/source/ui/inc/fuconcs.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ public: virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren + virtual void Activate(); // Function aktivieren void SetAttributes( SdrObject* pObj ); @@ -71,9 +71,9 @@ public: protected: FuConstructCustomShape ( - ViewShell* pViewSh, + ViewShell* pViewSh, ::sd::Window* pWin, - ::sd::View* pView, + ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); diff --git a/sd/source/ui/inc/fuconnct.hxx b/sd/source/ui/inc/fuconnct.hxx index 623c1dd9432b..ef8e5ffa503b 100644 --- a/sd/source/ui/inc/fuconnct.hxx +++ b/sd/source/ui/inc/fuconnct.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ namespace sd { -class FuConnectionDlg +class FuConnectionDlg : public FuPoor { public: @@ -44,10 +44,10 @@ public: private: FuConnectionDlg ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuconrec.hxx b/sd/source/ui/inc/fuconrec.hxx index 3c2846c47037..9798aec447a9 100644 --- a/sd/source/ui/inc/fuconrec.hxx +++ b/sd/source/ui/inc/fuconrec.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ namespace sd { |* \************************************************************************/ -class FuConstructRectangle +class FuConstructRectangle : public FuConstruct { public: @@ -59,8 +59,8 @@ public: virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren void SetAttributes(SfxItemSet& rAttr, SdrObject* pObj); void SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj); @@ -70,9 +70,9 @@ public: protected: FuConstructRectangle ( - ViewShell* pViewSh, + ViewShell* pViewSh, ::sd::Window* pWin, - ::sd::View* pView, + ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); diff --git a/sd/source/ui/inc/fuconstr.hxx b/sd/source/ui/inc/fuconstr.hxx index 390060a16e3c..99e0fd20b372 100755 --- a/sd/source/ui/inc/fuconstr.hxx +++ b/sd/source/ui/inc/fuconstr.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace sd { |* \************************************************************************/ -class FuConstruct +class FuConstruct : public FuDraw { public: @@ -51,15 +51,15 @@ public: TYPEINFO(); virtual void DoExecute( SfxRequest& rReq ); - + // Mouse- & Key-Events virtual BOOL KeyInput(const KeyEvent& rKEvt); virtual BOOL MouseMove(const MouseEvent& rMEvt); virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren virtual void SelectionHasChanged() { bSelectionChanged = TRUE; } @@ -73,10 +73,10 @@ public: const sal_Bool bUseFillStyle, const sal_Bool bUseNoFillStyle ); protected: - FuConstruct (ViewShell* pViewSh, - ::sd::Window* pWin, + FuConstruct (ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); bool bSelectionChanged; @@ -84,4 +84,4 @@ protected: } // end of namespace sd -#endif // _SD_FUCONSTR_HXX +#endif // _SD_FUCONSTR_HXX diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx index be7e83065bc0..d014577538e5 100644 --- a/sd/source/ui/inc/fuconuno.hxx +++ b/sd/source/ui/inc/fuconuno.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace sd { |* \************************************************************************/ -class FuConstructUnoControl +class FuConstructUnoControl : public FuConstruct { public: @@ -54,21 +54,21 @@ public: virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren // #97016# virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); protected: FuConstructUnoControl( - ViewShell* pViewSh, + ViewShell* pViewSh, ::sd::Window* pWin, - ::sd::View* pView, + ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); - String aOldLayer; + String aOldLayer; private: UINT32 nInventor; diff --git a/sd/source/ui/inc/fucopy.hxx b/sd/source/ui/inc/fucopy.hxx index eb9565f02ff6..ac9b76331b5c 100644 --- a/sd/source/ui/inc/fucopy.hxx +++ b/sd/source/ui/inc/fucopy.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ namespace sd { -class FuCopy +class FuCopy : public FuPoor { public: @@ -44,10 +44,10 @@ public: private: FuCopy ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fucushow.hxx b/sd/source/ui/inc/fucushow.hxx index 54c7596bfbc0..3681a83c5fe1 100644 --- a/sd/source/ui/inc/fucushow.hxx +++ b/sd/source/ui/inc/fucushow.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ namespace sd { -class FuCustomShowDlg +class FuCustomShowDlg : public FuPoor { public: @@ -43,10 +43,10 @@ public: private: FuCustomShowDlg ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx index 23f68eda327b..ed91048acf76 100755 --- a/sd/source/ui/inc/fudraw.hxx +++ b/sd/source/ui/inc/fudraw.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ namespace sd { |* \************************************************************************/ -class FuDraw +class FuDraw : public FuPoor { public: @@ -66,7 +66,7 @@ public: virtual void DoubleClick(const MouseEvent& rMEvt); - BOOL SetPointer(SdrObject* pObj, const Point& rPos); + BOOL SetPointer(SdrObject* pObj, const Point& rPos); BOOL SetHelpText(SdrObject* pObj, const Point& rPos, const SdrViewEvent& rVEvt); void SetPermanent(BOOL bSet) { bPermanent = bSet; } @@ -80,23 +80,23 @@ public: virtual bool cancel(); protected: - FuDraw (ViewShell* pViewSh, - ::sd::Window* pWin, + FuDraw (ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); virtual ~FuDraw(); Pointer aNewPointer; Pointer aOldPointer; - BOOL bMBDown; - BOOL bDragHelpLine; - USHORT nHelpLine; + BOOL bMBDown; + BOOL bDragHelpLine; + USHORT nHelpLine; BOOL bPermanent; }; } // end of namespace sd -#endif // _SD_FUDRAW_HXX +#endif // _SD_FUDRAW_HXX diff --git a/sd/source/ui/inc/fudspord.hxx b/sd/source/ui/inc/fudspord.hxx index 9ef00c2b7335..13cf7755c84b 100644 --- a/sd/source/ui/inc/fudspord.hxx +++ b/sd/source/ui/inc/fudspord.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ namespace sd { |* \************************************************************************/ -class FuDisplayOrder +class FuDisplayOrder : public FuPoor { public: @@ -56,27 +56,27 @@ public: virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren protected: virtual ~FuDisplayOrder (void); void implClearOverlay(); - Pointer maPtr; - SdrObject* mpRefObj; - SdrDropMarkerOverlay* mpOverlay; + Pointer maPtr; + SdrObject* mpRefObj; + SdrDropMarkerOverlay* mpOverlay; private: FuDisplayOrder ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq); + SdDrawDocument* pDoc, + SfxRequest& rReq); }; } // end of namespace sd -#endif // _SD_FUDSPORD_HXX +#endif // _SD_FUDSPORD_HXX diff --git a/sd/source/ui/inc/fuediglu.hxx b/sd/source/ui/inc/fuediglu.hxx index badf58a1d631..81e3a6bbacfe 100644 --- a/sd/source/ui/inc/fuediglu.hxx +++ b/sd/source/ui/inc/fuediglu.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,12 +38,12 @@ namespace sd { |* \************************************************************************/ -class FuEditGluePoints +class FuEditGluePoints : public FuDraw { public: TYPEINFO(); - + static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); virtual void DoExecute( SfxRequest& rReq ); @@ -55,15 +55,15 @@ public: virtual BOOL Command(const CommandEvent& rCEvt); virtual void ReceiveRequest(SfxRequest& rReq); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren protected: FuEditGluePoints ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); virtual ~FuEditGluePoints (void); }; diff --git a/sd/source/ui/inc/fuexpand.hxx b/sd/source/ui/inc/fuexpand.hxx index 9e732efb4c2b..651f28f01017 100644 --- a/sd/source/ui/inc/fuexpand.hxx +++ b/sd/source/ui/inc/fuexpand.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ namespace sd { -class FuExpandPage +class FuExpandPage : public FuPoor { public: @@ -43,10 +43,10 @@ class FuExpandPage private: FuExpandPage ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx index 3e2524c98a2f..85e13c157c77 100644 --- a/sd/source/ui/inc/fuformatpaintbrush.hxx +++ b/sd/source/ui/inc/fuformatpaintbrush.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,12 +60,12 @@ private: FuFormatPaintBrush ( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); void DoExecute( SfxRequest& rReq ); - + bool HasContentForThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const; void Paste( bool, bool ); - + void implcancel(); - + ::boost::shared_ptr<SfxItemSet> mpItemSet; bool mbPermanent; bool mbOldIsQuickTextEditMode; diff --git a/sd/source/ui/inc/fugrid.hxx b/sd/source/ui/inc/fugrid.hxx index fa3834a81281..547f16610cf9 100644 --- a/sd/source/ui/inc/fugrid.hxx +++ b/sd/source/ui/inc/fugrid.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ namespace sd { -class FuGrid +class FuGrid : public FuPoor { public: @@ -45,10 +45,10 @@ public: private: FuGrid ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuhhconv.hxx b/sd/source/ui/inc/fuhhconv.hxx index 6f8f9365ed1d..cf4c9f5bb5cf 100644 --- a/sd/source/ui/inc/fuhhconv.hxx +++ b/sd/source/ui/inc/fuhhconv.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ class FuHangulHanjaConversion : public FuPoor static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - void StartConversion( INT16 nSourceLanguage, INT16 nTargetLanguage, + void StartConversion( INT16 nSourceLanguage, INT16 nTargetLanguage, const Font *pTargetFont, INT32 nOptions, BOOL bIsInteractive ); void StartChineseConversion(); @@ -56,15 +56,15 @@ class FuHangulHanjaConversion : public FuPoor protected: ~FuHangulHanjaConversion(); - Outliner* pSdOutliner; - BOOL bOwnOutliner; + Outliner* pSdOutliner; + BOOL bOwnOutliner; private: FuHangulHanjaConversion ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq ); }; diff --git a/sd/source/ui/inc/fuinsert.hxx b/sd/source/ui/inc/fuinsert.hxx index e783c69b314b..1cdc88047018 100644 --- a/sd/source/ui/inc/fuinsert.hxx +++ b/sd/source/ui/inc/fuinsert.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ namespace sd { -class FuInsertGraphic +class FuInsertGraphic : public FuPoor { public: @@ -44,17 +44,17 @@ public: private: FuInsertGraphic ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; /************************************************************************/ -class FuInsertClipboard +class FuInsertClipboard : public FuPoor { public: @@ -65,17 +65,17 @@ public: private: FuInsertClipboard ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; /************************************************************************/ -class FuInsertOLE +class FuInsertOLE : public FuPoor { public: @@ -86,10 +86,10 @@ class FuInsertOLE private: FuInsertOLE ( - ViewShell* pViewSh, + ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; @@ -106,10 +106,10 @@ public: private: FuInsertAVMedia ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuinsfil.hxx b/sd/source/ui/inc/fuinsfil.hxx index b9f5589c5d2f..8a24382777bd 100644 --- a/sd/source/ui/inc/fuinsfil.hxx +++ b/sd/source/ui/inc/fuinsfil.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ struct StyleRequestData; namespace sd { -class FuInsertFile +class FuInsertFile : public FuPoor { public: @@ -49,15 +49,15 @@ public: private: FuInsertFile ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); - + String aLayoutName; // Layoutname der aktuell eingefuegten Seite String aFilterName; // gewaehlter Dateifilter - String aFile; // gewaehlter Dateiname + String aFile; // gewaehlter Dateiname void InsTextOrRTFinOlMode(SfxMedium* pMedium); BOOL InsSDDinOlMode(SfxMedium* pMedium); diff --git a/sd/source/ui/inc/fuline.hxx b/sd/source/ui/inc/fuline.hxx index 32fd95a6f326..35ab1d32bbd7 100644 --- a/sd/source/ui/inc/fuline.hxx +++ b/sd/source/ui/inc/fuline.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ namespace sd { -class FuLine +class FuLine : public FuPoor { public: @@ -47,10 +47,10 @@ public: private: FuLine ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fulinend.hxx b/sd/source/ui/inc/fulinend.hxx index da8df27f5e0d..0aab63ee779e 100644 --- a/sd/source/ui/inc/fulinend.hxx +++ b/sd/source/ui/inc/fulinend.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ namespace sd { -class FuLineEnd +class FuLineEnd : public FuPoor { public: @@ -47,10 +47,10 @@ public: private: FuLineEnd ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fulink.hxx b/sd/source/ui/inc/fulink.hxx index feea6e9d63c1..70a8cc1c689f 100644 --- a/sd/source/ui/inc/fulink.hxx +++ b/sd/source/ui/inc/fulink.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ namespace sd { -class FuLink +class FuLink : public FuPoor { public: @@ -44,10 +44,10 @@ public: private: FuLink ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq ); }; diff --git a/sd/source/ui/inc/fumeasur.hxx b/sd/source/ui/inc/fumeasur.hxx index e5a42d03731d..88697d163d6d 100644 --- a/sd/source/ui/inc/fumeasur.hxx +++ b/sd/source/ui/inc/fumeasur.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ namespace sd { -class FuMeasureDlg +class FuMeasureDlg : public FuPoor { public: @@ -44,10 +44,10 @@ class FuMeasureDlg private: FuMeasureDlg ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fumorph.hxx b/sd/source/ui/inc/fumorph.hxx index 754fc81b1c92..7864dc10e994 100644 --- a/sd/source/ui/inc/fumorph.hxx +++ b/sd/source/ui/inc/fumorph.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,15 +36,15 @@ |* \************************************************************************/ class List; -namespace basegfx { +namespace basegfx { class B2DPolyPolygon; class B2DPolygon; - class B2DPoint; + class B2DPoint; } namespace sd { -class FuMorph +class FuMorph : public FuPoor { public: @@ -55,16 +55,16 @@ public: private: FuMorph ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); void ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, const SdrObject* pObj1, const SdrObject* pObj2); - ::basegfx::B2DPolyPolygon* ImpCreateMorphedPolygon( - const ::basegfx::B2DPolyPolygon& rPolyPolyStart, + ::basegfx::B2DPolyPolygon* ImpCreateMorphedPolygon( + const ::basegfx::B2DPolyPolygon& rPolyPolyStart, const ::basegfx::B2DPolyPolygon& rPolyPolyEnd, double fMorphingFactor); sal_Bool ImpMorphPolygons( diff --git a/sd/source/ui/inc/fuoaprms.hxx b/sd/source/ui/inc/fuoaprms.hxx index 9d015727bc07..33628b0624c0 100644 --- a/sd/source/ui/inc/fuoaprms.hxx +++ b/sd/source/ui/inc/fuoaprms.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ namespace sd { -class FuObjectAnimationParameters +class FuObjectAnimationParameters : public FuPoor { public: @@ -46,7 +46,7 @@ private: FuObjectAnimationParameters ( ViewShell* pViewSh, ::sd::Window* pWin, - ::sd::View* pView, + ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuolbull.hxx b/sd/source/ui/inc/fuolbull.hxx index 31ec06307ac0..720bfefe6d9c 100644 --- a/sd/source/ui/inc/fuolbull.hxx +++ b/sd/source/ui/inc/fuolbull.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ class Window; |* \************************************************************************/ -class FuOutlineBullet +class FuOutlineBullet : public FuPoor { public: @@ -56,10 +56,10 @@ public: private: FuOutlineBullet ( - ViewShell* pViewShell, - ::sd::Window* pWin, + ViewShell* pViewShell, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuoltext.hxx b/sd/source/ui/inc/fuoltext.hxx index 0a97767cedba..2310e97bd322 100644 --- a/sd/source/ui/inc/fuoltext.hxx +++ b/sd/source/ui/inc/fuoltext.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ class Window; |* Textfunktionen im Outlinermodus |* \************************************************************************/ -class FuOutlineText +class FuOutlineText : public FuOutline { public: @@ -61,8 +61,8 @@ public: virtual void DoCopy(); virtual void DoPaste(); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren /** Call this method when the text in the outliner (may) has changed. It will invalidate some slots of the view frame and update the @@ -72,10 +72,10 @@ public: protected: FuOutlineText ( - ViewShell* pViewShell, - ::sd::Window* pWin, + ViewShell* pViewShell, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx index 92299387849a..49dcd01fe232 100755 --- a/sd/source/ui/inc/fuoutl.hxx +++ b/sd/source/ui/inc/fuoutl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ class Window; |* \************************************************************************/ -class FuOutline +class FuOutline : public FuPoor { public: @@ -61,10 +61,10 @@ public: protected: FuOutline ( - ViewShell* pViewShell, - ::sd::Window* pWindow, + ViewShell* pViewShell, + ::sd::Window* pWindow, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); OutlineViewShell* pOutlineViewShell; diff --git a/sd/source/ui/inc/fupage.hxx b/sd/source/ui/inc/fupage.hxx index a0cd7b4d2e0a..3be210876a77 100755 --- a/sd/source/ui/inc/fupage.hxx +++ b/sd/source/ui/inc/fupage.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ class SdPage; namespace sd { class DrawViewShell; -class FuPage +class FuPage : public FuPoor { public: @@ -46,8 +46,8 @@ class FuPage static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren const SfxItemSet* ExecuteDialog( Window* pParent ); @@ -56,23 +56,23 @@ protected: private: FuPage ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq ); void ApplyItemSet( const SfxItemSet* pArgs ); - SfxRequest& mrReq; - const SfxItemSet* mpArgs; - SdBackgroundObjUndoAction* mpBackgroundObjUndoAction; - Size maSize; - bool mbPageBckgrdDeleted; - bool mbMasterPage; - bool mbDisplayBackgroundTabPage; - SdPage* mpPage; - DrawViewShell* mpDrawViewShell; + SfxRequest& mrReq; + const SfxItemSet* mpArgs; + SdBackgroundObjUndoAction* mpBackgroundObjUndoAction; + Size maSize; + bool mbPageBckgrdDeleted; + bool mbMasterPage; + bool mbDisplayBackgroundTabPage; + SdPage* mpPage; + DrawViewShell* mpDrawViewShell; }; } // end of namespace sd diff --git a/sd/source/ui/inc/fuparagr.hxx b/sd/source/ui/inc/fuparagr.hxx index 0e61aaff28c8..9ef9854468c8 100644 --- a/sd/source/ui/inc/fuparagr.hxx +++ b/sd/source/ui/inc/fuparagr.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ namespace sd { -class FuParagraph +class FuParagraph : public FuPoor { public: @@ -46,10 +46,10 @@ public: private: FuParagraph ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index 2650e99767b5..28d413bb6807 100755 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,8 +60,8 @@ class Window; class FuPoor : public SimpleReferenceComponent { public: - static const int HITPIX = 2; // Hit-Toleranz in Pixel - static const int DRGPIX = 2; // Drag MinMove in Pixel + static const int HITPIX = 2; // Hit-Toleranz in Pixel + static const int DRGPIX = 2; // Drag MinMove in Pixel TYPEINFO(); @@ -85,27 +85,27 @@ public: // #95491# moved from inline to *.cxx virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - + virtual BOOL Command(const CommandEvent& rCEvt); virtual BOOL RequestHelp(const HelpEvent& rHEvt); virtual void Paint(const Rectangle&, ::sd::Window* ); virtual void ReceiveRequest(SfxRequest& rReq); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren - virtual void ScrollStart() {} // diese Funktionen werden von - virtual void ScrollEnd() {} // ForceScroll aufgerufen + virtual void ScrollStart() {} // diese Funktionen werden von + virtual void ScrollEnd() {} // ForceScroll aufgerufen void SetWindow(::sd::Window* pWin) { mpWindow = pWin; } // #97016# II virtual void SelectionHasChanged(); - USHORT GetSlotID() const { return( nSlotId ); } - USHORT GetSlotValue() const { return( nSlotValue ); } + USHORT GetSlotID() const { return( nSlotId ); } + USHORT GetSlotValue() const { return( nSlotValue ); } - void SetNoScrollUntilInside(BOOL bNoScroll = TRUE) + void SetNoScrollUntilInside(BOOL bNoScroll = TRUE) { bNoScrollUntilInside = bNoScroll; } void StartDelayToScrollTimer (); @@ -136,10 +136,10 @@ protected: @param pViewSh May be NULL. */ - FuPoor (ViewShell* pViewSh, - ::sd::Window* pWin, + FuPoor (ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); virtual ~FuPoor (void); @@ -151,7 +151,7 @@ protected: offset relative to the active layer. With respect to the layer bar control at the lower left of the document window positive values move to the right and negative values move to the left. - + <p>Switching the layer is independant of the view's layer mode. The layers are switched even when the layer mode is turned off and the layer control is not visible.</p> @@ -171,36 +171,36 @@ protected: DrawDocShell* mpDocSh; SdDrawDocument* mpDoc; - USHORT nSlotId; - USHORT nSlotValue; + USHORT nSlotId; + USHORT nSlotValue; - Dialog* pDialog; + Dialog* pDialog; - Timer aScrollTimer; // fuer Autoscrolling + Timer aScrollTimer; // fuer Autoscrolling DECL_LINK( ScrollHdl, Timer * ); void ForceScroll(const Point& aPixPos); - Timer aDragTimer; // fuer Drag&Drop + Timer aDragTimer; // fuer Drag&Drop DECL_LINK( DragHdl, Timer * ); - BOOL bIsInDragMode; - Point aMDPos; // Position von MouseButtonDown + BOOL bIsInDragMode; + Point aMDPos; // Position von MouseButtonDown // Flag, um AutoScrolling zu verhindern, bis von ausserhalb in das // Fenster hinein gedragt wurde - BOOL bNoScrollUntilInside; + BOOL bNoScrollUntilInside; // Timer um das scrolling zu verzoegern, wenn aus dem fenster // herausgedraggt wird (ca. 1 sec.) - Timer aDelayToScrollTimer; // fuer Verzoegerung bis scroll - BOOL bScrollable; - BOOL bDelayActive; - BOOL bFirstMouseMove; + Timer aDelayToScrollTimer; // fuer Verzoegerung bis scroll + BOOL bScrollable; + BOOL bDelayActive; + BOOL bFirstMouseMove; // #95491# member to hold state of the mouse buttons for creation // of own MouseEvents (like in ScrollHdl) private: - sal_uInt16 mnCode; + sal_uInt16 mnCode; }; @@ -208,5 +208,5 @@ typedef rtl::Reference< FuPoor > FunctionReference; } // end of namespace sd -#endif // _SD_FUPOOR_HXX +#endif // _SD_FUPOOR_HXX diff --git a/sd/source/ui/inc/fuprlout.hxx b/sd/source/ui/inc/fuprlout.hxx index 9eb092a5bfa3..a2a3fa253a1e 100644 --- a/sd/source/ui/inc/fuprlout.hxx +++ b/sd/source/ui/inc/fuprlout.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ class View; class ViewShell; class Window; -class FuPresentationLayout +class FuPresentationLayout : public FuPoor { public: @@ -51,10 +51,10 @@ public: private: FuPresentationLayout ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuprobjs.hxx b/sd/source/ui/inc/fuprobjs.hxx index 8cb706683d43..1e9f1b201fa9 100644 --- a/sd/source/ui/inc/fuprobjs.hxx +++ b/sd/source/ui/inc/fuprobjs.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ class ViewShell; class Window; -class FuPresentationObjects +class FuPresentationObjects : public FuPoor { public: @@ -51,10 +51,10 @@ public: private: FuPresentationObjects ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuscale.hxx b/sd/source/ui/inc/fuscale.hxx index f6355b04ebb7..973dee7d4c57 100644 --- a/sd/source/ui/inc/fuscale.hxx +++ b/sd/source/ui/inc/fuscale.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ namespace sd { -class FuScale +class FuScale : public FuPoor { public: @@ -43,10 +43,10 @@ public: private: FuScale ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fusearch.hxx b/sd/source/ui/inc/fusearch.hxx index fdba497f262c..ff625592f099 100644 --- a/sd/source/ui/inc/fusearch.hxx +++ b/sd/source/ui/inc/fusearch.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ namespace sd { class Outliner; -class FuSearch +class FuSearch : public FuPoor { public: @@ -58,9 +58,9 @@ protected: private: FuSearch ( ViewShell* pViewSh, - ::sd::Window* pWin, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx index c1e43c2467e9..ecf2a88d7357 100644 --- a/sd/source/ui/inc/fusel.hxx +++ b/sd/source/ui/inc/fusel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ class Sound; namespace sd { -class FuSelection +class FuSelection : public FuDraw { public: @@ -54,15 +54,15 @@ public: virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren virtual void SelectionHasChanged(); void SetEditMode(USHORT nMode); USHORT GetEditMode() { return nEditMode; } - BOOL AnimateObj(SdrObject* pObj, const Point& rPos); + BOOL AnimateObj(SdrObject* pObj, const Point& rPos); /** is called when the currenct function should be aborted. <p> This is used when a function gets a KEY_ESCAPE but can also @@ -73,15 +73,15 @@ public: virtual bool cancel(); protected: - FuSelection (ViewShell* pViewSh, - ::sd::Window* pWin, + FuSelection (ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); virtual ~FuSelection(); - BOOL bTempRotation; + BOOL bTempRotation; BOOL bSelectionChanged; BOOL bHideAndAnimate; SdrHdl* pHdl; @@ -108,5 +108,5 @@ private: } // end of namespace sd -#endif // _SD_FUSEL_HXX +#endif // _SD_FUSEL_HXX diff --git a/sd/source/ui/inc/fusldlg.hxx b/sd/source/ui/inc/fusldlg.hxx index 239f950c1108..72e9d6e89e21 100644 --- a/sd/source/ui/inc/fusldlg.hxx +++ b/sd/source/ui/inc/fusldlg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ namespace sd { -class FuSlideShowDlg +class FuSlideShowDlg : public FuPoor { public: @@ -43,10 +43,10 @@ public: private: FuSlideShowDlg ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuslhide.hxx b/sd/source/ui/inc/fuslhide.hxx index 4858696e41b1..8a1ebc74ca7d 100644 --- a/sd/source/ui/inc/fuslhide.hxx +++ b/sd/source/ui/inc/fuslhide.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ namespace sd { |* \************************************************************************/ -class FuSlideHide +class FuSlideHide : public FuSlide { public: @@ -49,10 +49,10 @@ public: protected: FuSlideHide ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); virtual ~FuSlideHide (void); }; diff --git a/sd/source/ui/inc/fuslid.hxx b/sd/source/ui/inc/fuslid.hxx index a6de8d720411..671afe72169e 100644 --- a/sd/source/ui/inc/fuslid.hxx +++ b/sd/source/ui/inc/fuslid.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ class Window; |* \************************************************************************/ -class FuSlide +class FuSlide : public FuPoor { public: @@ -62,14 +62,14 @@ public: protected: FuSlide ( - SlideViewShell* pViewSh, + SlideViewShell* pViewSh, ::sd::Window* pWin, - SlideView* pView, - SdDrawDocument* pDoc, + SlideView* pView, + SdDrawDocument* pDoc, SfxRequest& rReq); SlideViewShell* pSlViewShell; - SlideView* pSlView; + SlideView* pSlView; }; } // end of namespace sd diff --git a/sd/source/ui/inc/fuslsel.hxx b/sd/source/ui/inc/fuslsel.hxx index 2890f3faf98a..afc806b7fc5b 100644 --- a/sd/source/ui/inc/fuslsel.hxx +++ b/sd/source/ui/inc/fuslsel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,12 +42,12 @@ class Window; struct FSS_IsShowingEffectInfo { - BOOL bIsShowingEffect; // TRUE while we show a fade effect one the slide view - BOOL bDisposed; // TRUE if the FuSlideSelection was deleted during fade effect + BOOL bIsShowingEffect; // TRUE while we show a fade effect one the slide view + BOOL bDisposed; // TRUE if the FuSlideSelection was deleted during fade effect }; -class FuSlideSelection +class FuSlideSelection : public FuSlide { public: @@ -62,13 +62,13 @@ public: virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin); - - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren - + + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren + virtual void ScrollStart(); virtual void ScrollEnd(); - + BOOL IsShowingEffect() const { return pIsShowingEffectInfo && pIsShowingEffectInfo->bIsShowingEffect; } /** is called when the currenct function should be aborted. <p> @@ -81,23 +81,23 @@ public: protected: FuSlideSelection ( - SlideViewShell* pViewSh, + SlideViewShell* pViewSh, ::sd::Window* pWin, - SlideView* pView, + SlideView* pView, SdDrawDocument* pDoc, SfxRequest& rReq); virtual ~FuSlideSelection (void); private: - BOOL bSubstShown; - BOOL bPageHit; - List aSubstList; // Liste mit Ertsatzdarstellungen - Point aDragPos; // hier wird die Seite angefasst - BOOL bDragSelection; - Point aDragSelRectAnchor; // fester Punkt des Selektionsrechtecks - Rectangle aDragSelRect; - Point aPosOfInsertMarker; - FSS_IsShowingEffectInfo* pIsShowingEffectInfo; + BOOL bSubstShown; + BOOL bPageHit; + List aSubstList; // Liste mit Ertsatzdarstellungen + Point aDragPos; // hier wird die Seite angefasst + BOOL bDragSelection; + Point aDragSelRectAnchor; // fester Punkt des Selektionsrechtecks + Rectangle aDragSelRect; + Point aPosOfInsertMarker; + FSS_IsShowingEffectInfo* pIsShowingEffectInfo; void DrawInsertMarker(BOOL bShow); Point CalcPosOfInsertMarker(const Point& rPoint); diff --git a/sd/source/ui/inc/fusnapln.hxx b/sd/source/ui/inc/fusnapln.hxx index cc5efaba990c..383988f4a8cb 100644 --- a/sd/source/ui/inc/fusnapln.hxx +++ b/sd/source/ui/inc/fusnapln.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ namespace sd { -class FuSnapLine +class FuSnapLine : public FuPoor { public: @@ -46,10 +46,10 @@ public: private: FuSnapLine ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fusumry.hxx b/sd/source/ui/inc/fusumry.hxx index 6515977026c6..f9a7a5572bcc 100644 --- a/sd/source/ui/inc/fusumry.hxx +++ b/sd/source/ui/inc/fusumry.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ namespace sd { -class FuSummaryPage +class FuSummaryPage : public FuPoor { public: @@ -43,10 +43,10 @@ public: private: FuSummaryPage ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/futempl.hxx b/sd/source/ui/inc/futempl.hxx index 40bf5936cda3..8f9a44e09ee3 100644 --- a/sd/source/ui/inc/futempl.hxx +++ b/sd/source/ui/inc/futempl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ namespace sd { -class FuTemplate +class FuTemplate : public FuPoor { public: @@ -46,10 +46,10 @@ public: private: FuTemplate ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx index 052f4099ef21..a8096293305a 100644 --- a/sd/source/ui/inc/futext.hxx +++ b/sd/source/ui/inc/futext.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ namespace sd { |* \************************************************************************/ -class FuText +class FuText : public FuConstruct { public: @@ -66,11 +66,11 @@ public: virtual void ReceiveRequest(SfxRequest& rReq); virtual void DoubleClick(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren void SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag); - BOOL DeleteDefaultText(); + BOOL DeleteDefaultText(); SdrTextObj* GetTextObj() { return static_cast< SdrTextObj* >( mxTextObj.get() ); } DECL_LINK(SpellError, void* ); @@ -89,19 +89,19 @@ public: static void ChangeFontSize( bool, OutlinerView*, const FontList*, ::sd::View* ); protected: - FuText (ViewShell* pViewSh, - ::sd::Window* pWin, + FuText (ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); virtual void disposing(); - SdrObjectWeakRef mxTextObj; + SdrObjectWeakRef mxTextObj; Link aOldLink; BOOL bFirstObjCreated; - SfxRequest& rRequest; + SfxRequest& rRequest; private: // #97016# diff --git a/sd/source/ui/inc/futhes.hxx b/sd/source/ui/inc/futhes.hxx index 07aadf386b05..e243898ed62f 100644 --- a/sd/source/ui/inc/futhes.hxx +++ b/sd/source/ui/inc/futhes.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ namespace sd { -class FuThesaurus +class FuThesaurus : public FuPoor { public: @@ -43,10 +43,10 @@ public: private: FuThesaurus ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/futransf.hxx b/sd/source/ui/inc/futransf.hxx index 85041334c7f0..9fe7c37eefba 100755 --- a/sd/source/ui/inc/futransf.hxx +++ b/sd/source/ui/inc/futransf.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ namespace sd { -class FuTransform +class FuTransform : public FuPoor { public: @@ -46,10 +46,10 @@ public: private: FuTransform ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/futxtatt.hxx b/sd/source/ui/inc/futxtatt.hxx index f766d32d048d..ea1cc6f6ff10 100644 --- a/sd/source/ui/inc/futxtatt.hxx +++ b/sd/source/ui/inc/futxtatt.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ namespace sd { -class FuTextAttrDlg +class FuTextAttrDlg : public FuPoor { public: @@ -43,10 +43,10 @@ class FuTextAttrDlg private: FuTextAttrDlg ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuvect.hxx b/sd/source/ui/inc/fuvect.hxx index 406bea288bea..fef49d813681 100644 --- a/sd/source/ui/inc/fuvect.hxx +++ b/sd/source/ui/inc/fuvect.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ namespace sd { -class FuVectorize +class FuVectorize : public FuPoor { public: @@ -44,10 +44,10 @@ public: private: FuVectorize ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuzoom.hxx b/sd/source/ui/inc/fuzoom.hxx index 31d465646a96..7730c7573f24 100644 --- a/sd/source/ui/inc/fuzoom.hxx +++ b/sd/source/ui/inc/fuzoom.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,39 +37,39 @@ namespace sd { extern USHORT SidArrayZoom[]; -class FuZoom +class FuZoom : public FuPoor { public: TYPEINFO(); static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - + // Mouse- & Key-Events virtual BOOL MouseMove(const MouseEvent& rMEvt); virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren protected: virtual ~FuZoom (void); - Point aBeginPosPix; - Point aBeginPos; - Point aEndPos; - Rectangle aZoomRect; - BOOL bVisible; - BOOL bStartDrag; - Pointer aPtr; + Point aBeginPosPix; + Point aBeginPos; + Point aEndPos; + Rectangle aZoomRect; + BOOL bVisible; + BOOL bStartDrag; + Pointer aPtr; private: FuZoom ( - ViewShell* pViewSh, + ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx index 8f8b0609304a..a0a427ae3939 100644 --- a/sd/source/ui/inc/gluectrl.hxx +++ b/sd/source/ui/inc/gluectrl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,13 +41,13 @@ class GlueEscDirLB : public ListBox private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; public: - GlueEscDirLB( Window* pParent, + GlueEscDirLB( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); ~GlueEscDirLB(); virtual void Select(); - void Fill(); + void Fill(); }; /************************************************************************* @@ -59,12 +59,12 @@ public: class SdTbxCtlGlueEscDir: public SfxToolBoxControl { private: - UINT16 GetEscDirPos( UINT16 nEscDir ); + UINT16 GetEscDirPos( UINT16 nEscDir ); public: virtual void StateChanged( USHORT nSId, SfxItemState eState, const SfxPoolItem* pState ); - virtual Window* CreateItemWindow( Window *pParent ); + virtual Window* CreateItemWindow( Window *pParent ); SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sd/source/ui/inc/headerfooterdlg.hrc b/sd/source/ui/inc/headerfooterdlg.hrc index d79874d42faa..458d8e8e21a5 100644 --- a/sd/source/ui/inc/headerfooterdlg.hrc +++ b/sd/source/ui/inc/headerfooterdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,31 +25,31 @@ * ************************************************************************/ -#define FL_INCLUDE_ON_PAGE 1 -#define CB_DATETIME 2 -#define RB_DATETIME_FIXED 3 -#define TB_DATETIME_FIXED 4 -#define RB_DATETIME_AUTOMATIC 5 -#define CB_DATETIME_FORMAT 6 -#define FT_DATETIME_LANGUAGE 7 -#define CB_DATETIME_LANGUAGE 8 -#define FL_FOOTER 9 -#define CB_FOOTER 10 -#define FT_FOOTER 11 -#define TB_FOOTER_FIXED 12 -#define FL_SLIDENUMBER 13 -#define CB_SLIDENUMBER 14 -#define FL_NOTONTITLE 15 -#define CB_NOTONTITLE 16 -#define BT_APPLYTOALL 17 -#define BT_APPLY 18 -#define BT_CANCEL 19 -#define BT_HELP 20 -#define FL_HEADER 21 -#define CB_HEADER 22 -#define FT_HEADER 23 -#define TB_HEADER_FIXED 24 -#define FL_DATETIME 25 -#define CT_PREVIEW 26 -#define STR_PAGE_NUMBER 27 -#define STR_INCLUDE_ON_PAGE 28 +#define FL_INCLUDE_ON_PAGE 1 +#define CB_DATETIME 2 +#define RB_DATETIME_FIXED 3 +#define TB_DATETIME_FIXED 4 +#define RB_DATETIME_AUTOMATIC 5 +#define CB_DATETIME_FORMAT 6 +#define FT_DATETIME_LANGUAGE 7 +#define CB_DATETIME_LANGUAGE 8 +#define FL_FOOTER 9 +#define CB_FOOTER 10 +#define FT_FOOTER 11 +#define TB_FOOTER_FIXED 12 +#define FL_SLIDENUMBER 13 +#define CB_SLIDENUMBER 14 +#define FL_NOTONTITLE 15 +#define CB_NOTONTITLE 16 +#define BT_APPLYTOALL 17 +#define BT_APPLY 18 +#define BT_CANCEL 19 +#define BT_HELP 20 +#define FL_HEADER 21 +#define CB_HEADER 22 +#define FT_HEADER 23 +#define TB_HEADER_FIXED 24 +#define FL_DATETIME 25 +#define CT_PREVIEW 26 +#define STR_PAGE_NUMBER 27 +#define STR_INCLUDE_ON_PAGE 28 diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx index fa0c4d9282c0..fedd33d5c830 100755 --- a/sd/source/ui/inc/headerfooterdlg.hxx +++ b/sd/source/ui/inc/headerfooterdlg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,18 +52,18 @@ private: DECL_LINK( ActivatePageHdl, TabControl * ); DECL_LINK( DeactivatePageHdl, TabControl * ); - TabControl maTabCtrl; + TabControl maTabCtrl; - HeaderFooterTabPage* mpSlideTabPage; - HeaderFooterTabPage* mpNotesHandoutsTabPage; + HeaderFooterTabPage* mpSlideTabPage; + HeaderFooterTabPage* mpNotesHandoutsTabPage; - HeaderFooterSettings maSlideSettings; - HeaderFooterSettings maNotesHandoutSettings; - bool mbNotOnTitle; + HeaderFooterSettings maSlideSettings; + HeaderFooterSettings maNotesHandoutSettings; + bool mbNotOnTitle; - SdDrawDocument* mpDoc; - SdPage* mpCurrentPage; - ViewShell* mpViewShell; + SdDrawDocument* mpDoc; + SdPage* mpCurrentPage; + ViewShell* mpViewShell; void apply( bool bToAll, bool bForceSlides ); void change( SdUndoGroup* pUndoGroup, SdPage* pPage, const HeaderFooterSettings& rNewSettings ); diff --git a/sd/source/ui/inc/ins_paste.hrc b/sd/source/ui/inc/ins_paste.hrc index 500b152c08c8..3a881eac70a7 100644 --- a/sd/source/ui/inc/ins_paste.hrc +++ b/sd/source/ui/inc/ins_paste.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,12 +25,12 @@ * ************************************************************************/ -#define DLG_INSERT_PASTE 678 +#define DLG_INSERT_PASTE 678 -#define BTN_OK 1 -#define BTN_CANCEL 1 -#define BTN_HELP 1 +#define BTN_OK 1 +#define BTN_CANCEL 1 +#define BTN_HELP 1 #define FL_POSITION 1 -#define RB_BEFORE 1 -#define RB_AFTER 2 +#define RB_BEFORE 1 +#define RB_AFTER 2 diff --git a/sd/source/ui/inc/ins_paste.hxx b/sd/source/ui/inc/ins_paste.hxx index 6feab297f0e4..338faac2922d 100644 --- a/sd/source/ui/inc/ins_paste.hxx +++ b/sd/source/ui/inc/ins_paste.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,16 +44,16 @@ private: FixedLine aFlPosition; RadioButton aRbBefore; RadioButton aRbAfter; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; public: SdInsertPasteDlg( Window* pWindow ); ~SdInsertPasteDlg(); - BOOL IsInsertBefore() const; + BOOL IsInsertBefore() const; }; #endif // _SD_INS_PASTE_HXX_ diff --git a/sd/source/ui/inc/inspagob.hrc b/sd/source/ui/inc/inspagob.hrc index bba29081f721..f2108abf0c82 100644 --- a/sd/source/ui/inc/inspagob.hrc +++ b/sd/source/ui/inc/inspagob.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx index 3f8046462df7..fa9ae4064dec 100644 --- a/sd/source/ui/inc/inspagob.hxx +++ b/sd/source/ui/inc/inspagob.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,18 +41,18 @@ class SdDrawDocument; class SdInsertPagesObjsDlg : public ModalDialog { private: - SdPageObjsTLB aLbTree; - CheckBox aCbxLink; - CheckBox aCbxMasters; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + SdPageObjsTLB aLbTree; + CheckBox aCbxLink; + CheckBox aCbxMasters; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; - SfxMedium* pMedium; - const SdDrawDocument* mpDoc; - const String& rName; + SfxMedium* pMedium; + const SdDrawDocument* mpDoc; + const String& rName; - void Reset(); + void Reset(); DECL_LINK( SelectObjectHdl, void * ); public: @@ -62,9 +62,9 @@ public: const String& rFileName ); ~SdInsertPagesObjsDlg(); - List* GetList( USHORT nType ); - BOOL IsLink(); - BOOL IsRemoveUnnessesaryMasterPages() const; + List* GetList( USHORT nType ); + BOOL IsLink(); + BOOL IsRemoveUnnessesaryMasterPages() const; }; diff --git a/sd/source/ui/inc/layeroptionsdlg.hrc b/sd/source/ui/inc/layeroptionsdlg.hrc index 63bb1b4105e0..5d94c700f5fa 100644 --- a/sd/source/ui/inc/layeroptionsdlg.hrc +++ b/sd/source/ui/inc/layeroptionsdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/layeroptionsdlg.hxx b/sd/source/ui/inc/layeroptionsdlg.hxx index a2aefd9e6f2a..81b7f86d9452 100644 --- a/sd/source/ui/inc/layeroptionsdlg.hxx +++ b/sd/source/ui/inc/layeroptionsdlg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,26 +42,26 @@ class SfxItemSet; class SdInsertLayerDlg : public ModalDialog { private: - FixedText maFtName; - Edit maEdtName; - FixedText maFtTitle; - Edit maEdtTitle; - FixedText maFtDesc; - MultiLineEdit maEdtDesc; - CheckBox maCbxVisible; - CheckBox maCbxPrintable; - CheckBox maCbxLocked; - FixedLine maFixedLine; - HelpButton maBtnHelp; - OKButton maBtnOK; - CancelButton maBtnCancel; + FixedText maFtName; + Edit maEdtName; + FixedText maFtTitle; + Edit maEdtTitle; + FixedText maFtDesc; + MultiLineEdit maEdtDesc; + CheckBox maCbxVisible; + CheckBox maCbxPrintable; + CheckBox maCbxLocked; + FixedLine maFixedLine; + HelpButton maBtnHelp; + OKButton maBtnOK; + CancelButton maBtnCancel; - const SfxItemSet& mrOutAttrs; + const SfxItemSet& mrOutAttrs; public: SdInsertLayerDlg( Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, String aStr ); - void GetAttr( SfxItemSet& rOutAttrs ); + void GetAttr( SfxItemSet& rOutAttrs ); }; #endif // _SD_LAYER_DLG_HXX_ diff --git a/sd/source/ui/inc/masterlayoutdlg.hrc b/sd/source/ui/inc/masterlayoutdlg.hrc index 635b5cbdef10..23cd99f8a624 100644 --- a/sd/source/ui/inc/masterlayoutdlg.hrc +++ b/sd/source/ui/inc/masterlayoutdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,12 +25,12 @@ * ************************************************************************/ -#define FL_PLACEHOLDERS 1 -#define CB_DATE 2 -#define CB_PAGE_NUMBER 3 -#define CB_HEADER 4 -#define CB_FOOTER 5 -#define BT_OK 6 -#define BT_CANCEL 7 -#define STR_SLIDE_NUMBER 8 +#define FL_PLACEHOLDERS 1 +#define CB_DATE 2 +#define CB_PAGE_NUMBER 3 +#define CB_HEADER 4 +#define CB_FOOTER 5 +#define BT_OK 6 +#define BT_CANCEL 7 +#define STR_SLIDE_NUMBER 8 #define STR_MASTER_LAYOUT_TITLE 9 diff --git a/sd/source/ui/inc/masterlayoutdlg.hxx b/sd/source/ui/inc/masterlayoutdlg.hxx index a7b5908367fc..609d2535389e 100644 --- a/sd/source/ui/inc/masterlayoutdlg.hxx +++ b/sd/source/ui/inc/masterlayoutdlg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,22 +44,22 @@ namespace sd class MasterLayoutDialog : public ModalDialog { private: - SdDrawDocument* mpDoc; - SdPage* mpCurrentPage; + SdDrawDocument* mpDoc; + SdPage* mpCurrentPage; - FixedLine maFLPlaceholders; - CheckBox maCBDate; - CheckBox maCBPageNumber; - CheckBox maCBHeader; - CheckBox maCBFooter; + FixedLine maFLPlaceholders; + CheckBox maCBDate; + CheckBox maCBPageNumber; + CheckBox maCBHeader; + CheckBox maCBFooter; - OKButton maPBOK; - CancelButton maPBCancel; + OKButton maPBOK; + CancelButton maPBCancel; - BOOL mbOldHeader; - BOOL mbOldFooter; - BOOL mbOldDate; - BOOL mbOldPageNumber; + BOOL mbOldHeader; + BOOL mbOldFooter; + BOOL mbOldDate; + BOOL mbOldPageNumber; void applyChanges(); void remove( PresObjKind eKind ); diff --git a/sd/source/ui/inc/morphdlg.hrc b/sd/source/ui/inc/morphdlg.hrc index f9a23c681d7e..8657d2a65b35 100644 --- a/sd/source/ui/inc/morphdlg.hrc +++ b/sd/source/ui/inc/morphdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,12 +24,12 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define DLG_MORPH 653 -#define BTN_OK 1 -#define BTN_CANCEL 1 -#define BTN_HELP 1 -#define GRP_PRESET 1 -#define FT_STEPS 1 -#define MTF_STEPS 1 -#define CBX_ATTRIBUTES 1 -#define CBX_ORIENTATION 2 +#define DLG_MORPH 653 +#define BTN_OK 1 +#define BTN_CANCEL 1 +#define BTN_HELP 1 +#define GRP_PRESET 1 +#define FT_STEPS 1 +#define MTF_STEPS 1 +#define CBX_ATTRIBUTES 1 +#define CBX_ORIENTATION 2 diff --git a/sd/source/ui/inc/morphdlg.hxx b/sd/source/ui/inc/morphdlg.hxx index 90682ce9d3f1..ad484884b507 100644 --- a/sd/source/ui/inc/morphdlg.hxx +++ b/sd/source/ui/inc/morphdlg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,34 +44,34 @@ namespace sd { |* \******************************************************************************/ -class MorphDlg +class MorphDlg : public ModalDialog { public: MorphDlg ( - ::Window* pParent, - const SdrObject* pObj1, + ::Window* pParent, + const SdrObject* pObj1, const SdrObject* pObj2); virtual ~MorphDlg (void); - void SaveSettings() const; - USHORT GetFadeSteps() const { return (USHORT) aMtfSteps.GetValue(); } - BOOL IsAttributeFade() const { return aCbxAttributes.IsChecked(); } - BOOL IsOrientationFade() const { return aCbxOrientation.IsChecked(); } + void SaveSettings() const; + USHORT GetFadeSteps() const { return (USHORT) aMtfSteps.GetValue(); } + BOOL IsAttributeFade() const { return aCbxAttributes.IsChecked(); } + BOOL IsOrientationFade() const { return aCbxOrientation.IsChecked(); } private: - FixedLine aGrpPreset; - FixedText aFtSteps; - MetricField aMtfSteps; - CheckBox aCbxAttributes; - CheckBox aCbxOrientation; - OKButton aBtnOK; - CancelButton aBtnCancel; + FixedLine aGrpPreset; + FixedText aFtSteps; + MetricField aMtfSteps; + CheckBox aCbxAttributes; + CheckBox aCbxOrientation; + OKButton aBtnOK; + CancelButton aBtnCancel; HelpButton aBtnHelp; - SdrObject* pSdrObj1; - SdrObject* pSdrObj2; + SdrObject* pSdrObj1; + SdrObject* pSdrObj2; - void LoadSettings(); + void LoadSettings(); }; diff --git a/sd/source/ui/inc/navigatr.hrc b/sd/source/ui/inc/navigatr.hrc index 47812c304890..1791d405f247 100644 --- a/sd/source/ui/inc/navigatr.hrc +++ b/sd/source/ui/inc/navigatr.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index aa5feddd4c23..651eac3bdaa0 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,24 +37,24 @@ #include "sdtreelb.hxx" #include "pres.hxx" -#define NAVSTATE_NONE 0x00000000 +#define NAVSTATE_NONE 0x00000000 -#define NAVBTN_PEN_ENABLED 0x00000010 -#define NAVBTN_PEN_DISABLED 0x00000020 -#define NAVBTN_PEN_CHECKED 0x00000040 -#define NAVBTN_PEN_UNCHECKED 0x00000080 +#define NAVBTN_PEN_ENABLED 0x00000010 +#define NAVBTN_PEN_DISABLED 0x00000020 +#define NAVBTN_PEN_CHECKED 0x00000040 +#define NAVBTN_PEN_UNCHECKED 0x00000080 -#define NAVTLB_UPDATE 0x00000100 +#define NAVTLB_UPDATE 0x00000100 -#define NAVBTN_FIRST_ENABLED 0x00001000 -#define NAVBTN_FIRST_DISABLED 0x00002000 -#define NAVBTN_PREV_ENABLED 0x00004000 -#define NAVBTN_PREV_DISABLED 0x00008000 +#define NAVBTN_FIRST_ENABLED 0x00001000 +#define NAVBTN_FIRST_DISABLED 0x00002000 +#define NAVBTN_PREV_ENABLED 0x00004000 +#define NAVBTN_PREV_DISABLED 0x00008000 -#define NAVBTN_LAST_ENABLED 0x00010000 -#define NAVBTN_LAST_DISABLED 0x00020000 -#define NAVBTN_NEXT_ENABLED 0x00040000 -#define NAVBTN_NEXT_DISABLED 0x00080000 +#define NAVBTN_LAST_ENABLED 0x00010000 +#define NAVBTN_LAST_DISABLED 0x00020000 +#define NAVBTN_NEXT_ENABLED 0x00040000 +#define NAVBTN_NEXT_DISABLED 0x00080000 // forward namespace sd { @@ -73,16 +73,16 @@ class NavDocInfo public: NavDocInfo() { mpDocShell = NULL; } - BOOL HasName() { return( (BOOL) bName ); } - BOOL IsActive() { return( (BOOL) bActive ); } + BOOL HasName() { return( (BOOL) bName ); } + BOOL IsActive() { return( (BOOL) bActive ); } - void SetName( BOOL bOn = TRUE ) { bName = bOn; } - void SetActive( BOOL bOn = TRUE ) { bActive = bOn; } + void SetName( BOOL bOn = TRUE ) { bName = bOn; } + void SetActive( BOOL bOn = TRUE ) { bActive = bOn; } private: friend class SdNavigatorWin; - BOOL bName : 1; - BOOL bActive : 1; + BOOL bName : 1; + BOOL bActive : 1; ::sd::DrawDocShell* mpDocShell; }; @@ -99,19 +99,19 @@ public: SfxBindings* pBindings ); virtual ~SdNavigatorWin(); - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); - void InitTreeLB( const SdDrawDocument* pDoc ); - void RefreshDocumentLB( const String* pDocName = NULL ); + void InitTreeLB( const SdDrawDocument* pDoc ); + void RefreshDocumentLB( const String* pDocName = NULL ); - BOOL InsertFile(const String& rFileName); + BOOL InsertFile(const String& rFileName); - NavigatorDragType GetNavigatorDragType(); - void SetNavigatorDragType(NavigatorDragType eType) { meDragType = eType; } + NavigatorDragType GetNavigatorDragType(); + void SetNavigatorDragType(NavigatorDragType eType) { meDragType = eType; } protected: - virtual void Resize(); - virtual long Notify(NotifyEvent& rNEvt); + virtual void Resize(); + virtual long Notify(NotifyEvent& rNEvt); private: @@ -119,32 +119,32 @@ private: friend class SdNavigatorControllerItem; friend class SdPageNameControllerItem; - ToolBox maToolbox; - SdPageObjsTLB maTlbObjects; - ListBox maLbDocs; - - ::sd::NavigatorChildWindow* mpChildWinContext; - Size maSize; - Size maMinSize; -// Size maFltWinSize; - BOOL mbDocImported; - String maDropFileName; - NavigatorDragType meDragType; - List* mpDocList; - SfxBindings* mpBindings; - SdNavigatorControllerItem* mpNavigatorCtrlItem; - SdPageNameControllerItem* mpPageNameCtrlItem; - - ImageList maImageList; - ImageList maImageListH; + ToolBox maToolbox; + SdPageObjsTLB maTlbObjects; + ListBox maLbDocs; + + ::sd::NavigatorChildWindow* mpChildWinContext; + Size maSize; + Size maMinSize; +// Size maFltWinSize; + BOOL mbDocImported; + String maDropFileName; + NavigatorDragType meDragType; + List* mpDocList; + SfxBindings* mpBindings; + SdNavigatorControllerItem* mpNavigatorCtrlItem; + SdPageNameControllerItem* mpPageNameCtrlItem; + + ImageList maImageList; + ImageList maImageListH; /** This flag controls whether all shapes or only the named shapes are shown. */ bool mbShowAllShapes; - USHORT GetDragTypeSdResId( NavigatorDragType eDT, BOOL bImage = FALSE ); - NavDocInfo* GetDocInfo(); + USHORT GetDragTypeSdResId( NavigatorDragType eDT, BOOL bImage = FALSE ); + NavDocInfo* GetDocInfo(); DECL_LINK( GetFocusObjectsHdl, void * ); DECL_LINK( SelectToolboxHdl, void * ); @@ -156,9 +156,9 @@ private: DECL_LINK( MenuSelectHdl, Menu * ); DECL_LINK( ShapeFilterCallback, Menu * ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - void SetDragImage(); - void ApplyImageList(); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + void SetDragImage(); + void ApplyImageList(); }; diff --git a/sd/source/ui/inc/optdlg.hrc b/sd/source/ui/inc/optdlg.hrc index 6c50299c5ab2..8f8e781d4136 100644 --- a/sd/source/ui/inc/optdlg.hrc +++ b/sd/source/ui/inc/optdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,11 +24,11 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define TAB_DLG_IMPRESS_OPTIONS 842 -#define TAB_DLG_DRAW_OPTIONS 843 +#define TAB_DLG_IMPRESS_OPTIONS 842 +#define TAB_DLG_DRAW_OPTIONS 843 -#define TP_GENERAL 1 +#define TP_GENERAL 1 #define TP_SAVE 2 #define TP_PATH 3 -#define TP_PRINT 4 +#define TP_PRINT 4 diff --git a/sd/source/ui/inc/optdlg.hxx b/sd/source/ui/inc/optdlg.hxx index 5a2644bd186a..5e7a94745a94 100644 --- a/sd/source/ui/inc/optdlg.hxx +++ b/sd/source/ui/inc/optdlg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ class SfxItemSet; class SdOptionsDlg : public SfxTabDialog { private: - DocumentType meDocType; + DocumentType meDocType; public: SdOptionsDlg( Window* pParent, const SfxItemSet& rInAttrs, @@ -46,8 +46,8 @@ public: protected: - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); -// virtual SfxItemSet* CreateInputItemSet( USHORT nPageId ); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); +// virtual SfxItemSet* CreateInputItemSet( USHORT nPageId ); }; diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index 13088dfc64cb..034358530765 100755 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,16 +40,16 @@ // - Option ranges - // ----------------- -#define SD_OPTIONS_NONE 0x00000000 -#define SD_OPTIONS_ALL 0xffffffff +#define SD_OPTIONS_NONE 0x00000000 +#define SD_OPTIONS_ALL 0xffffffff -#define SD_OPTIONS_LAYOUT 0x00000001 +#define SD_OPTIONS_LAYOUT 0x00000001 #define SD_OPTIONS_CONTENTS 0x00000002 -#define SD_OPTIONS_MISC 0x00000004 -#define SD_OPTIONS_SNAP 0x00000008 -#define SD_OPTIONS_ZOOM 0x00000010 -#define SD_OPTIONS_GRID 0x00000020 -#define SD_OPTIONS_PRINT 0x00000040 +#define SD_OPTIONS_MISC 0x00000004 +#define SD_OPTIONS_SNAP 0x00000008 +#define SD_OPTIONS_ZOOM 0x00000010 +#define SD_OPTIONS_GRID 0x00000020 +#define SD_OPTIONS_PRINT 0x00000040 // ------------ // - Forwards - @@ -73,22 +73,22 @@ class SD_DLLPUBLIC SdOptionsItem : public ::utl::ConfigItem private: - const SdOptionsGeneric& mrParent; - + const SdOptionsGeneric& mrParent; + public: SdOptionsItem( const SdOptionsGeneric& rParent, const ::rtl::OUString rSubTree ); virtual ~SdOptionsItem(); - virtual void Commit(); + virtual void Commit(); virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetProperties( + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetProperties( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames ); sal_Bool PutProperties( const com::sun::star::uno::Sequence< rtl::OUString >& rNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any>& rValues ); - void SetModified(); + void SetModified(); }; // -------------------- @@ -101,40 +101,40 @@ friend class SdOptionsItem; private: - ::rtl::OUString maSubTree; - SdOptionsItem* mpCfgItem; - USHORT mnConfigId; - BOOL mbInit : 1; - BOOL mbEnableModify : 1; + ::rtl::OUString maSubTree; + SdOptionsItem* mpCfgItem; + USHORT mnConfigId; + BOOL mbInit : 1; + BOOL mbEnableModify : 1; SD_DLLPRIVATE void Commit( SdOptionsItem& rCfgItem ) const; SD_DLLPRIVATE ::com::sun::star::uno::Sequence< ::rtl::OUString > GetPropertyNames() const; -protected: - - void Init() const; - void OptionsChanged() { if( mpCfgItem && mbEnableModify ) mpCfgItem->SetModified(); } +protected: + + void Init() const; + void OptionsChanged() { if( mpCfgItem && mbEnableModify ) mpCfgItem->SetModified(); } protected: - - virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const = 0; - virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues ) = 0; - virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const = 0; + + virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const = 0; + virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues ) = 0; + virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const = 0; public: SdOptionsGeneric( USHORT nConfigId, const ::rtl::OUString& rSubTree ); virtual ~SdOptionsGeneric(); - const ::rtl::OUString& GetSubTree() const { return maSubTree; } - USHORT GetConfigId() const { return mnConfigId; } + const ::rtl::OUString& GetSubTree() const { return maSubTree; } + USHORT GetConfigId() const { return mnConfigId; } - void EnableModify( BOOL bModify ) { mbEnableModify = bModify; } + void EnableModify( BOOL bModify ) { mbEnableModify = bModify; } - void Store(); + void Store(); - static bool isMetricSystem(); + static bool isMetricSystem(); }; // ------------------- @@ -145,13 +145,13 @@ class SD_DLLPUBLIC SdOptionsLayout : public SdOptionsGeneric { private: - BOOL bRuler : 1; // Layout/Display/Ruler - BOOL bMoveOutline : 1; // Layout/Display/Contur - BOOL bDragStripes : 1; // Layout/Display/Guide - BOOL bHandlesBezier : 1; // Layout/Display/Bezier - BOOL bHelplines : 1; // Layout/Display/Helpline - UINT16 nMetric; // Layout/Other/MeasureUnit - UINT16 nDefTab; // Layout/Other/TabStop + BOOL bRuler : 1; // Layout/Display/Ruler + BOOL bMoveOutline : 1; // Layout/Display/Contur + BOOL bDragStripes : 1; // Layout/Display/Guide + BOOL bHandlesBezier : 1; // Layout/Display/Bezier + BOOL bHelplines : 1; // Layout/Display/Helpline + UINT16 nMetric; // Layout/Other/MeasureUnit + UINT16 nDefTab; // Layout/Other/TabStop protected: @@ -163,40 +163,40 @@ public: SdOptionsLayout( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsLayout() {} - BOOL operator==( const SdOptionsLayout& rOpt ) const; + BOOL operator==( const SdOptionsLayout& rOpt ) const; - BOOL IsRulerVisible() const { Init(); return (BOOL) bRuler; } - BOOL IsMoveOutline() const { Init(); return (BOOL) bMoveOutline; } - BOOL IsDragStripes() const { Init(); return (BOOL) bDragStripes; } - BOOL IsHandlesBezier() const { Init(); return (BOOL) bHandlesBezier; } - BOOL IsHelplines() const { Init(); return (BOOL) bHelplines; } + BOOL IsRulerVisible() const { Init(); return (BOOL) bRuler; } + BOOL IsMoveOutline() const { Init(); return (BOOL) bMoveOutline; } + BOOL IsDragStripes() const { Init(); return (BOOL) bDragStripes; } + BOOL IsHandlesBezier() const { Init(); return (BOOL) bHandlesBezier; } + BOOL IsHelplines() const { Init(); return (BOOL) bHelplines; } UINT16 GetMetric() const { Init(); return( ( 0xffff == nMetric ) ? (UINT16)SfxModule::GetCurrentFieldUnit() : nMetric ); } - UINT16 GetDefTab() const { Init(); return nDefTab; } - - void SetRulerVisible( BOOL bOn = TRUE ) { if( bRuler != bOn ) { OptionsChanged(); bRuler = bOn; } } - void SetMoveOutline( BOOL bOn = TRUE ) { if( bMoveOutline != bOn ) { OptionsChanged(); bMoveOutline = bOn; } } - void SetDragStripes( BOOL bOn = TRUE ) { if( bDragStripes != bOn ) { OptionsChanged(); bDragStripes = bOn; } } - void SetHandlesBezier( BOOL bOn = TRUE ) { if( bHandlesBezier != bOn ) { OptionsChanged(); bHandlesBezier = bOn; } } - void SetHelplines( BOOL bOn = TRUE ) { if( bHelplines != bOn ) { OptionsChanged(); bHelplines = bOn; } } - void SetMetric( UINT16 nInMetric ) { if( nMetric != nInMetric ) { OptionsChanged(); nMetric = nInMetric; } } - void SetDefTab( UINT16 nTab ) { if( nDefTab != nTab ) { OptionsChanged(); nDefTab = nTab; } } + UINT16 GetDefTab() const { Init(); return nDefTab; } + + void SetRulerVisible( BOOL bOn = TRUE ) { if( bRuler != bOn ) { OptionsChanged(); bRuler = bOn; } } + void SetMoveOutline( BOOL bOn = TRUE ) { if( bMoveOutline != bOn ) { OptionsChanged(); bMoveOutline = bOn; } } + void SetDragStripes( BOOL bOn = TRUE ) { if( bDragStripes != bOn ) { OptionsChanged(); bDragStripes = bOn; } } + void SetHandlesBezier( BOOL bOn = TRUE ) { if( bHandlesBezier != bOn ) { OptionsChanged(); bHandlesBezier = bOn; } } + void SetHelplines( BOOL bOn = TRUE ) { if( bHelplines != bOn ) { OptionsChanged(); bHelplines = bOn; } } + void SetMetric( UINT16 nInMetric ) { if( nMetric != nInMetric ) { OptionsChanged(); nMetric = nInMetric; } } + void SetDefTab( UINT16 nTab ) { if( nDefTab != nTab ) { OptionsChanged(); nDefTab = nTab; } } }; // ----------------------------------------------------------------------------- -class SD_DLLPUBLIC SdOptionsLayoutItem : public SfxPoolItem +class SD_DLLPUBLIC SdOptionsLayoutItem : public SfxPoolItem { public: - + SdOptionsLayoutItem( USHORT nWhich); SdOptionsLayoutItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; - - void SetOptions( SdOptions* pOpts ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const; + + void SetOptions( SdOptions* pOpts ) const; - SdOptionsLayout& GetOptionsLayout() { return maOptionsLayout; } + SdOptionsLayout& GetOptionsLayout() { return maOptionsLayout; } private: SdOptionsLayout maOptionsLayout; }; @@ -219,7 +219,7 @@ public: SdOptionsContents( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsContents() {} - BOOL operator==( const SdOptionsContents& rOpt ) const; + BOOL operator==( const SdOptionsContents& rOpt ) const; }; // ----------------------------------------------------------------------------- @@ -230,14 +230,14 @@ public: SdOptionsContentsItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const; + + void SetOptions( SdOptions* pOpts ) const; - void SetOptions( SdOptions* pOpts ) const; - - SdOptionsContents& GetOptionsContents() { return maOptionsContents; } + SdOptionsContents& GetOptionsContents() { return maOptionsContents; } private: - SdOptionsContents maOptionsContents; + SdOptionsContents maOptionsContents; }; // ----------------- @@ -249,42 +249,42 @@ class SD_DLLPUBLIC SdOptionsMisc : public SdOptionsGeneric private: // #97016# - ULONG nDefaultObjectSizeWidth; - ULONG nDefaultObjectSizeHeight; - - BOOL bStartWithTemplate : 1; // Misc/NewDoc/AutoPilot - BOOL bMarkedHitMovesAlways : 1; // Misc/ObjectMoveable - BOOL bMoveOnlyDragging : 1; // Currently, not in use !!! - BOOL bCrookNoContortion : 1; // Misc/NoDistort - BOOL bQuickEdit : 1; // Misc/TextObject/QuickEditing - BOOL bMasterPageCache : 1; // Misc/BackgroundCache - BOOL bDragWithCopy : 1; // Misc/CopyWhileMoving - BOOL bPickThrough : 1; // Misc/TextObject/Selectable - BOOL bBigHandles : 1; // Misc/BigHandles - BOOL bDoubleClickTextEdit : 1; // Misc/DclickTextedit - BOOL bClickChangeRotation : 1; // Misc/RotateClick - BOOL bStartWithActualPage : 1; // Misc/Start/CurrentPage - BOOL bSolidDragging : 1; // Misc/ModifyWithAttributes - BOOL bSolidMarkHdl : 1; // /Misc/SimpleHandles - BOOL bSummationOfParagraphs : 1; // misc/SummationOfParagraphs + ULONG nDefaultObjectSizeWidth; + ULONG nDefaultObjectSizeHeight; + + BOOL bStartWithTemplate : 1; // Misc/NewDoc/AutoPilot + BOOL bMarkedHitMovesAlways : 1; // Misc/ObjectMoveable + BOOL bMoveOnlyDragging : 1; // Currently, not in use !!! + BOOL bCrookNoContortion : 1; // Misc/NoDistort + BOOL bQuickEdit : 1; // Misc/TextObject/QuickEditing + BOOL bMasterPageCache : 1; // Misc/BackgroundCache + BOOL bDragWithCopy : 1; // Misc/CopyWhileMoving + BOOL bPickThrough : 1; // Misc/TextObject/Selectable + BOOL bBigHandles : 1; // Misc/BigHandles + BOOL bDoubleClickTextEdit : 1; // Misc/DclickTextedit + BOOL bClickChangeRotation : 1; // Misc/RotateClick + BOOL bStartWithActualPage : 1; // Misc/Start/CurrentPage + BOOL bSolidDragging : 1; // Misc/ModifyWithAttributes + BOOL bSolidMarkHdl : 1; // /Misc/SimpleHandles + BOOL bSummationOfParagraphs : 1; // misc/SummationOfParagraphs // #90356# - BOOL bShowUndoDeleteWarning : 1; // Misc/ShowUndoDeleteWarning + BOOL bShowUndoDeleteWarning : 1; // Misc/ShowUndoDeleteWarning // #i75315# - BOOL bSlideshowRespectZOrder : 1; // Misc/SlideshowRespectZOrder + BOOL bSlideshowRespectZOrder : 1; // Misc/SlideshowRespectZOrder BOOL bShowComments : 1; // Misc/ShowComments + + sal_Bool bPreviewNewEffects; + sal_Bool bPreviewChangedEffects; + sal_Bool bPreviewTransitions; - sal_Bool bPreviewNewEffects; - sal_Bool bPreviewChangedEffects; - sal_Bool bPreviewTransitions; - - sal_Int32 mnDisplay; + sal_Int32 mnDisplay; /** This value controls the device to use for formatting documents. The currently supported values are 0 for the current printer or 1 for the printer independent virtual device the can be retrieved from the modules. */ - USHORT mnPrinterIndependentLayout; // Misc/Compatibility/PrinterIndependentLayout + USHORT mnPrinterIndependentLayout; // Misc/Compatibility/PrinterIndependentLayout // Misc protected: @@ -298,76 +298,76 @@ public: SdOptionsMisc( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsMisc() {} - BOOL operator==( const SdOptionsMisc& rOpt ) const; - - BOOL IsStartWithTemplate() const { Init(); return (BOOL) bStartWithTemplate; } - BOOL IsMarkedHitMovesAlways() const { Init(); return (BOOL) bMarkedHitMovesAlways; } - BOOL IsMoveOnlyDragging() const { Init(); return (BOOL) bMoveOnlyDragging; } - BOOL IsCrookNoContortion() const { Init(); return (BOOL) bCrookNoContortion; } - BOOL IsQuickEdit() const { Init(); return (BOOL) bQuickEdit; } - BOOL IsMasterPagePaintCaching() const { Init(); return (BOOL) bMasterPageCache; } - BOOL IsDragWithCopy() const { Init(); return (BOOL) bDragWithCopy; } - BOOL IsPickThrough() const { Init(); return (BOOL) bPickThrough; } - BOOL IsBigHandles() const { Init(); return (BOOL) bBigHandles; } - BOOL IsDoubleClickTextEdit() const { Init(); return (BOOL) bDoubleClickTextEdit; } - BOOL IsClickChangeRotation() const { Init(); return (BOOL) bClickChangeRotation; } - BOOL IsStartWithActualPage() const { Init(); return (BOOL) bStartWithActualPage; } - BOOL IsSolidDragging() const { Init(); return (BOOL) bSolidDragging; } - BOOL IsSolidMarkHdl() const { Init(); return (BOOL) bSolidMarkHdl; } - BOOL IsSummationOfParagraphs() const { Init(); return bSummationOfParagraphs != 0; }; - + BOOL operator==( const SdOptionsMisc& rOpt ) const; + + BOOL IsStartWithTemplate() const { Init(); return (BOOL) bStartWithTemplate; } + BOOL IsMarkedHitMovesAlways() const { Init(); return (BOOL) bMarkedHitMovesAlways; } + BOOL IsMoveOnlyDragging() const { Init(); return (BOOL) bMoveOnlyDragging; } + BOOL IsCrookNoContortion() const { Init(); return (BOOL) bCrookNoContortion; } + BOOL IsQuickEdit() const { Init(); return (BOOL) bQuickEdit; } + BOOL IsMasterPagePaintCaching() const { Init(); return (BOOL) bMasterPageCache; } + BOOL IsDragWithCopy() const { Init(); return (BOOL) bDragWithCopy; } + BOOL IsPickThrough() const { Init(); return (BOOL) bPickThrough; } + BOOL IsBigHandles() const { Init(); return (BOOL) bBigHandles; } + BOOL IsDoubleClickTextEdit() const { Init(); return (BOOL) bDoubleClickTextEdit; } + BOOL IsClickChangeRotation() const { Init(); return (BOOL) bClickChangeRotation; } + BOOL IsStartWithActualPage() const { Init(); return (BOOL) bStartWithActualPage; } + BOOL IsSolidDragging() const { Init(); return (BOOL) bSolidDragging; } + BOOL IsSolidMarkHdl() const { Init(); return (BOOL) bSolidMarkHdl; } + BOOL IsSummationOfParagraphs() const { Init(); return bSummationOfParagraphs != 0; }; + /** Return the currently selected printer independent layout mode. - @return + @return Returns 1 for printer independent layout enabled and 0 when it is disabled. Other values are reserved for future use. */ - USHORT GetPrinterIndependentLayout() const { Init(); return mnPrinterIndependentLayout; }; + USHORT GetPrinterIndependentLayout() const { Init(); return mnPrinterIndependentLayout; }; // #90356# - BOOL IsShowUndoDeleteWarning() const { Init(); return (BOOL) bShowUndoDeleteWarning; } - BOOL IsSlideshowRespectZOrder() const { Init(); return (BOOL) bSlideshowRespectZOrder; } + BOOL IsShowUndoDeleteWarning() const { Init(); return (BOOL) bShowUndoDeleteWarning; } + BOOL IsSlideshowRespectZOrder() const { Init(); return (BOOL) bSlideshowRespectZOrder; } // #97016# - ULONG GetDefaultObjectSizeWidth() const { Init(); return nDefaultObjectSizeWidth; } - ULONG GetDefaultObjectSizeHeight() const { Init(); return nDefaultObjectSizeHeight; } - - sal_Bool IsPreviewNewEffects() const { Init(); return bPreviewNewEffects; } - sal_Bool IsPreviewChangedEffects() const { Init(); return bPreviewChangedEffects; } - sal_Bool IsPreviewTransitions() const { Init(); return bPreviewTransitions; } - - sal_Int32 GetDisplay() const { Init(); return mnDisplay; } - void SetDisplay( sal_Int32 nDisplay = 0 ) { if( mnDisplay != nDisplay ) { OptionsChanged(); mnDisplay = nDisplay; } } - - void SetStartWithTemplate( BOOL bOn = TRUE ) { if( bStartWithTemplate != bOn ) { OptionsChanged(); bStartWithTemplate = bOn; } } - void SetMarkedHitMovesAlways( BOOL bOn = TRUE ) { if( bMarkedHitMovesAlways != bOn ) { OptionsChanged(); bMarkedHitMovesAlways = bOn; } } - void SetMoveOnlyDragging( BOOL bOn = TRUE ) { if( bMoveOnlyDragging != bOn ) { OptionsChanged(); bMoveOnlyDragging = bOn; } } - void SetCrookNoContortion( BOOL bOn = TRUE ) { if( bCrookNoContortion != bOn ) { OptionsChanged(); bCrookNoContortion = bOn; } } - void SetQuickEdit( BOOL bOn = TRUE ) { if( bQuickEdit != bOn ) { OptionsChanged(); bQuickEdit = bOn; } } - void SetMasterPagePaintCaching( BOOL bOn = TRUE ) { if( bMasterPageCache != bOn ) { OptionsChanged(); bMasterPageCache = bOn; } } - void SetDragWithCopy( BOOL bOn = TRUE ) { if( bDragWithCopy != bOn ) { OptionsChanged(); bDragWithCopy = bOn; } } - void SetPickThrough( BOOL bOn = TRUE ) { if( bPickThrough != bOn ) { OptionsChanged(); bPickThrough = bOn; } } - void SetBigHandles( BOOL bOn = TRUE ) { if( bBigHandles != bOn ) { OptionsChanged(); bBigHandles = bOn; } } - void SetDoubleClickTextEdit( BOOL bOn = TRUE ) { if( bDoubleClickTextEdit != bOn ) { OptionsChanged(); bDoubleClickTextEdit = bOn; } } - void SetClickChangeRotation( BOOL bOn = TRUE ) { if( bClickChangeRotation != bOn ) { OptionsChanged(); bClickChangeRotation = bOn; } } - void SetStartWithActualPage( BOOL bOn = TRUE ) { if( bStartWithActualPage != bOn ) { OptionsChanged(); bStartWithActualPage = bOn; } } - void SetSummationOfParagraphs( BOOL bOn = TRUE ){ if ( bOn != bSummationOfParagraphs ) { OptionsChanged(); bSummationOfParagraphs = bOn; } } + ULONG GetDefaultObjectSizeWidth() const { Init(); return nDefaultObjectSizeWidth; } + ULONG GetDefaultObjectSizeHeight() const { Init(); return nDefaultObjectSizeHeight; } + + sal_Bool IsPreviewNewEffects() const { Init(); return bPreviewNewEffects; } + sal_Bool IsPreviewChangedEffects() const { Init(); return bPreviewChangedEffects; } + sal_Bool IsPreviewTransitions() const { Init(); return bPreviewTransitions; } + + sal_Int32 GetDisplay() const { Init(); return mnDisplay; } + void SetDisplay( sal_Int32 nDisplay = 0 ) { if( mnDisplay != nDisplay ) { OptionsChanged(); mnDisplay = nDisplay; } } + + void SetStartWithTemplate( BOOL bOn = TRUE ) { if( bStartWithTemplate != bOn ) { OptionsChanged(); bStartWithTemplate = bOn; } } + void SetMarkedHitMovesAlways( BOOL bOn = TRUE ) { if( bMarkedHitMovesAlways != bOn ) { OptionsChanged(); bMarkedHitMovesAlways = bOn; } } + void SetMoveOnlyDragging( BOOL bOn = TRUE ) { if( bMoveOnlyDragging != bOn ) { OptionsChanged(); bMoveOnlyDragging = bOn; } } + void SetCrookNoContortion( BOOL bOn = TRUE ) { if( bCrookNoContortion != bOn ) { OptionsChanged(); bCrookNoContortion = bOn; } } + void SetQuickEdit( BOOL bOn = TRUE ) { if( bQuickEdit != bOn ) { OptionsChanged(); bQuickEdit = bOn; } } + void SetMasterPagePaintCaching( BOOL bOn = TRUE ) { if( bMasterPageCache != bOn ) { OptionsChanged(); bMasterPageCache = bOn; } } + void SetDragWithCopy( BOOL bOn = TRUE ) { if( bDragWithCopy != bOn ) { OptionsChanged(); bDragWithCopy = bOn; } } + void SetPickThrough( BOOL bOn = TRUE ) { if( bPickThrough != bOn ) { OptionsChanged(); bPickThrough = bOn; } } + void SetBigHandles( BOOL bOn = TRUE ) { if( bBigHandles != bOn ) { OptionsChanged(); bBigHandles = bOn; } } + void SetDoubleClickTextEdit( BOOL bOn = TRUE ) { if( bDoubleClickTextEdit != bOn ) { OptionsChanged(); bDoubleClickTextEdit = bOn; } } + void SetClickChangeRotation( BOOL bOn = TRUE ) { if( bClickChangeRotation != bOn ) { OptionsChanged(); bClickChangeRotation = bOn; } } + void SetStartWithActualPage( BOOL bOn = TRUE ) { if( bStartWithActualPage != bOn ) { OptionsChanged(); bStartWithActualPage = bOn; } } + void SetSummationOfParagraphs( BOOL bOn = TRUE ){ if ( bOn != bSummationOfParagraphs ) { OptionsChanged(); bSummationOfParagraphs = bOn; } } /** Set the printer independent layout mode. - @param nOn + @param nOn The default value is to switch printer independent layout on, hence the parameters name. Use 0 for turning it off. Other values are reserved for future use. */ - void SetPrinterIndependentLayout (USHORT nOn = 1 ){ if ( nOn != mnPrinterIndependentLayout ) { OptionsChanged(); mnPrinterIndependentLayout = nOn; } } - void SetSolidDragging( BOOL bOn = TRUE ) { if( bSolidDragging != bOn ) { OptionsChanged(); bSolidDragging = bOn; } } - void SetSolidMarkHdl( BOOL bOn = TRUE ) { if( bSolidMarkHdl != bOn ) { OptionsChanged(); bSolidMarkHdl = bOn; } } + void SetPrinterIndependentLayout (USHORT nOn = 1 ){ if ( nOn != mnPrinterIndependentLayout ) { OptionsChanged(); mnPrinterIndependentLayout = nOn; } } + void SetSolidDragging( BOOL bOn = TRUE ) { if( bSolidDragging != bOn ) { OptionsChanged(); bSolidDragging = bOn; } } + void SetSolidMarkHdl( BOOL bOn = TRUE ) { if( bSolidMarkHdl != bOn ) { OptionsChanged(); bSolidMarkHdl = bOn; } } // #90356# - void SetShowUndoDeleteWarning( BOOL bOn = TRUE ) { if( bShowUndoDeleteWarning != bOn ) { OptionsChanged(); bShowUndoDeleteWarning = bOn; } } - void SetSlideshowRespectZOrder( BOOL bOn = TRUE ) { if( bSlideshowRespectZOrder != bOn ) { OptionsChanged(); bSlideshowRespectZOrder = bOn; } } + void SetShowUndoDeleteWarning( BOOL bOn = TRUE ) { if( bShowUndoDeleteWarning != bOn ) { OptionsChanged(); bShowUndoDeleteWarning = bOn; } } + void SetSlideshowRespectZOrder( BOOL bOn = TRUE ) { if( bSlideshowRespectZOrder != bOn ) { OptionsChanged(); bSlideshowRespectZOrder = bOn; } } // #97016# - void SetDefaultObjectSizeWidth( ULONG nWidth ) { if( nDefaultObjectSizeWidth != nWidth ) { OptionsChanged(); nDefaultObjectSizeWidth = nWidth; } } - void SetDefaultObjectSizeHeight( ULONG nHeight ) { if( nDefaultObjectSizeHeight != nHeight ) { OptionsChanged(); nDefaultObjectSizeHeight = nHeight; } } + void SetDefaultObjectSizeWidth( ULONG nWidth ) { if( nDefaultObjectSizeWidth != nWidth ) { OptionsChanged(); nDefaultObjectSizeWidth = nWidth; } } + void SetDefaultObjectSizeHeight( ULONG nHeight ) { if( nDefaultObjectSizeHeight != nHeight ) { OptionsChanged(); nDefaultObjectSizeHeight = nHeight; } } - void SetPreviewNewEffects( sal_Bool bOn ) { if( bPreviewNewEffects != bOn ) { OptionsChanged(); bPreviewNewEffects = bOn; } } - void SetPreviewChangedEffects( sal_Bool bOn ) { if( bPreviewChangedEffects != bOn ) { OptionsChanged(); bPreviewChangedEffects = bOn; } } - void SetPreviewTransitions( sal_Bool bOn ) { if( bPreviewTransitions != bOn ) { OptionsChanged(); bPreviewTransitions = bOn; } } + void SetPreviewNewEffects( sal_Bool bOn ) { if( bPreviewNewEffects != bOn ) { OptionsChanged(); bPreviewNewEffects = bOn; } } + void SetPreviewChangedEffects( sal_Bool bOn ) { if( bPreviewChangedEffects != bOn ) { OptionsChanged(); bPreviewChangedEffects = bOn; } } + void SetPreviewTransitions( sal_Bool bOn ) { if( bPreviewTransitions != bOn ) { OptionsChanged(); bPreviewTransitions = bOn; } } BOOL IsShowComments() const { Init(); return bShowComments; } void SetShowComments( BOOL bShow ) { if( bShowComments != bShow ) { OptionsChanged(); bShowComments = bShow; } } @@ -382,15 +382,15 @@ public: SdOptionsMiscItem( USHORT nWhich); SdOptionsMiscItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; - - void SetOptions( SdOptions* pOpts ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const; + + void SetOptions( SdOptions* pOpts ) const; - SdOptionsMisc& GetOptionsMisc() { return maOptionsMisc; } - const SdOptionsMisc& GetOptionsMisc() const { return maOptionsMisc; } + SdOptionsMisc& GetOptionsMisc() { return maOptionsMisc; } + const SdOptionsMisc& GetOptionsMisc() const { return maOptionsMisc; } private: - SdOptionsMisc maOptionsMisc; + SdOptionsMisc maOptionsMisc; }; // ----------------- @@ -401,16 +401,16 @@ class SD_DLLPUBLIC SdOptionsSnap : public SdOptionsGeneric { private: - BOOL bSnapHelplines : 1; // Snap/Object/SnapLine - BOOL bSnapBorder : 1; // Snap/Object/PageMargin - BOOL bSnapFrame : 1; // Snap/Object/ObjectFrame - BOOL bSnapPoints : 1; // Snap/Object/ObjectPoint - BOOL bOrtho : 1; // Snap/Position/CreatingMoving - BOOL bBigOrtho : 1; // Snap/Position/ExtendEdges - BOOL bRotate : 1; // Snap/Position/Rotating - INT16 nSnapArea; // Snap/Object/Range - INT16 nAngle; // Snap/Position/RotatingValue - INT16 nBezAngle; // Snap/Position/PointReduction + BOOL bSnapHelplines : 1; // Snap/Object/SnapLine + BOOL bSnapBorder : 1; // Snap/Object/PageMargin + BOOL bSnapFrame : 1; // Snap/Object/ObjectFrame + BOOL bSnapPoints : 1; // Snap/Object/ObjectPoint + BOOL bOrtho : 1; // Snap/Position/CreatingMoving + BOOL bBigOrtho : 1; // Snap/Position/ExtendEdges + BOOL bRotate : 1; // Snap/Position/Rotating + INT16 nSnapArea; // Snap/Object/Range + INT16 nAngle; // Snap/Position/RotatingValue + INT16 nBezAngle; // Snap/Position/PointReduction protected: @@ -419,33 +419,33 @@ protected: virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - + SdOptionsSnap( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsSnap() {} - BOOL operator==( const SdOptionsSnap& rOpt ) const; - - BOOL IsSnapHelplines() const { Init(); return (BOOL) bSnapHelplines; } - BOOL IsSnapBorder() const { Init(); return (BOOL) bSnapBorder; } - BOOL IsSnapFrame() const { Init(); return (BOOL) bSnapFrame; } - BOOL IsSnapPoints() const { Init(); return (BOOL) bSnapPoints; } - BOOL IsOrtho() const { Init(); return (BOOL) bOrtho; } - BOOL IsBigOrtho() const { Init(); return (BOOL) bBigOrtho; } - BOOL IsRotate() const { Init(); return (BOOL) bRotate; } - INT16 GetSnapArea() const { Init(); return nSnapArea; } - INT16 GetAngle() const { Init(); return nAngle; } - INT16 GetEliminatePolyPointLimitAngle() const { Init(); return nBezAngle; } - - void SetSnapHelplines( BOOL bOn = TRUE ) { if( bSnapHelplines != bOn ) { OptionsChanged(); bSnapHelplines = bOn; } } - void SetSnapBorder( BOOL bOn = TRUE ) { if( bSnapBorder != bOn ) { OptionsChanged(); bSnapBorder = bOn; } } - void SetSnapFrame( BOOL bOn = TRUE ) { if( bSnapFrame != bOn ) { OptionsChanged(); bSnapFrame = bOn; } } - void SetSnapPoints( BOOL bOn = TRUE ) { if( bSnapPoints != bOn ) { OptionsChanged(); bSnapPoints = bOn; } } - void SetOrtho( BOOL bOn = TRUE ) { if( bOrtho != bOn ) { OptionsChanged(); bOrtho = bOn; } } - void SetBigOrtho( BOOL bOn = TRUE ) { if( bBigOrtho != bOn ) { OptionsChanged(); bBigOrtho = bOn; } } - void SetRotate( BOOL bOn = TRUE ) { if( bRotate != bOn ) { OptionsChanged(); bRotate = bOn; } } - void SetSnapArea( INT16 nIn ) { if( nSnapArea != nIn ) { OptionsChanged(); nSnapArea = nIn; } } - void SetAngle( INT16 nIn ) { if( nAngle != nIn ) { OptionsChanged(); nAngle = nIn; } } - void SetEliminatePolyPointLimitAngle( INT16 nIn ) { if( nBezAngle != nIn ) { OptionsChanged(); nBezAngle = nIn; } } + BOOL operator==( const SdOptionsSnap& rOpt ) const; + + BOOL IsSnapHelplines() const { Init(); return (BOOL) bSnapHelplines; } + BOOL IsSnapBorder() const { Init(); return (BOOL) bSnapBorder; } + BOOL IsSnapFrame() const { Init(); return (BOOL) bSnapFrame; } + BOOL IsSnapPoints() const { Init(); return (BOOL) bSnapPoints; } + BOOL IsOrtho() const { Init(); return (BOOL) bOrtho; } + BOOL IsBigOrtho() const { Init(); return (BOOL) bBigOrtho; } + BOOL IsRotate() const { Init(); return (BOOL) bRotate; } + INT16 GetSnapArea() const { Init(); return nSnapArea; } + INT16 GetAngle() const { Init(); return nAngle; } + INT16 GetEliminatePolyPointLimitAngle() const { Init(); return nBezAngle; } + + void SetSnapHelplines( BOOL bOn = TRUE ) { if( bSnapHelplines != bOn ) { OptionsChanged(); bSnapHelplines = bOn; } } + void SetSnapBorder( BOOL bOn = TRUE ) { if( bSnapBorder != bOn ) { OptionsChanged(); bSnapBorder = bOn; } } + void SetSnapFrame( BOOL bOn = TRUE ) { if( bSnapFrame != bOn ) { OptionsChanged(); bSnapFrame = bOn; } } + void SetSnapPoints( BOOL bOn = TRUE ) { if( bSnapPoints != bOn ) { OptionsChanged(); bSnapPoints = bOn; } } + void SetOrtho( BOOL bOn = TRUE ) { if( bOrtho != bOn ) { OptionsChanged(); bOrtho = bOn; } } + void SetBigOrtho( BOOL bOn = TRUE ) { if( bBigOrtho != bOn ) { OptionsChanged(); bBigOrtho = bOn; } } + void SetRotate( BOOL bOn = TRUE ) { if( bRotate != bOn ) { OptionsChanged(); bRotate = bOn; } } + void SetSnapArea( INT16 nIn ) { if( nSnapArea != nIn ) { OptionsChanged(); nSnapArea = nIn; } } + void SetAngle( INT16 nIn ) { if( nAngle != nIn ) { OptionsChanged(); nAngle = nIn; } } + void SetEliminatePolyPointLimitAngle( INT16 nIn ) { if( nBezAngle != nIn ) { OptionsChanged(); nBezAngle = nIn; } } }; // ----------------------------------------------------------------------------- @@ -457,14 +457,14 @@ public: SdOptionsSnapItem( USHORT nWhich); SdOptionsSnapItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const; + + void SetOptions( SdOptions* pOpts ) const; - void SetOptions( SdOptions* pOpts ) const; - - SdOptionsSnap& GetOptionsSnap() { return maOptionsSnap; } + SdOptionsSnap& GetOptionsSnap() { return maOptionsSnap; } private: - SdOptionsSnap maOptionsSnap; + SdOptionsSnap maOptionsSnap; }; // ----------------- @@ -475,8 +475,8 @@ class SdOptionsZoom : public SdOptionsGeneric { private: - INT32 nX; // Zoom/ScaleX - INT32 nY; // Zoom/ScaleY + INT32 nX; // Zoom/ScaleX + INT32 nY; // Zoom/ScaleY protected: @@ -485,14 +485,14 @@ protected: virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - + SdOptionsZoom( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsZoom() {} - BOOL operator==( const SdOptionsZoom& rOpt ) const; + BOOL operator==( const SdOptionsZoom& rOpt ) const; - void GetScale( INT32& rX, INT32& rY ) const { Init(); rX = nX; rY = nY; } - void SetScale( INT32 nInX, INT32 nInY ) { if( nX != nInX || nY != nInY ) { OptionsChanged(); nX = nInX; nY = nInY; } } + void GetScale( INT32& rX, INT32& rY ) const { Init(); rX = nX; rY = nY; } + void SetScale( INT32 nInX, INT32 nInY ) { if( nX != nInX || nY != nInY ) { OptionsChanged(); nX = nInX; nY = nInY; } } }; // ----------------------------------------------------------------------------- @@ -514,30 +514,30 @@ public: SdOptionsGrid( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsGrid(); - void SetDefaults(); - BOOL operator==( const SdOptionsGrid& rOpt ) const; - - UINT32 GetFldDrawX() const { Init(); return SvxOptionsGrid::GetFldDrawX(); } - UINT32 GetFldDivisionX() const { Init(); return SvxOptionsGrid::GetFldDivisionX(); } - UINT32 GetFldDrawY() const { Init(); return SvxOptionsGrid::GetFldDrawY(); } - UINT32 GetFldDivisionY() const { Init(); return SvxOptionsGrid::GetFldDivisionY(); } - UINT32 GetFldSnapX() const { Init(); return SvxOptionsGrid::GetFldSnapX(); } - UINT32 GetFldSnapY() const { Init(); return SvxOptionsGrid::GetFldSnapY(); } - BOOL IsUseGridSnap() const { Init(); return SvxOptionsGrid::GetUseGridSnap(); } - BOOL IsSynchronize() const { Init(); return SvxOptionsGrid::GetSynchronize(); } - BOOL IsGridVisible() const { Init(); return SvxOptionsGrid::GetGridVisible(); } - BOOL IsEqualGrid() const { Init(); return SvxOptionsGrid::GetEqualGrid(); } - - void SetFldDrawX( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawX( nSet ); } } - void SetFldDivisionX( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionX( nSet ); } } - void SetFldDrawY( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawY( nSet ); } } - void SetFldDivisionY( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionY( nSet ); } } - void SetFldSnapX( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapX() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapX( nSet ); } } - void SetFldSnapY( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapY() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapY( nSet ); } } - void SetUseGridSnap( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetUseGridSnap() ) { OptionsChanged(); SvxOptionsGrid::SetUseGridSnap( bSet ); } } - void SetSynchronize( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetSynchronize() ) { OptionsChanged(); SvxOptionsGrid::SetSynchronize( bSet ); } } - void SetGridVisible( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetGridVisible() ) { OptionsChanged(); SvxOptionsGrid::SetGridVisible( bSet ); } } - void SetEqualGrid( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetEqualGrid() ) { OptionsChanged(); SvxOptionsGrid::SetEqualGrid( bSet ); } } + void SetDefaults(); + BOOL operator==( const SdOptionsGrid& rOpt ) const; + + UINT32 GetFldDrawX() const { Init(); return SvxOptionsGrid::GetFldDrawX(); } + UINT32 GetFldDivisionX() const { Init(); return SvxOptionsGrid::GetFldDivisionX(); } + UINT32 GetFldDrawY() const { Init(); return SvxOptionsGrid::GetFldDrawY(); } + UINT32 GetFldDivisionY() const { Init(); return SvxOptionsGrid::GetFldDivisionY(); } + UINT32 GetFldSnapX() const { Init(); return SvxOptionsGrid::GetFldSnapX(); } + UINT32 GetFldSnapY() const { Init(); return SvxOptionsGrid::GetFldSnapY(); } + BOOL IsUseGridSnap() const { Init(); return SvxOptionsGrid::GetUseGridSnap(); } + BOOL IsSynchronize() const { Init(); return SvxOptionsGrid::GetSynchronize(); } + BOOL IsGridVisible() const { Init(); return SvxOptionsGrid::GetGridVisible(); } + BOOL IsEqualGrid() const { Init(); return SvxOptionsGrid::GetEqualGrid(); } + + void SetFldDrawX( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawX( nSet ); } } + void SetFldDivisionX( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionX( nSet ); } } + void SetFldDrawY( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawY( nSet ); } } + void SetFldDivisionY( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionY( nSet ); } } + void SetFldSnapX( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapX() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapX( nSet ); } } + void SetFldSnapY( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapY() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapY( nSet ); } } + void SetUseGridSnap( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetUseGridSnap() ) { OptionsChanged(); SvxOptionsGrid::SetUseGridSnap( bSet ); } } + void SetSynchronize( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetSynchronize() ) { OptionsChanged(); SvxOptionsGrid::SetSynchronize( bSet ); } } + void SetGridVisible( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetGridVisible() ) { OptionsChanged(); SvxOptionsGrid::SetGridVisible( bSet ); } } + void SetEqualGrid( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetEqualGrid() ) { OptionsChanged(); SvxOptionsGrid::SetEqualGrid( bSet ); } } }; // ----------------------------------------------- @@ -548,7 +548,7 @@ class SdOptionsGridItem : public SvxGridItem public: SdOptionsGridItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - void SetOptions( SdOptions* pOpts ) const; + void SetOptions( SdOptions* pOpts ) const; }; // ------------------ @@ -559,27 +559,27 @@ class SD_DLLPUBLIC SdOptionsPrint : public SdOptionsGeneric { private: - BOOL bDraw : 1; // Print/Content/Drawing - BOOL bNotes : 1; // Print/Content/Note - BOOL bHandout : 1; // Print/Content/Handout - BOOL bOutline : 1; // Print/Content/Outline - BOOL bDate : 1; // Print/Other/Date - BOOL bTime : 1; // Print/Other/Time - BOOL bPagename : 1; // Print/Other/PageName - BOOL bHiddenPages : 1; // Print/Other/HiddenPage - BOOL bPagesize : 1; // Print/Page/PageSize - BOOL bPagetile : 1; // Print/Page/PageTile - BOOL bWarningPrinter : 1; // These flags you get - BOOL bWarningSize : 1; // from the common options, - BOOL bWarningOrientation : 1; // currently org.openoffice.Office.Common.xml (class OfaMiscCfg ; sfx2/misccfg.hxx ) - BOOL bBooklet : 1; // Print/Page/Booklet - BOOL bFront : 1; // Print/Page/BookletFront - BOOL bBack : 1; // Print/Page/BookletFront - BOOL bCutPage : 1; // NOT persistent !!! - BOOL bPaperbin : 1; // Print/Other/FromPrinterSetup - BOOL mbHandoutHorizontal : 1; // Order Page previews on Handout Pages horizontal - UINT16 mnHandoutPages; // Number of page previews on handout page (only 1/2/4/6/9 are supported) - UINT16 nQuality; // Print/Other/Quality + BOOL bDraw : 1; // Print/Content/Drawing + BOOL bNotes : 1; // Print/Content/Note + BOOL bHandout : 1; // Print/Content/Handout + BOOL bOutline : 1; // Print/Content/Outline + BOOL bDate : 1; // Print/Other/Date + BOOL bTime : 1; // Print/Other/Time + BOOL bPagename : 1; // Print/Other/PageName + BOOL bHiddenPages : 1; // Print/Other/HiddenPage + BOOL bPagesize : 1; // Print/Page/PageSize + BOOL bPagetile : 1; // Print/Page/PageTile + BOOL bWarningPrinter : 1; // These flags you get + BOOL bWarningSize : 1; // from the common options, + BOOL bWarningOrientation : 1; // currently org.openoffice.Office.Common.xml (class OfaMiscCfg ; sfx2/misccfg.hxx ) + BOOL bBooklet : 1; // Print/Page/Booklet + BOOL bFront : 1; // Print/Page/BookletFront + BOOL bBack : 1; // Print/Page/BookletFront + BOOL bCutPage : 1; // NOT persistent !!! + BOOL bPaperbin : 1; // Print/Other/FromPrinterSetup + BOOL mbHandoutHorizontal : 1; // Order Page previews on Handout Pages horizontal + UINT16 mnHandoutPages; // Number of page previews on handout page (only 1/2/4/6/9 are supported) + UINT16 nQuality; // Print/Other/Quality protected: @@ -588,55 +588,55 @@ protected: virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - + SdOptionsPrint( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsPrint() {} - BOOL operator==( const SdOptionsPrint& rOpt ) const; - - BOOL IsDraw() const { Init(); return (BOOL) bDraw; } - BOOL IsNotes() const { Init(); return (BOOL) bNotes; } - BOOL IsHandout() const { Init(); return (BOOL) bHandout; } - BOOL IsOutline() const { Init(); return (BOOL) bOutline; } - BOOL IsDate() const { Init(); return (BOOL) bDate; } - BOOL IsTime() const { Init(); return (BOOL) bTime; } - BOOL IsPagename() const { Init(); return (BOOL) bPagename; } - BOOL IsHiddenPages() const { Init(); return (BOOL) bHiddenPages; } - BOOL IsPagesize() const { Init(); return (BOOL) bPagesize; } - BOOL IsPagetile() const { Init(); return (BOOL) bPagetile; } - BOOL IsWarningPrinter() const { Init(); return (BOOL) bWarningPrinter; } - BOOL IsWarningSize() const { Init(); return (BOOL) bWarningSize; } - BOOL IsWarningOrientation() const { Init(); return (BOOL) bWarningOrientation; } - BOOL IsBooklet() const { Init(); return (BOOL) bBooklet; } - BOOL IsFrontPage() const { Init(); return (BOOL) bFront; } - BOOL IsBackPage() const { Init(); return (BOOL) bBack; } - BOOL IsCutPage() const { Init(); return (BOOL) bCutPage; } - BOOL IsPaperbin() const { Init(); return (BOOL) bPaperbin; } - UINT16 GetOutputQuality() const { Init(); return nQuality; } - BOOL IsHandoutHorizontal() const { Init(); return mbHandoutHorizontal; } - UINT16 GetHandoutPages() const { Init(); return mnHandoutPages; } - - void SetDraw( BOOL bOn = TRUE ) { if( bDraw != bOn ) { OptionsChanged(); bDraw = bOn; } } - void SetNotes( BOOL bOn = TRUE ) { if( bNotes != bOn ) { OptionsChanged(); bNotes = bOn; } } - void SetHandout( BOOL bOn = TRUE ) { if( bHandout != bOn ) { OptionsChanged(); bHandout = bOn; } } - void SetOutline( BOOL bOn = TRUE ) { if( bOutline != bOn ) { OptionsChanged(); bOutline = bOn; } } - void SetDate( BOOL bOn = TRUE ) { if( bDate != bOn ) { OptionsChanged(); bDate = bOn; } } - void SetTime( BOOL bOn = TRUE ) { if( bTime != bOn ) { OptionsChanged(); bTime = bOn; } } - void SetPagename( BOOL bOn = TRUE ) { if( bPagename != bOn ) { OptionsChanged(); bPagename = bOn; } } - void SetHiddenPages( BOOL bOn = TRUE ) { if( bHiddenPages != bOn ) { OptionsChanged(); bHiddenPages = bOn; } } - void SetPagesize( BOOL bOn = TRUE ) { if( bPagesize != bOn ) { OptionsChanged(); bPagesize = bOn; } } - void SetPagetile( BOOL bOn = TRUE ) { if( bPagetile != bOn ) { OptionsChanged(); bPagetile = bOn; } } - void SetWarningPrinter( BOOL bOn = TRUE ) { if( bWarningPrinter != bOn ) { OptionsChanged(); bWarningPrinter = bOn; } } - void SetWarningSize( BOOL bOn = TRUE ) { if( bWarningSize != bOn ) { OptionsChanged(); bWarningSize = bOn; } } - void SetWarningOrientation( BOOL bOn = TRUE ) { if( bWarningOrientation != bOn ) { OptionsChanged(); bWarningOrientation = bOn; } } - void SetBooklet( BOOL bOn = TRUE ) { if( bBooklet != bOn ) { OptionsChanged(); bBooklet = bOn; } } - void SetFrontPage( BOOL bOn = TRUE ) { if( bFront != bOn ) { OptionsChanged(); bFront = bOn; } } - void SetBackPage( BOOL bOn = TRUE ) { if( bBack != bOn ) { OptionsChanged(); bBack = bOn; } } - void SetCutPage( BOOL bOn = TRUE ) { if( bCutPage != bOn ) { OptionsChanged(); bCutPage = bOn; } } - void SetPaperbin( BOOL bOn = TRUE ) { if( bPaperbin != bOn ) { OptionsChanged(); bPaperbin = bOn; } } - void SetOutputQuality( UINT16 nInQuality ) { if( nQuality != nInQuality ) { OptionsChanged(); nQuality = nInQuality; } } - void SetHandoutHorizontal( BOOL bHandoutHorizontal ) { if( mbHandoutHorizontal != bHandoutHorizontal ) { OptionsChanged(); mbHandoutHorizontal = bHandoutHorizontal; } } - void SetHandoutPages( UINT16 nHandoutPages ) { if( nHandoutPages != mnHandoutPages ) { OptionsChanged(); mnHandoutPages = nHandoutPages; } } + BOOL operator==( const SdOptionsPrint& rOpt ) const; + + BOOL IsDraw() const { Init(); return (BOOL) bDraw; } + BOOL IsNotes() const { Init(); return (BOOL) bNotes; } + BOOL IsHandout() const { Init(); return (BOOL) bHandout; } + BOOL IsOutline() const { Init(); return (BOOL) bOutline; } + BOOL IsDate() const { Init(); return (BOOL) bDate; } + BOOL IsTime() const { Init(); return (BOOL) bTime; } + BOOL IsPagename() const { Init(); return (BOOL) bPagename; } + BOOL IsHiddenPages() const { Init(); return (BOOL) bHiddenPages; } + BOOL IsPagesize() const { Init(); return (BOOL) bPagesize; } + BOOL IsPagetile() const { Init(); return (BOOL) bPagetile; } + BOOL IsWarningPrinter() const { Init(); return (BOOL) bWarningPrinter; } + BOOL IsWarningSize() const { Init(); return (BOOL) bWarningSize; } + BOOL IsWarningOrientation() const { Init(); return (BOOL) bWarningOrientation; } + BOOL IsBooklet() const { Init(); return (BOOL) bBooklet; } + BOOL IsFrontPage() const { Init(); return (BOOL) bFront; } + BOOL IsBackPage() const { Init(); return (BOOL) bBack; } + BOOL IsCutPage() const { Init(); return (BOOL) bCutPage; } + BOOL IsPaperbin() const { Init(); return (BOOL) bPaperbin; } + UINT16 GetOutputQuality() const { Init(); return nQuality; } + BOOL IsHandoutHorizontal() const { Init(); return mbHandoutHorizontal; } + UINT16 GetHandoutPages() const { Init(); return mnHandoutPages; } + + void SetDraw( BOOL bOn = TRUE ) { if( bDraw != bOn ) { OptionsChanged(); bDraw = bOn; } } + void SetNotes( BOOL bOn = TRUE ) { if( bNotes != bOn ) { OptionsChanged(); bNotes = bOn; } } + void SetHandout( BOOL bOn = TRUE ) { if( bHandout != bOn ) { OptionsChanged(); bHandout = bOn; } } + void SetOutline( BOOL bOn = TRUE ) { if( bOutline != bOn ) { OptionsChanged(); bOutline = bOn; } } + void SetDate( BOOL bOn = TRUE ) { if( bDate != bOn ) { OptionsChanged(); bDate = bOn; } } + void SetTime( BOOL bOn = TRUE ) { if( bTime != bOn ) { OptionsChanged(); bTime = bOn; } } + void SetPagename( BOOL bOn = TRUE ) { if( bPagename != bOn ) { OptionsChanged(); bPagename = bOn; } } + void SetHiddenPages( BOOL bOn = TRUE ) { if( bHiddenPages != bOn ) { OptionsChanged(); bHiddenPages = bOn; } } + void SetPagesize( BOOL bOn = TRUE ) { if( bPagesize != bOn ) { OptionsChanged(); bPagesize = bOn; } } + void SetPagetile( BOOL bOn = TRUE ) { if( bPagetile != bOn ) { OptionsChanged(); bPagetile = bOn; } } + void SetWarningPrinter( BOOL bOn = TRUE ) { if( bWarningPrinter != bOn ) { OptionsChanged(); bWarningPrinter = bOn; } } + void SetWarningSize( BOOL bOn = TRUE ) { if( bWarningSize != bOn ) { OptionsChanged(); bWarningSize = bOn; } } + void SetWarningOrientation( BOOL bOn = TRUE ) { if( bWarningOrientation != bOn ) { OptionsChanged(); bWarningOrientation = bOn; } } + void SetBooklet( BOOL bOn = TRUE ) { if( bBooklet != bOn ) { OptionsChanged(); bBooklet = bOn; } } + void SetFrontPage( BOOL bOn = TRUE ) { if( bFront != bOn ) { OptionsChanged(); bFront = bOn; } } + void SetBackPage( BOOL bOn = TRUE ) { if( bBack != bOn ) { OptionsChanged(); bBack = bOn; } } + void SetCutPage( BOOL bOn = TRUE ) { if( bCutPage != bOn ) { OptionsChanged(); bCutPage = bOn; } } + void SetPaperbin( BOOL bOn = TRUE ) { if( bPaperbin != bOn ) { OptionsChanged(); bPaperbin = bOn; } } + void SetOutputQuality( UINT16 nInQuality ) { if( nQuality != nInQuality ) { OptionsChanged(); nQuality = nInQuality; } } + void SetHandoutHorizontal( BOOL bHandoutHorizontal ) { if( mbHandoutHorizontal != bHandoutHorizontal ) { OptionsChanged(); mbHandoutHorizontal = bHandoutHorizontal; } } + void SetHandoutPages( UINT16 nHandoutPages ) { if( nHandoutPages != mnHandoutPages ) { OptionsChanged(); mnHandoutPages = nHandoutPages; } } }; // ----------------------------------------------------------------------------- @@ -644,19 +644,19 @@ public: class SD_DLLPUBLIC SdOptionsPrintItem : public SfxPoolItem { public: - + SdOptionsPrintItem( USHORT nWhich); SdOptionsPrintItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const; + + void SetOptions( SdOptions* pOpts ) const; - void SetOptions( SdOptions* pOpts ) const; - - SdOptionsPrint& GetOptionsPrint() { return maOptionsPrint; } - const SdOptionsPrint& GetOptionsPrint() const { return maOptionsPrint; } + SdOptionsPrint& GetOptionsPrint() { return maOptionsPrint; } + const SdOptionsPrint& GetOptionsPrint() const { return maOptionsPrint; } private: - SdOptionsPrint maOptionsPrint; + SdOptionsPrint maOptionsPrint; }; // ------------- @@ -666,14 +666,14 @@ private: class SdOptions : public SdOptionsLayout, public SdOptionsContents, public SdOptionsMisc, public SdOptionsSnap, public SdOptionsZoom, public SdOptionsGrid, - public SdOptionsPrint + public SdOptionsPrint { public: - + SdOptions( USHORT nConfigId ); virtual ~SdOptions(); - void StoreConfig( ULONG nOptionRange = SD_OPTIONS_ALL ); + void StoreConfig( ULONG nOptionRange = SD_OPTIONS_ALL ); }; #endif // _SD_OPTSITEM_HXX diff --git a/sd/source/ui/inc/packgdlg.hrc b/sd/source/ui/inc/packgdlg.hrc index fe6546a7082b..df0b6375317c 100644 --- a/sd/source/ui/inc/packgdlg.hrc +++ b/sd/source/ui/inc/packgdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,22 +25,22 @@ * ************************************************************************/ -#define DLG_PACKNGO 939 +#define DLG_PACKNGO 939 -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 3 +#define BTN_OK 1 +#define BTN_CANCEL 2 +#define BTN_HELP 3 -#define GRP_DOKU 4 -#define CBX_UNLINK 5 -#define GRP_STORE 6 -#define GRP_SEPARATOR 7 -#define CBX_SPANNING 8 -#define LB_STOREMEDIUM 9 +#define GRP_DOKU 4 +#define CBX_UNLINK 5 +#define GRP_STORE 6 +#define GRP_SEPARATOR 7 +#define CBX_SPANNING 8 +#define LB_STOREMEDIUM 9 -#define FT_DOKU_DESCR 10 -#define FT_STORE_DESCR 11 -#define FT_STOREMEDIUM 12 +#define FT_DOKU_DESCR 10 +#define FT_STORE_DESCR 11 +#define FT_STOREMEDIUM 12 -#define MTR_USERDEFINED 13 +#define MTR_USERDEFINED 13 diff --git a/sd/source/ui/inc/paragr.hrc b/sd/source/ui/inc/paragr.hrc index 1510325ce2e1..96815fb6188a 100644 --- a/sd/source/ui/inc/paragr.hrc +++ b/sd/source/ui/inc/paragr.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define TAB_PARAGRAPH 20620 +#define TAB_PARAGRAPH 20620 #define CB_NEW_START 1 #define CB_NUMBER_NEW_START 2 diff --git a/sd/source/ui/inc/paragr.hxx b/sd/source/ui/inc/paragr.hxx index 254294833eaf..89333d8d787f 100644 --- a/sd/source/ui/inc/paragr.hxx +++ b/sd/source/ui/inc/paragr.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ class SdParagraphDlg : public SfxTabDialog { private: - const SfxItemSet& rOutAttrs; + const SfxItemSet& rOutAttrs; public: SdParagraphDlg( Window* pParent, const SfxItemSet* pAttr ); diff --git a/sd/source/ui/inc/pgjump.hxx b/sd/source/ui/inc/pgjump.hxx index a900c89aadc0..ba8821a6cc15 100644 --- a/sd/source/ui/inc/pgjump.hxx +++ b/sd/source/ui/inc/pgjump.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/present.hrc b/sd/source/ui/inc/present.hrc index fc4d3b68d9f4..6ad233269b6c 100644 --- a/sd/source/ui/inc/present.hrc +++ b/sd/source/ui/inc/present.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,7 @@ ************************************************************************/ #include <sfx2/sfx.hrc> -#define DLG_START_PRESENTATION RID_APP_START+3 +#define DLG_START_PRESENTATION RID_APP_START+3 #define BTN_OK 1 #define BTN_CANCEL 1 #define BTN_HELP 1 @@ -39,9 +39,9 @@ #define LB_CUSTOMSHOW 2 #define GRP_KIND 2 -#define RBT_STANDARD 4 -#define RBT_WINDOW 5 -#define RBT_AUTO 6 +#define RBT_STANDARD 4 +#define RBT_WINDOW 5 +#define RBT_AUTO 6 #define FT_PAUSE 1 #define TMF_PAUSE 1 #define CBX_AUTOLOGO 1 diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx index 8350bc114de5..bb26c2c03532 100644 --- a/sd/source/ui/inc/present.hxx +++ b/sd/source/ui/inc/present.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,50 +56,50 @@ class SdStartPresentationDlg : public ModalDialog { private: - FixedLine aGrpRange; - RadioButton aRbtAll; - RadioButton aRbtAtDia; - RadioButton aRbtCustomshow; - ListBox aLbDias; - ListBox aLbCustomshow; - - FixedLine aGrpKind; - RadioButton aRbtStandard; - RadioButton aRbtWindow; - RadioButton aRbtAuto; - TimeField aTmfPause; - CheckBox aCbxAutoLogo; - - FixedLine aGrpOptions; - CheckBox aCbxManuel; - CheckBox aCbxMousepointer; - CheckBox aCbxPen; - CheckBox aCbxNavigator; + FixedLine aGrpRange; + RadioButton aRbtAll; + RadioButton aRbtAtDia; + RadioButton aRbtCustomshow; + ListBox aLbDias; + ListBox aLbCustomshow; + + FixedLine aGrpKind; + RadioButton aRbtStandard; + RadioButton aRbtWindow; + RadioButton aRbtAuto; + TimeField aTmfPause; + CheckBox aCbxAutoLogo; + + FixedLine aGrpOptions; + CheckBox aCbxManuel; + CheckBox aCbxMousepointer; + CheckBox aCbxPen; + CheckBox aCbxNavigator; CheckBox aCbxAnimationAllowed; CheckBox aCbxChangePage; - CheckBox aCbxAlwaysOnTop; + CheckBox aCbxAlwaysOnTop; - FixedLine maGrpMonitor; - FixedText maFtMonitor; - ListBox maLBMonitor; + FixedLine maGrpMonitor; + FixedText maFtMonitor; + ListBox maLBMonitor; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; - List* pCustomShowList; - const SfxItemSet& rOutAttrs; - sal_Int32 mnMonitors; + List* pCustomShowList; + const SfxItemSet& rOutAttrs; + sal_Int32 mnMonitors; - String msPrimaryMonitor; - String msMonitor; - String msAllMonitors; + String msPrimaryMonitor; + String msMonitor; + String msAllMonitors; DECL_LINK( ChangeRangeHdl, void * ); DECL_LINK( ClickWindowPresentationHdl, void * ); DECL_LINK( ChangePauseHdl, void * ); - void InitMonitorSettings(); + void InitMonitorSettings(); public: SdStartPresentationDlg( Window* pWindow, @@ -107,7 +107,7 @@ public: List& rPageNames, List* pCSList ); - void GetAttr( SfxItemSet& rOutAttrs ); + void GetAttr( SfxItemSet& rOutAttrs ); }; #endif // _SD_PRESENT_HXX_ diff --git a/sd/source/ui/inc/preview.hrc b/sd/source/ui/inc/preview.hrc index dd9f8756161a..b40f5b654b57 100644 --- a/sd/source/ui/inc/preview.hrc +++ b/sd/source/ui/inc/preview.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/prltempl.hrc b/sd/source/ui/inc/prltempl.hrc index 97529b7d9068..cb32af4dfee4 100644 --- a/sd/source/ui/inc/prltempl.hrc +++ b/sd/source/ui/inc/prltempl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,7 +25,7 @@ * ************************************************************************/ #include <sfx2/sfx.hrc> -/* #define TAB_PRES_LAYOUT_TEMPLATE RID_APP_START+??? */ -#define TAB_PRES_LAYOUT_TEMPLATE 844 -#define TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND 846 +/* #define TAB_PRES_LAYOUT_TEMPLATE RID_APP_START+??? */ +#define TAB_PRES_LAYOUT_TEMPLATE 844 +#define TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND 846 #define TAB_CONTROL 1 diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx index 33a7df247c7e..a705914ed532 100644 --- a/sd/source/ui/inc/prltempl.hxx +++ b/sd/source/ui/inc/prltempl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,29 +56,29 @@ class SfxStyleSheetBasePool; class SdPresLayoutTemplateDlg : public SfxTabDialog { private: - const SfxObjectShell* mpDocShell; + const SfxObjectShell* mpDocShell; - XColorTable* pColorTab; - XGradientList* pGradientList; - XHatchList* pHatchingList; - XBitmapList* pBitmapList; - XDashList* pDashList; - XLineEndList* pLineEndList; + XColorTable* pColorTab; + XGradientList* pGradientList; + XHatchList* pHatchingList; + XBitmapList* pBitmapList; + XDashList* pDashList; + XLineEndList* pLineEndList; - USHORT nPageType; - USHORT nDlgType; - USHORT nPos; + USHORT nPageType; + USHORT nDlgType; + USHORT nPos; - ChangeType nColorTableState; - ChangeType nBitmapListState; - ChangeType nGradientListState; - ChangeType nHatchingListState; - ChangeType nLineEndListState; - ChangeType nDashListState; + ChangeType nColorTableState; + ChangeType nBitmapListState; + ChangeType nGradientListState; + ChangeType nHatchingListState; + ChangeType nLineEndListState; + ChangeType nDashListState; - PresentationObjects ePO; + PresentationObjects ePO; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); // fuers Maping mit dem neuen SvxNumBulletItem SfxItemSet aInputSet; diff --git a/sd/source/ui/inc/prntopts.hrc b/sd/source/ui/inc/prntopts.hrc index 04d155f6730d..4698a1c5983f 100644 --- a/sd/source/ui/inc/prntopts.hrc +++ b/sd/source/ui/inc/prntopts.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,10 +47,10 @@ #define GRP_PRINT_EXT 3 #define GRP_PAPERBIN 4 -#define RBT_COLOR 5 -#define RBT_GRAYSCALE 6 -#define RBT_BLACKWHITE 7 -#define GRP_OUTPUT 5 +#define RBT_COLOR 5 +#define RBT_GRAYSCALE 6 +#define RBT_BLACKWHITE 7 +#define GRP_OUTPUT 5 #define FL_SEPARATOR1 6 #define FL_SEPARATOR2 7 diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index da9bc20c02d6..31ac861f6727 100755 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,34 +54,34 @@ class SdPrintOptions : public SfxTabPage private: FixedLine aGrpPrint; CheckBox aCbxDraw; - CheckBox aCbxNotes; - CheckBox aCbxHandout; - CheckBox aCbxOutline; + CheckBox aCbxNotes; + CheckBox aCbxHandout; + CheckBox aCbxOutline; FixedLine aSeparator1FL; FixedLine aGrpOutput; RadioButton aRbtColor; - RadioButton aRbtGrayscale; - RadioButton aRbtBlackWhite; + RadioButton aRbtGrayscale; + RadioButton aRbtBlackWhite; FixedLine aGrpPrintExt; CheckBox aCbxPagename; - CheckBox aCbxDate; - CheckBox aCbxTime; + CheckBox aCbxDate; + CheckBox aCbxTime; CheckBox aCbxHiddenPages; FixedLine aSeparator2FL; FixedLine aGrpPageoptions; RadioButton aRbtDefault; - RadioButton aRbtPagesize; - RadioButton aRbtPagetile; - RadioButton aRbtBooklet; - CheckBox aCbxFront; - CheckBox aCbxBack; + RadioButton aRbtPagesize; + RadioButton aRbtPagetile; + RadioButton aRbtBooklet; + CheckBox aCbxFront; + CheckBox aCbxBack; - CheckBox aCbxPaperbin; + CheckBox aCbxPaperbin; - const SfxItemSet& rOutAttrs; + const SfxItemSet& rOutAttrs; DECL_LINK( ClickCheckboxHdl, CheckBox * ); DECL_LINK( ClickBookletHdl, CheckBox * ); @@ -93,13 +93,13 @@ public: SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs); ~SdPrintOptions(); - static SfxTabPage* Create( Window*, const SfxItemSet& ); + static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); void SetDrawMode(); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet); }; diff --git a/sd/source/ui/inc/pubdlg.hrc b/sd/source/ui/inc/pubdlg.hrc index 8e3c1be2111d..1e54b3a5c125 100644 --- a/sd/source/ui/inc/pubdlg.hrc +++ b/sd/source/ui/inc/pubdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,111 +26,111 @@ ************************************************************************/ -#define PAGE1_BMP 1 -#define PAGE1_TITEL 2 -#define PAGE1_NEW_DESIGN 3 -#define PAGE1_OLD_DESIGN 4 -#define PAGE1_DESIGNS 5 -#define PAGE1_DEL_DESIGN 6 -#define PAGE1_DESC 7 +#define PAGE1_BMP 1 +#define PAGE1_TITEL 2 +#define PAGE1_NEW_DESIGN 3 +#define PAGE1_OLD_DESIGN 4 +#define PAGE1_DESIGNS 5 +#define PAGE1_DEL_DESIGN 6 +#define PAGE1_DESC 7 ////////////////////////////// -#define PAGE2_BMP 20 -#define PAGE2_TITEL 21 -#define PAGE2_STANDARD 22 -#define PAGE2_FRAMES 23 -#define PAGE2_KIOSK 24 -#define PAGE2_WEBCAST 25 - -#define PAGE2_NOFRAMES_FB 26 -#define PAGE2_FRAMES_FB 27 -#define PAGE2_KIOSK_FB 28 -#define PAGE2_WEBCAST_FB 29 - -#define PAGE2_TITEL_HTML 30 -#define PAGE2_CONTENT 31 -#define PAGE2_NOTES 32 - -#define PAGE2_TITEL_KIOSK 33 -#define PAGE2_CHG_DEFAULT 34 -#define PAGE2_CHG_AUTO 35 -#define PAGE2_DURATION_TXT 36 -#define PAGE2_DURATION_TMF 37 -#define PAGE2_ENDLESS 38 - -#define PAGE2_TITEL_WEBCAST 40 -#define PAGE2_ASP 41 -#define PAGE2_PERL 42 -#define PAGE2_INDEX_TXT 43 -#define PAGE2_INDEX 44 -#define PAGE2_URL_TXT 45 -#define PAGE2_URL 46 -#define PAGE2_CGI_TXT 47 -#define PAGE2_CGI 48 -#define PAGE2_VERT 49 +#define PAGE2_BMP 20 +#define PAGE2_TITEL 21 +#define PAGE2_STANDARD 22 +#define PAGE2_FRAMES 23 +#define PAGE2_KIOSK 24 +#define PAGE2_WEBCAST 25 + +#define PAGE2_NOFRAMES_FB 26 +#define PAGE2_FRAMES_FB 27 +#define PAGE2_KIOSK_FB 28 +#define PAGE2_WEBCAST_FB 29 + +#define PAGE2_TITEL_HTML 30 +#define PAGE2_CONTENT 31 +#define PAGE2_NOTES 32 + +#define PAGE2_TITEL_KIOSK 33 +#define PAGE2_CHG_DEFAULT 34 +#define PAGE2_CHG_AUTO 35 +#define PAGE2_DURATION_TXT 36 +#define PAGE2_DURATION_TMF 37 +#define PAGE2_ENDLESS 38 + +#define PAGE2_TITEL_WEBCAST 40 +#define PAGE2_ASP 41 +#define PAGE2_PERL 42 +#define PAGE2_INDEX_TXT 43 +#define PAGE2_INDEX 44 +#define PAGE2_URL_TXT 45 +#define PAGE2_URL 46 +#define PAGE2_CGI_TXT 47 +#define PAGE2_CGI 48 +#define PAGE2_VERT 49 ////////////////////////////// -#define PAGE3_BMP 50 -#define PAGE3_TITEL_1 51 -#define PAGE3_PNG 51 -#define PAGE3_GIF 52 -#define PAGE3_JPG 53 -#define PAGE3_QUALITY_TXT 54 -#define PAGE3_QUALITY 55 -#define PAGE3_TITEL_2 56 -#define PAGE3_RESOLUTION_1 57 -#define PAGE3_RESOLUTION_2 58 -#define PAGE3_RESOLUTION_3 59 -#define PAGE3_TITEL_3 60 -#define PAGE3_SLD_SOUND 61 -#define PAGE3_VERT 62 +#define PAGE3_BMP 50 +#define PAGE3_TITEL_1 51 +#define PAGE3_PNG 51 +#define PAGE3_GIF 52 +#define PAGE3_JPG 53 +#define PAGE3_QUALITY_TXT 54 +#define PAGE3_QUALITY 55 +#define PAGE3_TITEL_2 56 +#define PAGE3_RESOLUTION_1 57 +#define PAGE3_RESOLUTION_2 58 +#define PAGE3_RESOLUTION_3 59 +#define PAGE3_TITEL_3 60 +#define PAGE3_SLD_SOUND 61 +#define PAGE3_VERT 62 #define PAGE3_HIDDEN_SLIDES 63 ////////////////////////////// -#define PAGE4_BMP 65 -#define PAGE4_TITEL_1 66 -#define PAGE4_AUTHOR_TXT 67 -#define PAGE4_AUTHOR 68 -#define PAGE4_EMAIL_TXT 69 -#define PAGE4_EMAIL_EDIT 70 -#define PAGE4_WWW_TXT 71 -#define PAGE4_WWW_EDIT 72 -#define PAGE4_TITEL_2 73 -#define PAGE4_MISC 74 -#define PAGE4_DOWNLOAD 75 -#define PAGE4_CREATED 76 +#define PAGE4_BMP 65 +#define PAGE4_TITEL_1 66 +#define PAGE4_AUTHOR_TXT 67 +#define PAGE4_AUTHOR 68 +#define PAGE4_EMAIL_TXT 69 +#define PAGE4_EMAIL_EDIT 70 +#define PAGE4_WWW_TXT 71 +#define PAGE4_WWW_EDIT 72 +#define PAGE4_TITEL_2 73 +#define PAGE4_MISC 74 +#define PAGE4_DOWNLOAD 75 +#define PAGE4_CREATED 76 ////////////////////////////// -#define PAGE5_BMP 80 -#define PAGE5_TITEL 81 -#define PAGE5_TEXTONLY 82 -#define PAGE5_BUTTONS 83 -#define PAGE5_TITEL_2 84 -#define PAGE5_NOBACK 85 -#define PAGE5_BACKS 86 +#define PAGE5_BMP 80 +#define PAGE5_TITEL 81 +#define PAGE5_TEXTONLY 82 +#define PAGE5_BUTTONS 83 +#define PAGE5_TITEL_2 84 +#define PAGE5_NOBACK 85 +#define PAGE5_BACKS 86 ////////////////////////////// -#define PAGE6_BMP 100 -#define PAGE6_TITEL 101 -#define PAGE6_DEFAULT 102 -#define PAGE6_USER 103 -#define PAGE6_BACK 104 -#define PAGE6_TEXT 105 -#define PAGE6_LINK 106 -#define PAGE6_VLINK 107 -#define PAGE6_ALINK 108 -#define PAGE6_DOCCOLORS 109 -#define PAGE6_USECOLOR 110 -#define PAGE6_PREVIEW 111 +#define PAGE6_BMP 100 +#define PAGE6_TITEL 101 +#define PAGE6_DEFAULT 102 +#define PAGE6_USER 103 +#define PAGE6_BACK 104 +#define PAGE6_TEXT 105 +#define PAGE6_LINK 106 +#define PAGE6_VLINK 107 +#define PAGE6_ALINK 108 +#define PAGE6_DOCCOLORS 109 +#define PAGE6_USECOLOR 110 +#define PAGE6_PREVIEW 111 ////////////////////////////// -//#define PAGE6_PAGE_SND 128 +//#define PAGE6_PAGE_SND 128 ////////////////////////////// @@ -139,7 +139,7 @@ #define BUT_FINISH 202 #define BUT_CANCEL 203 #define BUT_HELP 204 -#define BOTTOM_LINE 205 +#define BOTTOM_LINE 205 ////////////////////////////// @@ -147,7 +147,7 @@ ////////////////////////////// -#define BTN_SAVE 1 -#define BTN_NOSAVE 2 -#define EDT_NAME 3 +#define BTN_SAVE 1 +#define BTN_NOSAVE 2 +#define EDT_NAME 3 #define DLG_DESIGNNAME 740 diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index dbdddfd5d112..e958958e5b0c 100644 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ #define NOOFPAGES 6 -enum HtmlPublishMode { PUBLISH_HTML, PUBLISH_FRAMES, PUBLISH_WEBCAST, PUBLISH_KIOSK }; +enum HtmlPublishMode { PUBLISH_HTML, PUBLISH_FRAMES, PUBLISH_WEBCAST, PUBLISH_KIOSK }; class SfxItemSet; @@ -77,115 +77,115 @@ class SdPublishingDlg : public ModalDialog { private: // page 1 controls - FixedBitmap* pPage1_Bmp; - FixedLine* pPage1_Titel; - RadioButton* pPage1_NewDesign; - RadioButton* pPage1_OldDesign; - ListBox* pPage1_Designs; - PushButton* pPage1_DelDesign; - FixedText* pPage1_Desc; + FixedBitmap* pPage1_Bmp; + FixedLine* pPage1_Titel; + RadioButton* pPage1_NewDesign; + RadioButton* pPage1_OldDesign; + ListBox* pPage1_Designs; + PushButton* pPage1_DelDesign; + FixedText* pPage1_Desc; // page 2 controls - FixedBitmap* pPage2_Bmp; - FixedLine* pPage2_Titel; - RadioButton* pPage2_Standard; - RadioButton* pPage2_Frames; - RadioButton* pPage2_Kiosk; - RadioButton* pPage2_WebCast; - FixedBitmap* pPage2_Standard_FB; - FixedBitmap* pPage2_Frames_FB; - FixedBitmap* pPage2_Kiosk_FB; - FixedBitmap* pPage2_WebCast_FB; - - FixedLine* pPage2_Titel_Html; - CheckBox* pPage2_Content; - CheckBox* pPage2_Notes; - - FixedLine* pPage2_Titel_WebCast; - RadioButton* pPage2_ASP; - RadioButton* pPage2_PERL; - FixedText* pPage2_URL_txt; - Edit* pPage2_URL; - FixedText* pPage2_CGI_txt; - Edit* pPage2_CGI; - FixedText* pPage2_Index_txt; - Edit* pPage2_Index; + FixedBitmap* pPage2_Bmp; + FixedLine* pPage2_Titel; + RadioButton* pPage2_Standard; + RadioButton* pPage2_Frames; + RadioButton* pPage2_Kiosk; + RadioButton* pPage2_WebCast; + FixedBitmap* pPage2_Standard_FB; + FixedBitmap* pPage2_Frames_FB; + FixedBitmap* pPage2_Kiosk_FB; + FixedBitmap* pPage2_WebCast_FB; + + FixedLine* pPage2_Titel_Html; + CheckBox* pPage2_Content; + CheckBox* pPage2_Notes; + + FixedLine* pPage2_Titel_WebCast; + RadioButton* pPage2_ASP; + RadioButton* pPage2_PERL; + FixedText* pPage2_URL_txt; + Edit* pPage2_URL; + FixedText* pPage2_CGI_txt; + Edit* pPage2_CGI; + FixedText* pPage2_Index_txt; + Edit* pPage2_Index; FixedLine* pPage2_Vert; - FixedLine* pPage2_Titel_Kiosk; - RadioButton* pPage2_ChgDefault; - RadioButton* pPage2_ChgAuto; - FixedText* pPage2_Duration_txt; - TimeField* pPage2_Duration; - CheckBox* pPage2_Endless; + FixedLine* pPage2_Titel_Kiosk; + RadioButton* pPage2_ChgDefault; + RadioButton* pPage2_ChgAuto; + FixedText* pPage2_Duration_txt; + TimeField* pPage2_Duration; + CheckBox* pPage2_Endless; // page 3 controls - FixedBitmap* pPage3_Bmp; - FixedLine* pPage3_Titel1; - RadioButton* pPage3_Png; - RadioButton* pPage3_Gif; - RadioButton* pPage3_Jpg; - FixedText* pPage3_Quality_txt; - ComboBox* pPage3_Quality; + FixedBitmap* pPage3_Bmp; + FixedLine* pPage3_Titel1; + RadioButton* pPage3_Png; + RadioButton* pPage3_Gif; + RadioButton* pPage3_Jpg; + FixedText* pPage3_Quality_txt; + ComboBox* pPage3_Quality; FixedLine* pPage3_Vert; - FixedLine* pPage3_Titel2; - RadioButton* pPage3_Resolution_1; - RadioButton* pPage3_Resolution_2; - RadioButton* pPage3_Resolution_3; - FixedLine* pPage3_Titel3; - CheckBox* pPage3_SldSound; - CheckBox* pPage3_HiddenSlides; + FixedLine* pPage3_Titel2; + RadioButton* pPage3_Resolution_1; + RadioButton* pPage3_Resolution_2; + RadioButton* pPage3_Resolution_3; + FixedLine* pPage3_Titel3; + CheckBox* pPage3_SldSound; + CheckBox* pPage3_HiddenSlides; // page 4 controls - FixedBitmap* pPage4_Bmp; - FixedLine* pPage4_Titel1; - FixedText* pPage4_Author_txt; - Edit* pPage4_Author; - FixedText* pPage4_Email_txt; - Edit* pPage4_Email; - FixedText* pPage4_WWW_txt; - Edit* pPage4_WWW; - FixedText* pPage4_Titel2; - MultiLineEdit* pPage4_Misc; - CheckBox* pPage4_Download; -//-/ CheckBox* pPage4_Created; + FixedBitmap* pPage4_Bmp; + FixedLine* pPage4_Titel1; + FixedText* pPage4_Author_txt; + Edit* pPage4_Author; + FixedText* pPage4_Email_txt; + Edit* pPage4_Email; + FixedText* pPage4_WWW_txt; + Edit* pPage4_WWW; + FixedText* pPage4_Titel2; + MultiLineEdit* pPage4_Misc; + CheckBox* pPage4_Download; +//-/ CheckBox* pPage4_Created; // page 5 controls - FixedBitmap* pPage5_Bmp; - FixedLine* pPage5_Titel; - CheckBox* pPage5_TextOnly; - ValueSet* pPage5_Buttons; + FixedBitmap* pPage5_Bmp; + FixedLine* pPage5_Titel; + CheckBox* pPage5_TextOnly; + ValueSet* pPage5_Buttons; // page 6 controls - FixedBitmap* pPage6_Bmp; - FixedLine* pPage6_Titel; - RadioButton* pPage6_Default; - RadioButton* pPage6_User; - PushButton* pPage6_Back; - PushButton* pPage6_Text; - PushButton* pPage6_Link; - PushButton* pPage6_VLink; - PushButton* pPage6_ALink; - RadioButton* pPage6_DocColors; - SdHtmlAttrPreview* pPage6_Preview; + FixedBitmap* pPage6_Bmp; + FixedLine* pPage6_Titel; + RadioButton* pPage6_Default; + RadioButton* pPage6_User; + PushButton* pPage6_Back; + PushButton* pPage6_Text; + PushButton* pPage6_Link; + PushButton* pPage6_VLink; + PushButton* pPage6_ALink; + RadioButton* pPage6_DocColors; + SdHtmlAttrPreview* pPage6_Preview; boost::scoped_ptr< ButtonSet > mpButtonSet; -// CheckBox* pPage6_Sound; +// CheckBox* pPage6_Sound; // standard controls - FixedLine aBottomLine; - HelpButton aHelpButton; - CancelButton aCancelButton; - PushButton aLastPageButton; - PushButton aNextPageButton; - OKButton aFinishButton; + FixedLine aBottomLine; + HelpButton aHelpButton; + CancelButton aCancelButton; + PushButton aLastPageButton; + PushButton aNextPageButton; + OKButton aFinishButton; - Assistent aAssistentFunc; + Assistent aAssistentFunc; - BOOL m_bImpress; - BOOL m_bButtonsDirty; + BOOL m_bImpress; + BOOL m_bButtonsDirty; void SetDefaults(); void CreatePages(); @@ -194,19 +194,19 @@ private: Color m_aBackColor, m_aTextColor, m_aLinkColor; Color m_aVLinkColor, m_aALinkColor; - void ChangePage(); - void UpdatePage(); + void ChangePage(); + void UpdatePage(); - List* m_pDesignList; - BOOL m_bDesignListDirty; + List* m_pDesignList; + BOOL m_bDesignListDirty; SdPublishingDesign* m_pDesign; - BOOL Load(); - BOOL Save(); + BOOL Load(); + BOOL Save(); - void GetDesign( SdPublishingDesign* pDesign ); - void SetDesign( SdPublishingDesign* pDesign ); + void GetDesign( SdPublishingDesign* pDesign ); + void SetDesign( SdPublishingDesign* pDesign ); - void LoadPreviewButtons(); + void LoadPreviewButtons(); DECL_LINK( FinishHdl, OKButton * ); DECL_LINK( NextPageHdl, PushButton * ); diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc index 1602dc698f3f..c8dd81d98d59 100755 --- a/sd/source/ui/inc/res_bmp.hrc +++ b/sd/source/ui/inc/res_bmp.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,302 +40,302 @@ #define RID_CONTROLS RID_APP_START+3 #define RID_IMPRESS_DOCWINDOWICON RID_APP_START+4 -#define RID_ALIGNMENT_TBX RID_APP_START+5 -#define RID_ZOOM_TBX RID_APP_START+6 -#define RID_CHOOSE_MODE RID_APP_START+7 -#define RID_CHOOSE_MODE_TBX RID_APP_START+8 - -#define RID_TEXT RID_APP_START+10 -#define RID_TEXT_TBX RID_APP_START+11 -#define RID_RECTANGLES RID_APP_START+12 -#define RID_RECTANGLES_TBX RID_APP_START+13 -#define RID_ELLIPSES RID_APP_START+14 -#define RID_ELLIPSES_TBX RID_APP_START+15 -#define RID_LINES RID_APP_START+16 -#define RID_LINES_TBX RID_APP_START+17 -#define RID_3D_OBJECTS RID_APP_START+18 -#define RID_3D_OBJECTS_TBX RID_APP_START+19 -#define RID_INSERT RID_APP_START+20 -#define RID_INSERT_TBX RID_APP_START+21 -#define RID_POSITION RID_APP_START+22 -#define RID_POSITION_TBX RID_APP_START+23 +#define RID_ALIGNMENT_TBX RID_APP_START+5 +#define RID_ZOOM_TBX RID_APP_START+6 +#define RID_CHOOSE_MODE RID_APP_START+7 +#define RID_CHOOSE_MODE_TBX RID_APP_START+8 + +#define RID_TEXT RID_APP_START+10 +#define RID_TEXT_TBX RID_APP_START+11 +#define RID_RECTANGLES RID_APP_START+12 +#define RID_RECTANGLES_TBX RID_APP_START+13 +#define RID_ELLIPSES RID_APP_START+14 +#define RID_ELLIPSES_TBX RID_APP_START+15 +#define RID_LINES RID_APP_START+16 +#define RID_LINES_TBX RID_APP_START+17 +#define RID_3D_OBJECTS RID_APP_START+18 +#define RID_3D_OBJECTS_TBX RID_APP_START+19 +#define RID_INSERT RID_APP_START+20 +#define RID_INSERT_TBX RID_APP_START+21 +#define RID_POSITION RID_APP_START+22 +#define RID_POSITION_TBX RID_APP_START+23 #define RID_CONNECTORS RID_APP_START+24 #define RID_CONNECTORS_TBX RID_APP_START+25 -#define RID_ARROWS RID_APP_START+26 -#define RID_ARROWS_TBX RID_APP_START+27 +#define RID_ARROWS RID_APP_START+26 +#define RID_ARROWS_TBX RID_APP_START+27 #define RID_DRAW_DOCWINDOWICON RID_APP_START+28 -#define RID_GRAFFILTERS RID_APP_START+29 -#define RID_GRAFFILTERS_TBX RID_APP_START+30 +#define RID_GRAFFILTERS RID_APP_START+29 +#define RID_GRAFFILTERS_TBX RID_APP_START+30 // Bitmaps fuer Tree-ListBox im Effekte-TabDialog -#define BMP_PAGE RID_APP_START+42 -#define BMP_PAGEOBJS RID_APP_START+43 -#define BMP_OBJECTS RID_APP_START+44 -#define BMP_DOC_OPEN RID_APP_START+45 -#define BMP_DOC_CLOSED RID_APP_START+46 -#define BMP_DOC_TEXT RID_APP_START+47 -#define BMP_OLE RID_APP_START+48 -#define BMP_PAGE_EXCLUDED RID_APP_START+49 +#define BMP_PAGE RID_APP_START+42 +#define BMP_PAGEOBJS RID_APP_START+43 +#define BMP_OBJECTS RID_APP_START+44 +#define BMP_DOC_OPEN RID_APP_START+45 +#define BMP_DOC_CLOSED RID_APP_START+46 +#define BMP_DOC_TEXT RID_APP_START+47 +#define BMP_OLE RID_APP_START+48 +#define BMP_PAGE_EXCLUDED RID_APP_START+49 #define BMP_PAGEOBJS_EXCLUDED RID_APP_START+50 -#define BMP_EXPAND RID_APP_START+51 -#define BMP_COLLAPSE RID_APP_START+52 -#define BMP_GRAPHIC RID_APP_START+53 +#define BMP_EXPAND RID_APP_START+51 +#define BMP_COLLAPSE RID_APP_START+52 +#define BMP_GRAPHIC RID_APP_START+53 // Bimaps fuer ValueSet im EffekteWindow -#define BMP_EFFECT_NONE RID_APP_START+105 -#define BMP_TEXTEFFECT_DISCARD_FROM_T RID_APP_START+106 -#define BMP_TEXTEFFECT_FADE_FROM_CENTER RID_APP_START+107 -#define BMP_EFFECT_HIDE RID_APP_START+108 -#define BMP_EFFECT_APPEAR RID_APP_START+109 +#define BMP_EFFECT_NONE RID_APP_START+105 +#define BMP_TEXTEFFECT_DISCARD_FROM_T RID_APP_START+106 +#define BMP_TEXTEFFECT_FADE_FROM_CENTER RID_APP_START+107 +#define BMP_EFFECT_HIDE RID_APP_START+108 +#define BMP_EFFECT_APPEAR RID_APP_START+109 // ----------------------------------------------------------------------------- -#define BMP_FOIL_NONE RID_APP_START+120 -#define BMP_GROUP RID_APP_START+121 -#define BMP_WAIT_ICON RID_APP_START+124 +#define BMP_FOIL_NONE RID_APP_START+120 +#define BMP_GROUP RID_APP_START+121 +#define BMP_WAIT_ICON RID_APP_START+124 // ----------------------------------------------------------------------------- // additional effects -#define BMP_EFFECT_DISCARD_FROM_UL RID_APP_START+130 -#define BMP_EFFECT_DISCARD_FROM_UR RID_APP_START+131 -#define BMP_EFFECT_DISCARD_FROM_LR RID_APP_START+132 -#define BMP_EFFECT_DISCARD_FROM_LL RID_APP_START+133 -#define BMP_EFFECT_DISCARD_S_FROM_L RID_APP_START+134 -#define BMP_EFFECT_DISCARD_S_FROM_UL RID_APP_START+135 -#define BMP_EFFECT_DISCARD_S_FROM_T RID_APP_START+136 -#define BMP_EFFECT_DISCARD_S_FROM_UR RID_APP_START+137 -#define BMP_EFFECT_DISCARD_S_FROM_R RID_APP_START+138 -#define BMP_EFFECT_DISCARD_S_FROM_LR RID_APP_START+139 -#define BMP_EFFECT_DISCARD_S_FROM_B RID_APP_START+140 -#define BMP_EFFECT_DISCARD_S_FROM_LL RID_APP_START+141 -#define BMP_EFFECT_VERTICAL_CHECKERBOARD RID_APP_START+142 -#define BMP_EFFECT_HORIZONTAL_CHECKERBOARD RID_APP_START+143 -#define BMP_EFFECT_STRTCH_FROM_L RID_APP_START+144 -#define BMP_EFFECT_STRTCH_FROM_UL RID_APP_START+145 -#define BMP_EFFECT_STRTCH_FROM_T RID_APP_START+146 -#define BMP_EFFECT_STRTCH_FROM_UR RID_APP_START+147 -#define BMP_EFFECT_STRTCH_FROM_R RID_APP_START+148 -#define BMP_EFFECT_STRTCH_FROM_LR RID_APP_START+149 -#define BMP_EFFECT_STRTCH_FROM_B RID_APP_START+150 -#define BMP_EFFECT_STRTCH_FROM_LL RID_APP_START+151 - -#define BMP_EFFECT_STRTCH_HORIZONTAL RID_APP_START+152 -#define BMP_EFFECT_STRTCH_VERTICAL RID_APP_START+153 -#define BMP_EFFECT_ROTATE_HORIZONTAL RID_APP_START+154 -#define BMP_EFFECT_ROTATE_VERTICAL RID_APP_START+155 - -#define BMP_FOIL_21 RID_APP_START+156 -#define BMP_FOIL_22 RID_APP_START+157 -#define BMP_FOIL_23 RID_APP_START+158 -#define BMP_FOIL_24 RID_APP_START+159 - -#define BMP_EFFECT_UNCOVER_TO_L RID_APP_START+165 -#define BMP_EFFECT_UNCOVER_TO_UL RID_APP_START+166 -#define BMP_EFFECT_UNCOVER_TO_T RID_APP_START+167 -#define BMP_EFFECT_UNCOVER_TO_UR RID_APP_START+168 -#define BMP_EFFECT_UNCOVER_TO_R RID_APP_START+169 -#define BMP_EFFECT_UNCOVER_TO_LR RID_APP_START+170 -#define BMP_EFFECT_UNCOVER_TO_B RID_APP_START+171 -#define BMP_EFFECT_UNCOVER_TO_LL RID_APP_START+172 - -#define BMP_PAGE_H RID_SD_START+213 -#define BMP_PAGEOBJS_H RID_SD_START+214 -#define BMP_OBJECTS_H RID_SD_START+215 -#define BMP_DOC_OPEN_H RID_SD_START+216 -#define BMP_DOC_CLOSED_H RID_SD_START+217 -#define BMP_DOC_TEXT_H RID_SD_START+218 -#define BMP_OLE_H RID_SD_START+219 -#define BMP_PAGE_EXCLUDED_H RID_SD_START+220 -#define BMP_PAGEOBJS_EXCLUDED_H RID_SD_START+221 -#define BMP_EXPAND_H RID_SD_START+222 -#define BMP_COLLAPSE_H RID_SD_START+223 -#define BMP_GRAPHIC_H RID_SD_START+224 - -#define BMP_FOIL_NONE_H RID_SD_START+225 -#define BMP_GROUP_H RID_SD_START+226 -#define BMP_WAIT_ICON_H RID_SD_START+229 +#define BMP_EFFECT_DISCARD_FROM_UL RID_APP_START+130 +#define BMP_EFFECT_DISCARD_FROM_UR RID_APP_START+131 +#define BMP_EFFECT_DISCARD_FROM_LR RID_APP_START+132 +#define BMP_EFFECT_DISCARD_FROM_LL RID_APP_START+133 +#define BMP_EFFECT_DISCARD_S_FROM_L RID_APP_START+134 +#define BMP_EFFECT_DISCARD_S_FROM_UL RID_APP_START+135 +#define BMP_EFFECT_DISCARD_S_FROM_T RID_APP_START+136 +#define BMP_EFFECT_DISCARD_S_FROM_UR RID_APP_START+137 +#define BMP_EFFECT_DISCARD_S_FROM_R RID_APP_START+138 +#define BMP_EFFECT_DISCARD_S_FROM_LR RID_APP_START+139 +#define BMP_EFFECT_DISCARD_S_FROM_B RID_APP_START+140 +#define BMP_EFFECT_DISCARD_S_FROM_LL RID_APP_START+141 +#define BMP_EFFECT_VERTICAL_CHECKERBOARD RID_APP_START+142 +#define BMP_EFFECT_HORIZONTAL_CHECKERBOARD RID_APP_START+143 +#define BMP_EFFECT_STRTCH_FROM_L RID_APP_START+144 +#define BMP_EFFECT_STRTCH_FROM_UL RID_APP_START+145 +#define BMP_EFFECT_STRTCH_FROM_T RID_APP_START+146 +#define BMP_EFFECT_STRTCH_FROM_UR RID_APP_START+147 +#define BMP_EFFECT_STRTCH_FROM_R RID_APP_START+148 +#define BMP_EFFECT_STRTCH_FROM_LR RID_APP_START+149 +#define BMP_EFFECT_STRTCH_FROM_B RID_APP_START+150 +#define BMP_EFFECT_STRTCH_FROM_LL RID_APP_START+151 + +#define BMP_EFFECT_STRTCH_HORIZONTAL RID_APP_START+152 +#define BMP_EFFECT_STRTCH_VERTICAL RID_APP_START+153 +#define BMP_EFFECT_ROTATE_HORIZONTAL RID_APP_START+154 +#define BMP_EFFECT_ROTATE_VERTICAL RID_APP_START+155 + +#define BMP_FOIL_21 RID_APP_START+156 +#define BMP_FOIL_22 RID_APP_START+157 +#define BMP_FOIL_23 RID_APP_START+158 +#define BMP_FOIL_24 RID_APP_START+159 + +#define BMP_EFFECT_UNCOVER_TO_L RID_APP_START+165 +#define BMP_EFFECT_UNCOVER_TO_UL RID_APP_START+166 +#define BMP_EFFECT_UNCOVER_TO_T RID_APP_START+167 +#define BMP_EFFECT_UNCOVER_TO_UR RID_APP_START+168 +#define BMP_EFFECT_UNCOVER_TO_R RID_APP_START+169 +#define BMP_EFFECT_UNCOVER_TO_LR RID_APP_START+170 +#define BMP_EFFECT_UNCOVER_TO_B RID_APP_START+171 +#define BMP_EFFECT_UNCOVER_TO_LL RID_APP_START+172 + +#define BMP_PAGE_H RID_SD_START+213 +#define BMP_PAGEOBJS_H RID_SD_START+214 +#define BMP_OBJECTS_H RID_SD_START+215 +#define BMP_DOC_OPEN_H RID_SD_START+216 +#define BMP_DOC_CLOSED_H RID_SD_START+217 +#define BMP_DOC_TEXT_H RID_SD_START+218 +#define BMP_OLE_H RID_SD_START+219 +#define BMP_PAGE_EXCLUDED_H RID_SD_START+220 +#define BMP_PAGEOBJS_EXCLUDED_H RID_SD_START+221 +#define BMP_EXPAND_H RID_SD_START+222 +#define BMP_COLLAPSE_H RID_SD_START+223 +#define BMP_GRAPHIC_H RID_SD_START+224 + +#define BMP_FOIL_NONE_H RID_SD_START+225 +#define BMP_GROUP_H RID_SD_START+226 +#define BMP_WAIT_ICON_H RID_SD_START+229 #define BMP_FADE_EFFECT_INDICATOR RID_SD_START+331 #define BMP_FADE_EFFECT_INDICATOR_H RID_SD_START+332 -#define BMP_COMMENTS_INDICATOR RID_SD_START+338 -#define BMP_COMMENTS_INDICATOR_H RID_SD_START+339 - -#define BMP_LAYOUT_EMPTY RID_SD_START+340 -#define BMP_LAYOUT_EMPTY_H RID_SD_START+341 -#define BMP_LAYOUT_HEAD01 RID_SD_START+342 -#define BMP_LAYOUT_HEAD01_H RID_SD_START+343 -#define BMP_LAYOUT_HEAD02 RID_SD_START+344 -#define BMP_LAYOUT_HEAD02_H RID_SD_START+345 -#define BMP_LAYOUT_HEAD02A RID_SD_START+346 -#define BMP_LAYOUT_HEAD02A_H RID_SD_START+347 -#define BMP_LAYOUT_HEAD02B RID_SD_START+348 -#define BMP_LAYOUT_HEAD02B_H RID_SD_START+349 -#define BMP_LAYOUT_HEAD03 RID_SD_START+350 -#define BMP_LAYOUT_HEAD03_H RID_SD_START+351 -#define BMP_LAYOUT_HEAD03A RID_SD_START+352 -#define BMP_LAYOUT_HEAD03A_H RID_SD_START+353 -#define BMP_LAYOUT_HEAD03B RID_SD_START+354 -#define BMP_LAYOUT_HEAD03B_H RID_SD_START+355 -#define BMP_LAYOUT_HEAD03C RID_SD_START+356 -#define BMP_LAYOUT_HEAD03C_H RID_SD_START+357 -#define BMP_LAYOUT_HEAD04 RID_SD_START+358 -#define BMP_LAYOUT_HEAD04_H RID_SD_START+359 -#define BMP_LAYOUT_HEAD06 RID_SD_START+360 -#define BMP_LAYOUT_HEAD06_H RID_SD_START+361 -#define BMP_LAYOUT_TEXTONLY RID_SD_START+362 -#define BMP_LAYOUT_TEXTONLY_H RID_SD_START+363 -#define BMP_LAYOUT_VERTICAL01 RID_SD_START+364 -#define BMP_LAYOUT_VERTICAL01_H RID_SD_START+365 -#define BMP_LAYOUT_VERTICAL02 RID_SD_START+366 -#define BMP_LAYOUT_VERTICAL02_H RID_SD_START+367 - -#define BMP_FOILH_01 RID_SD_START+388 -#define BMP_FOILH_01_H RID_SD_START+389 -#define BMP_FOILH_02 RID_SD_START+390 -#define BMP_FOILH_02_H RID_SD_START+391 -#define BMP_FOILH_03 RID_SD_START+392 -#define BMP_FOILH_03_H RID_SD_START+393 -#define BMP_FOILH_04 RID_SD_START+394 -#define BMP_FOILH_04_H RID_SD_START+395 -#define BMP_FOILH_06 RID_SD_START+396 -#define BMP_FOILH_06_H RID_SD_START+397 -#define BMP_FOILH_09 RID_SD_START+398 -#define BMP_FOILH_09_H RID_SD_START+399 - -#define BMP_FOILN_01 RID_SD_START+400 -#define BMP_FOILN_01_H RID_SD_START+401 - -#define BMP_PLACEHOLDER_SMALL_START (RID_SD_START+402) // these ids must stay in order! -#define BMP_PLACEHOLDER_TABLE_SMALL (RID_SD_START+402) -#define BMP_PLACEHOLDER_CHART_SMALL (RID_SD_START+403) -#define BMP_PLACEHOLDER_IMAGE_SMALL (RID_SD_START+404) -#define BMP_PLACEHOLDER_MOVIE_SMALL (RID_SD_START+405) -#define BMP_PLACEHOLDER_TABLE_SMALL_HOVER (RID_SD_START+406) -#define BMP_PLACEHOLDER_CHART_SMALL_HOVER (RID_SD_START+407) -#define BMP_PLACEHOLDER_IMAGE_SMALL_HOVER (RID_SD_START+408) -#define BMP_PLACEHOLDER_MOVIE_SMALL_HOVER (RID_SD_START+409) -#define BMP_PLACEHOLDER_SMALL_END (RID_SD_START+410) -#define BMP_PLACEHOLDER_LARGE_START (RID_SD_START+410) -#define BMP_PLACEHOLDER_TABLE_LARGE (RID_SD_START+410) -#define BMP_PLACEHOLDER_CHART_LARGE (RID_SD_START+411) -#define BMP_PLACEHOLDER_IMAGE_LARGE (RID_SD_START+412) -#define BMP_PLACEHOLDER_MOVIE_LARGE (RID_SD_START+413) -#define BMP_PLACEHOLDER_TABLE_LARGE_HOVER (RID_SD_START+414) -#define BMP_PLACEHOLDER_CHART_LARGE_HOVER (RID_SD_START+415) -#define BMP_PLACEHOLDER_IMAGE_LARGE_HOVER (RID_SD_START+416) -#define BMP_PLACEHOLDER_MOVIE_LARGE_HOVER (RID_SD_START+417) -#define BMP_PLACEHOLDER_LARGE_END (RID_SD_START+418) // until here! +#define BMP_COMMENTS_INDICATOR RID_SD_START+338 +#define BMP_COMMENTS_INDICATOR_H RID_SD_START+339 + +#define BMP_LAYOUT_EMPTY RID_SD_START+340 +#define BMP_LAYOUT_EMPTY_H RID_SD_START+341 +#define BMP_LAYOUT_HEAD01 RID_SD_START+342 +#define BMP_LAYOUT_HEAD01_H RID_SD_START+343 +#define BMP_LAYOUT_HEAD02 RID_SD_START+344 +#define BMP_LAYOUT_HEAD02_H RID_SD_START+345 +#define BMP_LAYOUT_HEAD02A RID_SD_START+346 +#define BMP_LAYOUT_HEAD02A_H RID_SD_START+347 +#define BMP_LAYOUT_HEAD02B RID_SD_START+348 +#define BMP_LAYOUT_HEAD02B_H RID_SD_START+349 +#define BMP_LAYOUT_HEAD03 RID_SD_START+350 +#define BMP_LAYOUT_HEAD03_H RID_SD_START+351 +#define BMP_LAYOUT_HEAD03A RID_SD_START+352 +#define BMP_LAYOUT_HEAD03A_H RID_SD_START+353 +#define BMP_LAYOUT_HEAD03B RID_SD_START+354 +#define BMP_LAYOUT_HEAD03B_H RID_SD_START+355 +#define BMP_LAYOUT_HEAD03C RID_SD_START+356 +#define BMP_LAYOUT_HEAD03C_H RID_SD_START+357 +#define BMP_LAYOUT_HEAD04 RID_SD_START+358 +#define BMP_LAYOUT_HEAD04_H RID_SD_START+359 +#define BMP_LAYOUT_HEAD06 RID_SD_START+360 +#define BMP_LAYOUT_HEAD06_H RID_SD_START+361 +#define BMP_LAYOUT_TEXTONLY RID_SD_START+362 +#define BMP_LAYOUT_TEXTONLY_H RID_SD_START+363 +#define BMP_LAYOUT_VERTICAL01 RID_SD_START+364 +#define BMP_LAYOUT_VERTICAL01_H RID_SD_START+365 +#define BMP_LAYOUT_VERTICAL02 RID_SD_START+366 +#define BMP_LAYOUT_VERTICAL02_H RID_SD_START+367 + +#define BMP_FOILH_01 RID_SD_START+388 +#define BMP_FOILH_01_H RID_SD_START+389 +#define BMP_FOILH_02 RID_SD_START+390 +#define BMP_FOILH_02_H RID_SD_START+391 +#define BMP_FOILH_03 RID_SD_START+392 +#define BMP_FOILH_03_H RID_SD_START+393 +#define BMP_FOILH_04 RID_SD_START+394 +#define BMP_FOILH_04_H RID_SD_START+395 +#define BMP_FOILH_06 RID_SD_START+396 +#define BMP_FOILH_06_H RID_SD_START+397 +#define BMP_FOILH_09 RID_SD_START+398 +#define BMP_FOILH_09_H RID_SD_START+399 + +#define BMP_FOILN_01 RID_SD_START+400 +#define BMP_FOILN_01_H RID_SD_START+401 + +#define BMP_PLACEHOLDER_SMALL_START (RID_SD_START+402) // these ids must stay in order! +#define BMP_PLACEHOLDER_TABLE_SMALL (RID_SD_START+402) +#define BMP_PLACEHOLDER_CHART_SMALL (RID_SD_START+403) +#define BMP_PLACEHOLDER_IMAGE_SMALL (RID_SD_START+404) +#define BMP_PLACEHOLDER_MOVIE_SMALL (RID_SD_START+405) +#define BMP_PLACEHOLDER_TABLE_SMALL_HOVER (RID_SD_START+406) +#define BMP_PLACEHOLDER_CHART_SMALL_HOVER (RID_SD_START+407) +#define BMP_PLACEHOLDER_IMAGE_SMALL_HOVER (RID_SD_START+408) +#define BMP_PLACEHOLDER_MOVIE_SMALL_HOVER (RID_SD_START+409) +#define BMP_PLACEHOLDER_SMALL_END (RID_SD_START+410) +#define BMP_PLACEHOLDER_LARGE_START (RID_SD_START+410) +#define BMP_PLACEHOLDER_TABLE_LARGE (RID_SD_START+410) +#define BMP_PLACEHOLDER_CHART_LARGE (RID_SD_START+411) +#define BMP_PLACEHOLDER_IMAGE_LARGE (RID_SD_START+412) +#define BMP_PLACEHOLDER_MOVIE_LARGE (RID_SD_START+413) +#define BMP_PLACEHOLDER_TABLE_LARGE_HOVER (RID_SD_START+414) +#define BMP_PLACEHOLDER_CHART_LARGE_HOVER (RID_SD_START+415) +#define BMP_PLACEHOLDER_IMAGE_LARGE_HOVER (RID_SD_START+416) +#define BMP_PLACEHOLDER_MOVIE_LARGE_HOVER (RID_SD_START+417) +#define BMP_PLACEHOLDER_LARGE_END (RID_SD_START+418) // until here! // ----------------------------------------------------------------------------- -#define IMG_PIPETTE_H RID_APP_START+21 -#define IMG_GET1OBJECT_H RID_APP_START+22 -#define IMG_GETALLOBJECT_H RID_APP_START+23 -#define IMG_REMOVEBMP_H RID_APP_START+24 -#define IMG_REMOVEALLBMP_H RID_APP_START+25 +#define IMG_PIPETTE_H RID_APP_START+21 +#define IMG_GET1OBJECT_H RID_APP_START+22 +#define IMG_GETALLOBJECT_H RID_APP_START+23 +#define IMG_REMOVEBMP_H RID_APP_START+24 +#define IMG_REMOVEALLBMP_H RID_APP_START+25 /* - * ResourceIDs fuer Popup-Menues brauchen keinen Dummy-String !!! + * ResourceIDs fuer Popup-Menues brauchen keinen Dummy-String !!! */ -#define RID_DRAW_TEXTOBJ_POPUP RID_APP_START+43 -#define RID_DRAW_GEOMOBJ_POPUP RID_APP_START+44 -#define RID_DRAW_NOSEL_POPUP RID_APP_START+45 -#define RID_SLIDE_SORTER_IMPRESS_SEL_POPUP RID_APP_START+46 -#define RID_BEZIER_POPUP RID_APP_START+47 -#define RID_DRAW_LINEOBJ_POPUP RID_APP_START+48 -#define RID_DRAW_MULTISELECTION_POPUP RID_APP_START+49 -#define RID_DRAW_PAGETAB_POPUP RID_APP_START+50 -#define RID_LAYERTAB_POPUP RID_APP_START+51 -#define RID_DRAW_GRAPHIC_POPUP RID_APP_START+52 -#define RID_DRAW_OLE2_POPUP RID_APP_START+53 -#define RID_DRAW_TEXTOBJ_INSIDE_POPUP RID_APP_START+54 +#define RID_DRAW_TEXTOBJ_POPUP RID_APP_START+43 +#define RID_DRAW_GEOMOBJ_POPUP RID_APP_START+44 +#define RID_DRAW_NOSEL_POPUP RID_APP_START+45 +#define RID_SLIDE_SORTER_IMPRESS_SEL_POPUP RID_APP_START+46 +#define RID_BEZIER_POPUP RID_APP_START+47 +#define RID_DRAW_LINEOBJ_POPUP RID_APP_START+48 +#define RID_DRAW_MULTISELECTION_POPUP RID_APP_START+49 +#define RID_DRAW_PAGETAB_POPUP RID_APP_START+50 +#define RID_LAYERTAB_POPUP RID_APP_START+51 +#define RID_DRAW_GRAPHIC_POPUP RID_APP_START+52 +#define RID_DRAW_OLE2_POPUP RID_APP_START+53 +#define RID_DRAW_TEXTOBJ_INSIDE_POPUP RID_APP_START+54 #define RID_SLIDE_SORTER_IMPRESS_NOSEL_POPUP RID_APP_START+55 -#define RID_OUTLINE_POPUP RID_APP_START+56 -#define RID_MASTERPAGE_POPUP RID_APP_START+57 -#define RID_DRAW_GROUPOBJ_POPUP RID_APP_START+58 -#define RID_DRAW_3DOBJ_POPUP RID_APP_START+59 -#define RID_DRAW_MEASUREOBJ_POPUP RID_APP_START+60 -#define RID_DRAW_EDGEOBJ_POPUP RID_APP_START+61 -#define RID_DRAW_BMP_CONVERT_POPUP RID_APP_START+62 -#define RID_DRAW_POLYLINEOBJ_POPUP RID_APP_START+63 -#define RID_DRAW_3DSCENE_POPUP RID_APP_START+64 -#define RID_DRAW_3DSCENE2_POPUP RID_APP_START+65 -#define RID_DRAW_CUSTOMSHAPE_POPUP RID_APP_START+66 -#define RID_TASKPANE_MASTERPAGESSELECTOR_POPUP RID_APP_START+67 -#define RID_TASKPANE_LAYOUTMENU_POPUP RID_APP_START+68 -#define RID_DRAW_MEDIA_POPUP RID_APP_START+69 +#define RID_OUTLINE_POPUP RID_APP_START+56 +#define RID_MASTERPAGE_POPUP RID_APP_START+57 +#define RID_DRAW_GROUPOBJ_POPUP RID_APP_START+58 +#define RID_DRAW_3DOBJ_POPUP RID_APP_START+59 +#define RID_DRAW_MEASUREOBJ_POPUP RID_APP_START+60 +#define RID_DRAW_EDGEOBJ_POPUP RID_APP_START+61 +#define RID_DRAW_BMP_CONVERT_POPUP RID_APP_START+62 +#define RID_DRAW_POLYLINEOBJ_POPUP RID_APP_START+63 +#define RID_DRAW_3DSCENE_POPUP RID_APP_START+64 +#define RID_DRAW_3DSCENE2_POPUP RID_APP_START+65 +#define RID_DRAW_CUSTOMSHAPE_POPUP RID_APP_START+66 +#define RID_TASKPANE_MASTERPAGESSELECTOR_POPUP RID_APP_START+67 +#define RID_TASKPANE_LAYOUTMENU_POPUP RID_APP_START+68 +#define RID_DRAW_MEDIA_POPUP RID_APP_START+69 // Draw (Graphic) -#define RID_GRAPHIC_TEXTOBJ_POPUP RID_APP_START+70 -#define RID_GRAPHIC_GEOMOBJ_POPUP RID_APP_START+71 -#define RID_GRAPHIC_NOSEL_POPUP RID_APP_START+72 -#define RID_GRAPHIC_LINEOBJ_POPUP RID_APP_START+73 -#define RID_GRAPHIC_MULTISELECTION_POPUP RID_APP_START+74 -#define RID_GRAPHIC_PAGETAB_POPUP RID_APP_START+75 -#define RID_GRAPHIC_GRAPHIC_POPUP RID_APP_START+76 -#define RID_GRAPHIC_OLE2_POPUP RID_APP_START+77 -#define RID_GRAPHIC_GROUPOBJ_POPUP RID_APP_START+78 -#define RID_GRAPHIC_3DOBJ_POPUP RID_APP_START+79 -#define RID_GRAPHIC_MEASUREOBJ_POPUP RID_APP_START+80 -#define RID_GRAPHIC_EDGEOBJ_POPUP RID_APP_START+81 -#define RID_GRAPHIC_POLYLINEOBJ_POPUP RID_APP_START+82 -#define RID_GRAPHIC_3DSCENE_POPUP RID_APP_START+83 -#define RID_GRAPHIC_3DSCENE2_POPUP RID_APP_START+84 -#define RID_GRAPHIC_CUSTOMSHAPE_POPUP RID_APP_START+85 -#define RID_GRAPHIC_MEDIA_POPUP RID_APP_START+86 +#define RID_GRAPHIC_TEXTOBJ_POPUP RID_APP_START+70 +#define RID_GRAPHIC_GEOMOBJ_POPUP RID_APP_START+71 +#define RID_GRAPHIC_NOSEL_POPUP RID_APP_START+72 +#define RID_GRAPHIC_LINEOBJ_POPUP RID_APP_START+73 +#define RID_GRAPHIC_MULTISELECTION_POPUP RID_APP_START+74 +#define RID_GRAPHIC_PAGETAB_POPUP RID_APP_START+75 +#define RID_GRAPHIC_GRAPHIC_POPUP RID_APP_START+76 +#define RID_GRAPHIC_OLE2_POPUP RID_APP_START+77 +#define RID_GRAPHIC_GROUPOBJ_POPUP RID_APP_START+78 +#define RID_GRAPHIC_3DOBJ_POPUP RID_APP_START+79 +#define RID_GRAPHIC_MEASUREOBJ_POPUP RID_APP_START+80 +#define RID_GRAPHIC_EDGEOBJ_POPUP RID_APP_START+81 +#define RID_GRAPHIC_POLYLINEOBJ_POPUP RID_APP_START+82 +#define RID_GRAPHIC_3DSCENE_POPUP RID_APP_START+83 +#define RID_GRAPHIC_3DSCENE2_POPUP RID_APP_START+84 +#define RID_GRAPHIC_CUSTOMSHAPE_POPUP RID_APP_START+85 +#define RID_GRAPHIC_MEDIA_POPUP RID_APP_START+86 #define RID_SLIDE_SORTER_DRAW_SEL_POPUP RID_APP_START+87 #define RID_SLIDE_SORTER_DRAW_NOSEL_POPUP RID_APP_START+88 #define RID_SLIDE_SORTER_MASTER_SEL_POPUP RID_APP_START+89 #define RID_SLIDE_SORTER_MASTER_NOSEL_POPUP RID_APP_START+90 -#define RID_DRAW_TABLE_POPUP RID_APP_START+91 -#define RID_GRAPHIC_TABLE_POPUP RID_APP_START+92 +#define RID_DRAW_TABLE_POPUP RID_APP_START+91 +#define RID_GRAPHIC_TABLE_POPUP RID_APP_START+92 -#define RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP RID_APP_START+93 +#define RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP RID_APP_START+93 -#define RID_DRAW_TABLEOBJ_INSIDE_POPUP RID_APP_START+94 +#define RID_DRAW_TABLEOBJ_INSIDE_POPUP RID_APP_START+94 /* * Pointer (Mauszeiger) */ -#define PTR_WATERCAN RID_APP_START+100 -#define PTR_PENCIL RID_APP_START+101 +#define PTR_WATERCAN RID_APP_START+100 +#define PTR_PENCIL RID_APP_START+101 /* * Globale Dialog-IDs */ -#define DLG_FONTWORK RID_APP_START+150 +#define DLG_FONTWORK RID_APP_START+150 /* - * ResourceIDs fuer Toolboxen nicht aendern, ohne die Strings in - * strings.hrc auf die selben IDs zu setzen (eine Toolbox und sein - * Konfigurationsstring muessen dieselbe ResourceID haben!). + * ResourceIDs fuer Toolboxen nicht aendern, ohne die Strings in + * strings.hrc auf die selben IDs zu setzen (eine Toolbox und sein + * Konfigurationsstring muessen dieselbe ResourceID haben!). */ // --> Jetzt in cfgids.hxx /* -#define _RID_DRAW_TOOLBOX RID_APP_START+200 -#define _RID_SLIDE_TOOLBOX RID_APP_START+201 -#define _RID_DRAW_OBJ_TOOLBOX RID_APP_START+202 -#define _RID_SLIDE_OBJ_TOOLBOX RID_APP_START+203 -#define _RID_BEZIER_TOOLBOX RID_APP_START+204 -#define _RID_TEXT_TOOLBOX RID_APP_START+205 -#define _RID_OUTLINE_TOOLBOX RID_APP_START+206 -#define _RID_DRAW_POLYLINEOBJ_POPUP RID_APP_START+207 -#define _RID_GLUEPOINTS_TOOLBOX RID_APP_START+208 +#define _RID_DRAW_TOOLBOX RID_APP_START+200 +#define _RID_SLIDE_TOOLBOX RID_APP_START+201 +#define _RID_DRAW_OBJ_TOOLBOX RID_APP_START+202 +#define _RID_SLIDE_OBJ_TOOLBOX RID_APP_START+203 +#define _RID_BEZIER_TOOLBOX RID_APP_START+204 +#define _RID_TEXT_TOOLBOX RID_APP_START+205 +#define _RID_OUTLINE_TOOLBOX RID_APP_START+206 +#define _RID_DRAW_POLYLINEOBJ_POPUP RID_APP_START+207 +#define _RID_GLUEPOINTS_TOOLBOX RID_APP_START+208 */ -#define RID_DRAW_SNAPOBJECT_POPUP RID_APP_START+390 -#define RID_DRAW_GLUEPOINT_POPUP RID_APP_START+392 -#define RID_DRAW_CONTROL_POPUP RID_APP_START+393 -#define RID_FORM_CONTROL_POPUP RID_APP_START+394 +#define RID_DRAW_SNAPOBJECT_POPUP RID_APP_START+390 +#define RID_DRAW_GLUEPOINT_POPUP RID_APP_START+392 +#define RID_DRAW_CONTROL_POPUP RID_APP_START+393 +#define RID_FORM_CONTROL_POPUP RID_APP_START+394 -#define RID_GRAPHICSTYLEFAMILY RID_APP_START+395 -#define RID_PRESENTATIONSTYLEFAMILY RID_APP_START+396 -#define RID_GRAPHICSCELLFAMILY RID_APP_START+397 +#define RID_GRAPHICSTYLEFAMILY RID_APP_START+395 +#define RID_PRESENTATIONSTYLEFAMILY RID_APP_START+396 +#define RID_GRAPHICSCELLFAMILY RID_APP_START+397 diff --git a/sd/source/ui/inc/sdpopup.hxx b/sd/source/ui/inc/sdpopup.hxx index 407d63ac4c8c..f6160bd30e0a 100644 --- a/sd/source/ui/inc/sdpopup.hxx +++ b/sd/source/ui/inc/sdpopup.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,19 +43,19 @@ class SvxFieldData; class SdFieldPopup : public PopupMenu { private: - const SvxFieldData* pField; + const SvxFieldData* pField; - void Fill( LanguageType eLanguage ); + void Fill( LanguageType eLanguage ); public: SdFieldPopup( const SvxFieldData* pInField, LanguageType eLanguage ); ~SdFieldPopup(); - //virtual void Select(); + //virtual void Select(); - SvxFieldData* GetField(); + SvxFieldData* GetField(); }; -#endif // _SD_SDPOPUP_HXX +#endif // _SD_SDPOPUP_HXX diff --git a/sd/source/ui/inc/sdpreslt.hrc b/sd/source/ui/inc/sdpreslt.hrc index 19c3ded484fb..a93c5ac6cacf 100644 --- a/sd/source/ui/inc/sdpreslt.hrc +++ b/sd/source/ui/inc/sdpreslt.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx index d3f2f5039526..ee299ce6c563 100644 --- a/sd/source/ui/inc/sdpreslt.hxx +++ b/sd/source/ui/inc/sdpreslt.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,13 +44,13 @@ class ViewShell; -class SdPresLayoutDlg +class SdPresLayoutDlg : public ModalDialog { public: SdPresLayoutDlg( - ::sd::DrawDocShell* pDocShell, - ::sd::ViewShell* pViewShell, + ::sd::DrawDocShell* pDocShell, + ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs); @@ -63,26 +63,26 @@ public: private: ::sd::DrawDocShell* mpDocSh; - ::sd::ViewShell* mpViewSh; - FixedText maFtLayout; + ::sd::ViewShell* mpViewSh; + FixedText maFtLayout; ValueSet maVS; - OKButton maBtnOK; - CancelButton maBtnCancel; - HelpButton maBtnHelp; - CheckBox maCbxMasterPage; - CheckBox maCbxCheckMasters; + OKButton maBtnOK; + CancelButton maBtnCancel; + HelpButton maBtnHelp; + CheckBox maCbxMasterPage; + CheckBox maCbxCheckMasters; PushButton maBtnLoad; - const SfxItemSet& mrOutAttrs; + const SfxItemSet& mrOutAttrs; List* mpLayoutNames; String maName; // Layoutname oder Dateiname - long mnLayoutCount; // Anzahl, der im Dokument vorhandenen MasterPages - const String maStrNone; + long mnLayoutCount; // Anzahl, der im Dokument vorhandenen MasterPages + const String maStrNone; void FillValueSet(); - void Reset(); + void Reset(); }; #endif diff --git a/sd/source/ui/inc/sdstring.hrc b/sd/source/ui/inc/sdstring.hrc index 0646da058faf..e9194a7be159 100644 --- a/sd/source/ui/inc/sdstring.hrc +++ b/sd/source/ui/inc/sdstring.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,11 +25,11 @@ * ************************************************************************/ #include <sfx2/sfx.hrc> -#define SID_SD_STRING_START RID_APP_START+300 +#define SID_SD_STRING_START RID_APP_START+300 // Texts for search and replace info and question boxes. #define STR_SAR_NOT_FOUND SID_SD_STRING_START+23 #define STR_SAR_WRAP_FORWARD SID_SD_STRING_START+24 #define STR_SAR_WRAP_BACKWARD SID_SD_STRING_START+25 -#define STR_SAR_WRAP_FORWARD_DRAW SID_SD_STRING_START+26 +#define STR_SAR_WRAP_FORWARD_DRAW SID_SD_STRING_START+26 #define STR_SAR_WRAP_BACKWARD_DRAW SID_SD_STRING_START+27 diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index dc98929a9ed1..4848c32a4509 100755 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ SV_DECL_REF(DrawDocShell) class SD_DLLPUBLIC SdPageObjsTLB : public SvTreeListBox { private: - + static BOOL SD_DLLPRIVATE bIsInDrag; // static, falls der Navigator im ExecuteDrag geloescht wird public: @@ -76,15 +76,15 @@ public: class SdPageObjsTransferable : public SdTransferable { public: - SdPageObjsTransferable( - SdPageObjsTLB& rParent, + SdPageObjsTransferable( + SdPageObjsTLB& rParent, const INetBookmark& rBookmark, ::sd::DrawDocShell& rDocShell, NavigatorDragType eDragType, const ::com::sun::star::uno::Any& rTreeListBoxData ); ::sd::DrawDocShell& GetDocShell() const; NavigatorDragType GetDragType() const; - + static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); static SdPageObjsTransferable* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw(); /** Return a temporary transferable data flavor that is used @@ -92,24 +92,24 @@ public: lifetime ends with the office application. */ static sal_uInt32 GetListBoxDropFormatId (void); - + private: /** Temporary drop flavor id that is used internally in the navigator. */ static sal_uInt32 mnListBoxDropFormatId; - SdPageObjsTLB& mrParent; - INetBookmark maBookmark; + SdPageObjsTLB& mrParent; + INetBookmark maBookmark; ::sd::DrawDocShell& mrDocShell; NavigatorDragType meDragType; const ::com::sun::star::uno::Any maTreeListBoxData; - SD_DLLPRIVATE virtual ~SdPageObjsTransferable(); - - SD_DLLPRIVATE virtual void AddSupportedFormats(); - SD_DLLPRIVATE virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - SD_DLLPRIVATE virtual void DragFinished( sal_Int8 nDropAction ); + SD_DLLPRIVATE virtual ~SdPageObjsTransferable(); + + SD_DLLPRIVATE virtual void AddSupportedFormats(); + SD_DLLPRIVATE virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + SD_DLLPRIVATE virtual void DragFinished( sal_Int8 nDropAction ); SD_DLLPRIVATE virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -128,35 +128,35 @@ public: bool PageBelongsToCurrentShow (const SdPage* pPage) const; protected: - - Window* mpParent; - const SdDrawDocument* mpDoc; - SdDrawDocument* mpBookmarkDoc; - SfxMedium* mpMedium; - SfxMedium* mpOwnMedium; - Image maImgOle; - Image maImgGraphic; - Image maImgOleH; - Image maImgGraphicH; + + Window* mpParent; + const SdDrawDocument* mpDoc; + SdDrawDocument* mpBookmarkDoc; + SfxMedium* mpMedium; + SfxMedium* mpOwnMedium; + Image maImgOle; + Image maImgGraphic; + Image maImgOleH; + Image maImgGraphicH; BOOL mbLinkableSelected; - BOOL mbDragEnabled; - String maDocName; - ::sd::DrawDocShellRef mxBookmarkDocShRef; // Zum Laden von Bookmarks - ::sd::DrawDocShell* mpDropDocSh; - SdNavigatorWin* mpDropNavWin; + BOOL mbDragEnabled; + String maDocName; + ::sd::DrawDocShellRef mxBookmarkDocShRef; // Zum Laden von Bookmarks + ::sd::DrawDocShell* mpDropDocSh; + SdNavigatorWin* mpDropNavWin; SfxViewFrame* mpFrame; - // DragSourceHelper - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + // DragSourceHelper + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); // DropTargetHelper - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - - virtual void RequestingChilds( SvLBoxEntry* pParent ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual void RequestingChilds( SvLBoxEntry* pParent ); + void DoDrag(); - void OnDragFinished( sal_uInt8 nDropAction ); + void OnDragFinished( sal_uInt8 nDropAction ); /** Return the name of the object. When the object has no user supplied name and the bCreate flag is <TRUE/> then a name is created @@ -174,7 +174,7 @@ protected: String GetObjectName ( const SdrObject* pObject, const bool bCreate = true) const; - void CloseBookmarkDoc(); + void CloseBookmarkDoc(); DECL_STATIC_LINK(SdPageObjsTLB, ExecDragHdl, void*); /** Handle the reordering of entries in the navigator. This method @@ -185,37 +185,37 @@ protected: SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& rpNewParent, - ULONG& rNewChildPos); - + ULONG& rNewChildPos); + using Window::GetDropTarget; virtual SvLBoxEntry* GetDropTarget (const Point& rLocation); public: - + SdPageObjsTLB( Window* pParent, const SdResId& rSdResId ); ~SdPageObjsTLB(); - virtual void SelectHdl(); - virtual void KeyInput( const KeyEvent& rKEvt ); - - void SetViewFrame( SfxViewFrame* pViewFrame ) { mpFrame = pViewFrame; } - SfxViewFrame* GetViewFrame() const { return mpFrame; } - - void Fill( const SdDrawDocument*, BOOL bAllPages, const String& rDocName ); - void Fill( const SdDrawDocument*, SfxMedium* pSfxMedium, const String& rDocName ); + virtual void SelectHdl(); + virtual void KeyInput( const KeyEvent& rKEvt ); + + void SetViewFrame( SfxViewFrame* pViewFrame ) { mpFrame = pViewFrame; } + SfxViewFrame* GetViewFrame() const { return mpFrame; } + + void Fill( const SdDrawDocument*, BOOL bAllPages, const String& rDocName ); + void Fill( const SdDrawDocument*, SfxMedium* pSfxMedium, const String& rDocName ); void SetShowAllShapes (const bool bShowAllShapes, const bool bFill); bool GetShowAllShapes (void) const; - BOOL IsEqualToDoc( const SdDrawDocument* pInDoc = NULL ); - BOOL HasSelectedChilds( const String& rName ); - BOOL SelectEntry( const String& rName ); - String GetSelectEntry(); - List* GetSelectEntryList( USHORT nDepth ); - SdDrawDocument* GetBookmarkDoc(SfxMedium* pMedium = NULL); - ::sd::DrawDocShell* GetDropDocSh() { return(mpDropDocSh); } - + BOOL IsEqualToDoc( const SdDrawDocument* pInDoc = NULL ); + BOOL HasSelectedChilds( const String& rName ); + BOOL SelectEntry( const String& rName ); + String GetSelectEntry(); + List* GetSelectEntryList( USHORT nDepth ); + SdDrawDocument* GetBookmarkDoc(SfxMedium* pMedium = NULL); + ::sd::DrawDocShell* GetDropDocSh() { return(mpDropDocSh); } + BOOL IsLinkableSelected() const { return mbLinkableSelected; } - - static BOOL IsInDrag(); + + static BOOL IsInDrag(); using SvLBox::ExecuteDrop; private: @@ -268,4 +268,4 @@ private: SdrObject& rObject) const; }; -#endif // _SDTREELB_HXX +#endif // _SDTREELB_HXX diff --git a/sd/source/ui/inc/sdundogr.hxx b/sd/source/ui/inc/sdundogr.hxx index f02977234475..436b9616fec1 100755 --- a/sd/source/ui/inc/sdundogr.hxx +++ b/sd/source/ui/inc/sdundogr.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,22 +34,22 @@ class SD_DLLPUBLIC SdUndoGroup : public SdUndoAction { - Container aCtn; + Container aCtn; public: TYPEINFO(); SdUndoGroup(SdDrawDocument* pSdDrawDocument) : SdUndoAction(pSdDrawDocument), aCtn(16, 16, 16) {} - virtual ~SdUndoGroup(); + virtual ~SdUndoGroup(); virtual BOOL Merge( SfxUndoAction* pNextAction ); virtual void Undo(); virtual void Redo(); - void AddAction(SdUndoAction* pAction); - ULONG Count() const { return aCtn.Count(); } + void AddAction(SdUndoAction* pAction); + ULONG Count() const { return aCtn.Count(); } }; -#endif // _SD_SDUNDOGR_HXX +#endif // _SD_SDUNDOGR_HXX diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index d79e5d653ab4..d54aa00c9b4c 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,79 +59,79 @@ public: void SetDocShell( const SfxObjectShellRef& rRef ) { maDocShellRef = rRef; } const SfxObjectShellRef& GetDocShell() const { return maDocShellRef; } - void SetWorkDocument( const SdDrawDocument* pWorkDoc ) { mpSdDrawDocument = mpSdDrawDocumentIntern = (SdDrawDocument*) pWorkDoc; } - const SdDrawDocument* GetWorkDocument() const { return mpSdDrawDocument; } + void SetWorkDocument( const SdDrawDocument* pWorkDoc ) { mpSdDrawDocument = mpSdDrawDocumentIntern = (SdDrawDocument*) pWorkDoc; } + const SdDrawDocument* GetWorkDocument() const { return mpSdDrawDocument; } - void SetView( const ::sd::View* pView ) { mpSdView = pView; } - const ::sd::View* GetView() const { return mpSdView; } + void SetView( const ::sd::View* pView ) { mpSdView = pView; } + const ::sd::View* GetView() const { return mpSdView; } - void SetObjectDescriptor( const TransferableObjectDescriptor& rObjDesc ); + void SetObjectDescriptor( const TransferableObjectDescriptor& rObjDesc ); - void SetStartPos( const Point& rStartPos ) { maStartPos = rStartPos; } - const Point& GetStartPos() const { return maStartPos; } + void SetStartPos( const Point& rStartPos ) { maStartPos = rStartPos; } + const Point& GetStartPos() const { return maStartPos; } - void SetInternalMove( BOOL bSet ) { mbInternalMove = bSet; } - BOOL IsInternalMove() const { return mbInternalMove; } + void SetInternalMove( BOOL bSet ) { mbInternalMove = bSet; } + BOOL IsInternalMove() const { return mbInternalMove; } - BOOL HasSourceDoc( const SdDrawDocument* pDoc ) const { return( mpSourceDoc == pDoc ); } + BOOL HasSourceDoc( const SdDrawDocument* pDoc ) const { return( mpSourceDoc == pDoc ); } - void SetPageBookmarks( const List& rPageBookmarks, BOOL bPersistent ); + void SetPageBookmarks( const List& rPageBookmarks, BOOL bPersistent ); BOOL IsPageTransferable() const { return mbPageTransferable; } BOOL HasPageBookmarks() const { return( mpPageDocShell && ( maPageBookmarks.Count() > 0 ) ); } const List& GetPageBookmarks() const { return maPageBookmarks; } - ::sd::DrawDocShell* GetPageDocShell() const { return mpPageDocShell; } + ::sd::DrawDocShell* GetPageDocShell() const { return mpPageDocShell; } - sal_Bool SetTableRTF( SdDrawDocument*, const ::com::sun::star::datatransfer::DataFlavor& ); + sal_Bool SetTableRTF( SdDrawDocument*, const ::com::sun::star::datatransfer::DataFlavor& ); static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); static SdTransferable* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw(); // SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); protected: - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void DragFinished( sal_Int8 nDropAction ); - virtual void ObjectReleased(); + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void DragFinished( sal_Int8 nDropAction ); + virtual void ObjectReleased(); virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException ); private: - SfxObjectShellRef maDocShellRef; - ::sd::DrawDocShell* mpPageDocShell; + SfxObjectShellRef maDocShellRef; + ::sd::DrawDocShell* mpPageDocShell; List maPageBookmarks; - TransferableDataHelper* mpOLEDataHelper; - TransferableObjectDescriptor* mpObjDesc; - const ::sd::View* mpSdView; - ::sd::View* mpSdViewIntern; - SdDrawDocument* mpSdDrawDocument; - SdDrawDocument* mpSdDrawDocumentIntern; - SdDrawDocument* mpSourceDoc; - VirtualDevice* mpVDev; - INetBookmark* mpBookmark; - Graphic* mpGraphic; - ImageMap* mpImageMap; - Rectangle maVisArea; - Point maStartPos; - BOOL mbInternalMove : 1; - BOOL mbOwnDocument : 1; - BOOL mbOwnView : 1; - BOOL mbLateInit : 1; + TransferableDataHelper* mpOLEDataHelper; + TransferableObjectDescriptor* mpObjDesc; + const ::sd::View* mpSdView; + ::sd::View* mpSdViewIntern; + SdDrawDocument* mpSdDrawDocument; + SdDrawDocument* mpSdDrawDocumentIntern; + SdDrawDocument* mpSourceDoc; + VirtualDevice* mpVDev; + INetBookmark* mpBookmark; + Graphic* mpGraphic; + ImageMap* mpImageMap; + Rectangle maVisArea; + Point maStartPos; + BOOL mbInternalMove : 1; + BOOL mbOwnDocument : 1; + BOOL mbOwnView : 1; + BOOL mbLateInit : 1; BOOL mbPageTransferable : 1; BOOL mbPageTransferablePersistent : 1; - bool mbIsUnoObj : 1; + bool mbIsUnoObj : 1; // not available SdTransferable(); SdTransferable( const SdTransferable& ); - SdTransferable& operator=( const SdTransferable& ); + SdTransferable& operator=( const SdTransferable& ); - void CreateObjectReplacement( SdrObject* pObj ); - void CreateData(); + void CreateObjectReplacement( SdrObject* pObj ); + void CreateData(); }; diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index eda80feeb825..ac56511ead5c 100755 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ #include <boost/shared_ptr.hpp> namespace com { namespace sun { namespace star { - + namespace drawing { class XDrawPage; } @@ -64,10 +64,10 @@ class Window; class SfxRequest; // TODO: Remove -#define PAGE_NO_END 65535 -#define PAGE_NO_SOFTEND (PAGE_NO_END - 1) -#define PAGE_NO_PAUSE (PAGE_NO_SOFTEND - 1) -#define PAGE_NO_FIRSTDEF PAGE_NO_PAUSE // immer mit anpassen +#define PAGE_NO_END 65535 +#define PAGE_NO_SOFTEND (PAGE_NO_END - 1) +#define PAGE_NO_PAUSE (PAGE_NO_SOFTEND - 1) +#define PAGE_NO_FIRSTDEF PAGE_NO_PAUSE // immer mit anpassen /* Definition of SlideShow class */ @@ -122,7 +122,7 @@ public: // helper api - bool startPreview( + bool startPreview( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAnimationNode, ::Window* pParent = 0 ); @@ -157,10 +157,10 @@ public: // legacy api - // actions - void jumpToPageNumber( sal_Int32 nPage ); // a.k.a. FuSlideShow::JumpToPage() + // actions + void jumpToPageNumber( sal_Int32 nPage ); // a.k.a. FuSlideShow::JumpToPage() void jumpToPageIndex( sal_Int32 nIndex ); - void jumpToBookmark( const ::rtl::OUString& sBookmark ); // a.k.a. FuSlideShow::JumpToBookmark() + void jumpToBookmark( const ::rtl::OUString& sBookmark ); // a.k.a. FuSlideShow::JumpToBookmark() /** sets or clears the pause state of the running slideshow. !!!! This should only be called by the SdShowWindow !!!!*/ @@ -168,11 +168,11 @@ public: // settings - bool isFullScreen(); // a.k.a. FuSlideShow::IsFullScreen() - bool isAlwaysOnTop(); // a.k.a. FuSlideShow::IsAlwaysOnTop(); - ShowWindow* getShowWindow(); // a.k.a. FuSlideShow::GetShowWindow() - int getAnimationMode(); // a.k.a. FuSlideShow::GetAnimationMode() - sal_Int32 getCurrentPageNumber(); // a.k.a. FuSlideShow::GetCurrentPage() + bool isFullScreen(); // a.k.a. FuSlideShow::IsFullScreen() + bool isAlwaysOnTop(); // a.k.a. FuSlideShow::IsAlwaysOnTop(); + ShowWindow* getShowWindow(); // a.k.a. FuSlideShow::GetShowWindow() + int getAnimationMode(); // a.k.a. FuSlideShow::GetAnimationMode() + sal_Int32 getCurrentPageNumber(); // a.k.a. FuSlideShow::GetCurrentPage() sal_Int32 getFirstPageNumber(); sal_Int32 getLastPageNumber(); bool isEndless(); @@ -185,7 +185,7 @@ public: void paint( const Rectangle& rRect ); bool keyInput(const KeyEvent& rKEvt); - + void receiveRequest(SfxRequest& rReq); bool dependsOn( ViewShellBase* pViewShellBase ); @@ -209,7 +209,7 @@ private: SlideShow(const SlideShow&); SlideShow& operator=( const SlideShow& ); - SvxItemPropertySet maPropSet; + SvxItemPropertySet maPropSet; rtl::Reference< SlideshowImpl > mxController; /** This flag is used together with mxController.is() to prevent @@ -224,7 +224,7 @@ private: ViewShellBase* mpCurrentViewShellBase; ViewShellBase* mpFullScreenViewShellBase; FrameView* mpFullScreenFrameView; - sal_Int32 mnInPlaceConfigEvent; + sal_Int32 mnInPlaceConfigEvent; }; } diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx index 15544c2b5221..821521555894 100755 --- a/sd/source/ui/inc/smarttag.hxx +++ b/sd/source/ui/inc/smarttag.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ public: virtual bool MouseButtonDown( const MouseEvent&, SmartHdl& ); /** returns true if the SmartTag consumes this event. */ - virtual bool KeyInput( const KeyEvent& rKEvt ); + virtual bool KeyInput( const KeyEvent& rKEvt ); /** returns true if the SmartTag consumes this event. */ virtual bool RequestHelp( const HelpEvent& rHEvt ); @@ -93,8 +93,8 @@ protected: bool mbSelected; private: - SmartTag( const SmartTag& ); // not implemented - SmartTag& operator=( const SmartTag& ); // not implemented + SmartTag( const SmartTag& ); // not implemented + SmartTag& operator=( const SmartTag& ); // not implemented }; typedef rtl::Reference< SmartTag > SmartTagReference; @@ -120,7 +120,7 @@ public: bool MouseButtonDown( const MouseEvent& ); /** returns true if a SmartTag consumes this event. */ - bool KeyInput( const KeyEvent& rKEvt ); + bool KeyInput( const KeyEvent& rKEvt ); /** returns true if a SmartTag consumes this event. */ bool RequestHelp( const HelpEvent& rHEvt ); @@ -150,8 +150,8 @@ public: void CheckPossibilities(); private: - SmartTagSet( const SmartTagSet& ); // not implemented - SmartTagSet& operator=( const SmartTagSet& ); // not implemented + SmartTagSet( const SmartTagSet& ); // not implemented + SmartTagSet& operator=( const SmartTagSet& ); // not implemented /** adds a new smart tag to this set */ void add( const SmartTagReference& xTag ); @@ -184,5 +184,5 @@ protected: } // end of namespace sd -#endif // _SD_SMARTTAG_HXX_ +#endif // _SD_SMARTTAG_HXX_ diff --git a/sd/source/ui/inc/sprite.hxx b/sd/source/ui/inc/sprite.hxx index 782e4ed0fb4a..50f7dd369dee 100644 --- a/sd/source/ui/inc/sprite.hxx +++ b/sd/source/ui/inc/sprite.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,36 +50,36 @@ public: Sprite( List* pListOfBmpEx ); ~Sprite(); - BOOL StartMoving( OutputDevice* pOut, + BOOL StartMoving( OutputDevice* pOut, OutputDevice* pBottomLayer = NULL, BitmapEx* pTopLayer = NULL, - MetaFile** ppTopMtf = NULL, + MetaFile** ppTopMtf = NULL, Marker* pObjStartMarker = NULL, Marker* pObjEndMarker = NULL ); - void MoveTo( OutputDevice* pOut, const Point& rPt, const Size* pSz = NULL ); - void MoveTo( OutputDevice* pOut, const Point& rPt, const double& rScaleX, const double& rScaleY ); - void EndMoving( OutputDevice* pOut ); + void MoveTo( OutputDevice* pOut, const Point& rPt, const Size* pSz = NULL ); + void MoveTo( OutputDevice* pOut, const Point& rPt, const double& rScaleX, const double& rScaleY ); + void EndMoving( OutputDevice* pOut ); protected: - MapMode aOldMap; - Region aOldClip; - Rectangle aPaintRect; - Point aPt; - Size aSz; - Point aLayerOffsetPix; - VirtualDevice* pPaintDev; - VirtualDevice* pBottomLayer; - BitmapEx* pActBmpEx; - BitmapEx* pTopLayer; - MetaFile** ppTopMtf; - Marker* pObjStartMarker; - Marker* pObjEndMarker; - List* pListOfBmpEx; - ULONG nLastTime; - BOOL bClipRegion; + MapMode aOldMap; + Region aOldClip; + Rectangle aPaintRect; + Point aPt; + Size aSz; + Point aLayerOffsetPix; + VirtualDevice* pPaintDev; + VirtualDevice* pBottomLayer; + BitmapEx* pActBmpEx; + BitmapEx* pTopLayer; + MetaFile** ppTopMtf; + Marker* pObjStartMarker; + Marker* pObjEndMarker; + List* pListOfBmpEx; + ULONG nLastTime; + BOOL bClipRegion; - BOOL ImplPrepareMoveTo(); - void ImplDrawSprite( OutputDevice* pOut, const Point& rPt, const Size& rSz ); + BOOL ImplPrepareMoveTo(); + void ImplDrawSprite( OutputDevice* pOut, const Point& rPt, const Size& rSz ); }; diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc index d9dc93a1ef20..41b27b4b812c 100755 --- a/sd/source/ui/inc/strings.hrc +++ b/sd/source/ui/inc/strings.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,62 +28,62 @@ #ifndef _SD_CFGID_HXX #include "cfgids.hxx" #endif -#define STR_DEFAULTVIEW (RID_APP_START) -#define STR_NULL (RID_APP_START+3) -#define STR_INSERTPAGE (RID_APP_START+35) -#define STR_INSERTLAYER (RID_APP_START+37) -#define STR_MODIFYLAYER (RID_APP_START+38) -#define STR_UNDO_SLIDE_MOVE (RID_APP_START+41) -#define STR_UNDO_REPLACE (RID_APP_START+42) +#define STR_DEFAULTVIEW (RID_APP_START) +#define STR_NULL (RID_APP_START+3) +#define STR_INSERTPAGE (RID_APP_START+35) +#define STR_INSERTLAYER (RID_APP_START+37) +#define STR_MODIFYLAYER (RID_APP_START+38) +#define STR_UNDO_SLIDE_MOVE (RID_APP_START+41) +#define STR_UNDO_REPLACE (RID_APP_START+42) /* - * Dummy-Strings, diese ResourceIDs duerfen nicht an andere Strings vergeben - * werden, da sie fuer Popup-Menues benutzt werden (ein Popup-Menue und sein - * Konfigurationsstring muessen dieselbe ResourceID haben!). - * siehe auch: res_bmp.hrc, popup.src + * Dummy-Strings, diese ResourceIDs duerfen nicht an andere Strings vergeben + * werden, da sie fuer Popup-Menues benutzt werden (ein Popup-Menue und sein + * Konfigurationsstring muessen dieselbe ResourceID haben!). + * siehe auch: res_bmp.hrc, popup.src */ -#define STR_DRAW_TEXTOBJ_POPUP (RID_APP_START+43) -#define STR_DRAW_GEOMOBJ_POPUP (RID_APP_START+44) -#define STR_DRAW_NOSEL_POPUP (RID_APP_START+45) -#define STR_SLIDETABLE_POPUP (RID_APP_START+46) -#define STR_BEZIER_POPUP (RID_APP_START+47) -#define STR_DRAW_LINEOBJ_POPUP (RID_APP_START+48) -#define STR_DRAW_MULTISELECTION_POPUP (RID_APP_START+49) -#define STR_PAGETAB_POPUP (RID_APP_START+50) -#define STR_LAYERTAB_POPUP (RID_APP_START+51) -#define STR_DRAW_GRAPHIC_POPUP (RID_APP_START+52) -#define STR_DRAW_OLE2_POPUP (RID_APP_START+53) -#define STR_DRAW_TEXTOBJ_INSIDE_POPUP (RID_APP_START+54) -#define STR_SLIDE_NOSEL_POPUP (RID_APP_START+55) -#define STR_OUTLINE_POPUP (RID_APP_START+56) -#define STR_MASTERPAGE_POPUP (RID_APP_START+57) -#define STR_DRAW_GROUPOBJ_POPUP (RID_APP_START+58) - -#define STR_UNDO_CUT (RID_APP_START+59) -#define STR_UNDO_DRAGDROP (RID_APP_START+66) -#define STR_INSERTGRAPHIC (RID_APP_START+67) +#define STR_DRAW_TEXTOBJ_POPUP (RID_APP_START+43) +#define STR_DRAW_GEOMOBJ_POPUP (RID_APP_START+44) +#define STR_DRAW_NOSEL_POPUP (RID_APP_START+45) +#define STR_SLIDETABLE_POPUP (RID_APP_START+46) +#define STR_BEZIER_POPUP (RID_APP_START+47) +#define STR_DRAW_LINEOBJ_POPUP (RID_APP_START+48) +#define STR_DRAW_MULTISELECTION_POPUP (RID_APP_START+49) +#define STR_PAGETAB_POPUP (RID_APP_START+50) +#define STR_LAYERTAB_POPUP (RID_APP_START+51) +#define STR_DRAW_GRAPHIC_POPUP (RID_APP_START+52) +#define STR_DRAW_OLE2_POPUP (RID_APP_START+53) +#define STR_DRAW_TEXTOBJ_INSIDE_POPUP (RID_APP_START+54) +#define STR_SLIDE_NOSEL_POPUP (RID_APP_START+55) +#define STR_OUTLINE_POPUP (RID_APP_START+56) +#define STR_MASTERPAGE_POPUP (RID_APP_START+57) +#define STR_DRAW_GROUPOBJ_POPUP (RID_APP_START+58) + +#define STR_UNDO_CUT (RID_APP_START+59) +#define STR_UNDO_DRAGDROP (RID_APP_START+66) +#define STR_INSERTGRAPHIC (RID_APP_START+67) /* * Ueberblendeffekte: sollten nach hinten offen bleiben, * da FadeEffectLB mit variabler Anzahl arbeitet * (Jetzt ueber STR_EFFECT_...) */ -#define STR_DRAGTYPE_URL (RID_APP_START+70) -#define STR_DRAGTYPE_EMBEDDED (RID_APP_START+71) -#define STR_DRAGTYPE_LINK (RID_APP_START+72) -#define STR_GLUE_ESCDIR_SMART (RID_APP_START+73) -#define STR_GLUE_ESCDIR_LEFT (RID_APP_START+74) -#define STR_GLUE_ESCDIR_RIGHT (RID_APP_START+75) -#define STR_GLUE_ESCDIR_TOP (RID_APP_START+76) -#define STR_GLUE_ESCDIR_BOTTOM (RID_APP_START+77) -#define STR_GLUE_ESCDIR_LO (RID_APP_START+78) -#define STR_GLUE_ESCDIR_LU (RID_APP_START+79) -#define STR_GLUE_ESCDIR_RO (RID_APP_START+80) -#define STR_GLUE_ESCDIR_RU (RID_APP_START+81) -#define STR_GLUE_ESCDIR_HORZ (RID_APP_START+82) -#define STR_GLUE_ESCDIR_VERT (RID_APP_START+83) -#define STR_GLUE_ESCDIR_ALL (RID_APP_START+84) +#define STR_DRAGTYPE_URL (RID_APP_START+70) +#define STR_DRAGTYPE_EMBEDDED (RID_APP_START+71) +#define STR_DRAGTYPE_LINK (RID_APP_START+72) +#define STR_GLUE_ESCDIR_SMART (RID_APP_START+73) +#define STR_GLUE_ESCDIR_LEFT (RID_APP_START+74) +#define STR_GLUE_ESCDIR_RIGHT (RID_APP_START+75) +#define STR_GLUE_ESCDIR_TOP (RID_APP_START+76) +#define STR_GLUE_ESCDIR_BOTTOM (RID_APP_START+77) +#define STR_GLUE_ESCDIR_LO (RID_APP_START+78) +#define STR_GLUE_ESCDIR_LU (RID_APP_START+79) +#define STR_GLUE_ESCDIR_RO (RID_APP_START+80) +#define STR_GLUE_ESCDIR_RU (RID_APP_START+81) +#define STR_GLUE_ESCDIR_HORZ (RID_APP_START+82) +#define STR_GLUE_ESCDIR_VERT (RID_APP_START+83) +#define STR_GLUE_ESCDIR_ALL (RID_APP_START+84) #define STR_CANT_PERFORM_IN_LIVEMODE (RID_APP_START+85) #define STR_PUBLISH_BACK (RID_APP_START+86) @@ -92,218 +92,218 @@ #define STR_UNDO_COLORRESOLUTION (RID_APP_START+89) /* Von 90 - 100 fuer Popups freihalten */ -#define STR_DRAW_3DOBJ_POPUP (RID_APP_START+90) -#define STR_DRAW_MEASUREOBJ_POPUP (RID_APP_START+91) +#define STR_DRAW_3DOBJ_POPUP (RID_APP_START+90) +#define STR_DRAW_MEASUREOBJ_POPUP (RID_APP_START+91) #define STR_ASK_DELETE_ALL_PICTURES (RID_APP_START+92) #define STR_WARN_PAGE_EXISTS (RID_APP_START+93) -#define STR_SLOW (RID_APP_START+112) -#define STR_MEDIUM (RID_APP_START+113) -#define STR_FAST (RID_APP_START+114) +#define STR_SLOW (RID_APP_START+112) +#define STR_MEDIUM (RID_APP_START+113) +#define STR_FAST (RID_APP_START+114) -#define STR_SLIDE_MODE (RID_APP_START+121) -#define STR_DRAW_MODE (RID_APP_START+122) -#define STR_OUTLINE_MODE (RID_APP_START+123) +#define STR_SLIDE_MODE (RID_APP_START+121) +#define STR_DRAW_MODE (RID_APP_START+122) +#define STR_OUTLINE_MODE (RID_APP_START+123) -#define STR_UNDO_BEZCLOSE (RID_APP_START+127) +#define STR_UNDO_BEZCLOSE (RID_APP_START+127) #define STR_END_SPELLING_OBJ (RID_APP_START+129) -#define STR_NOTES_MODE (RID_APP_START+135) -#define STR_HANDOUT_MODE (RID_APP_START+136) +#define STR_NOTES_MODE (RID_APP_START+135) +#define STR_HANDOUT_MODE (RID_APP_START+136) -#define STR_LINEEND (RID_APP_START+137) -#define STR_DESC_LINEEND (RID_APP_START+138) -#define STR_WARN_NAME_DUPLICATE (RID_APP_START+139) -#define STR_UNDO_COPYOBJECTS (RID_APP_START+140) -#define STR_DESC_NAMEGROUP (RID_APP_START+141) -#define STR_TITLE_NAMEGROUP (RID_APP_START+143) +#define STR_LINEEND (RID_APP_START+137) +#define STR_DESC_LINEEND (RID_APP_START+138) +#define STR_WARN_NAME_DUPLICATE (RID_APP_START+139) +#define STR_UNDO_COPYOBJECTS (RID_APP_START+140) +#define STR_DESC_NAMEGROUP (RID_APP_START+141) +#define STR_TITLE_NAMEGROUP (RID_APP_START+143) -#define STR_SNAPDLG_SETLINE (RID_APP_START+144) -#define STR_SNAPDLG_SETPOINT (RID_APP_START+145) -#define STR_POPUP_EDIT_SNAPLINE (RID_APP_START+146) -#define STR_POPUP_EDIT_SNAPPOINT (RID_APP_START+147) +#define STR_SNAPDLG_SETLINE (RID_APP_START+144) +#define STR_SNAPDLG_SETPOINT (RID_APP_START+145) +#define STR_POPUP_EDIT_SNAPLINE (RID_APP_START+146) +#define STR_POPUP_EDIT_SNAPPOINT (RID_APP_START+147) #define STR_IMPRESS (RID_APP_START+149) #define STR_IMPRESS_DOCUMENT (RID_APP_START+154) -#define STR_LAYER (RID_APP_START+158) +#define STR_LAYER (RID_APP_START+158) // #define (RID_APP_START+159) -#define STR_POPUP_DELETE_SNAPLINE (RID_APP_START+160) -#define STR_POPUP_DELETE_SNAPPOINT (RID_APP_START+161) +#define STR_POPUP_DELETE_SNAPLINE (RID_APP_START+160) +#define STR_POPUP_DELETE_SNAPPOINT (RID_APP_START+161) -#define STR_SCALE_OBJS_TO_PAGE (RID_APP_START+162) +#define STR_SCALE_OBJS_TO_PAGE (RID_APP_START+162) -#define STR_EYEDROPPER (RID_APP_START+163) +#define STR_EYEDROPPER (RID_APP_START+163) -#define STR_UNDO_MORPHING (RID_APP_START+164) +#define STR_UNDO_MORPHING (RID_APP_START+164) #define STR_IMPRESS_DOCUMENT_FULLTYPE_60 (RID_APP_START+170) /* - * ResourceIDs fuer Toolboxen nicht aendern, ohne die Strings in - * strings.hrc auf die selben IDs zu setzen (eine Toolbox und sein - * Konfigurationsstring muessen dieselbe ResourceID haben!). + * ResourceIDs fuer Toolboxen nicht aendern, ohne die Strings in + * strings.hrc auf die selben IDs zu setzen (eine Toolbox und sein + * Konfigurationsstring muessen dieselbe ResourceID haben!). */ -#define STR_PLUGIN_TOOLBOX RID_PLUGINTOOLBOX -#define STR_DRAW_TOOLBOX RID_DRAW_TOOLBOX -#define STR_SLIDE_TOOLBOX RID_SLIDE_TOOLBOX -#define STR_DRAW_OBJ_TOOLBOX RID_DRAW_OBJ_TOOLBOX -#define STR_SLIDE_OBJ_TOOLBOX RID_SLIDE_OBJ_TOOLBOX -#define STR_BEZIER_TOOLBOX RID_BEZIER_TOOLBOX -#define STR_DRAW_TEXT_TOOLBOX RID_DRAW_TEXT_TOOLBOX -#define STR_DRAW_TABLE_TOOLBOX RID_DRAW_TABLE_TOOLBOX -#define STR_OUTLINE_TOOLBOX RID_OUTLINE_TOOLBOX -#define STR_DRAW_POLYLINEOBJ_POPUP RID_DRAW_POLYLINEOBJ_POPUP -#define STR_GLUEPOINTS_TOOLBOX RID_GLUEPOINTS_TOOLBOX -#define STR_DRAW_OPTIONS_TOOLBOX RID_DRAW_OPTIONS_TOOLBOX -#define STR_DRAW_COMMONTASK_TOOLBOX RID_DRAW_COMMONTASK_TOOLBOX - -#define STR_GRAPHIC_TOOLBOX RID_GRAPHIC_TOOLBOX -#define STR_GRAPHIC_OPTIONS_TOOLBOX RID_GRAPHIC_OPTIONS_TOOLBOX -#define STR_GRAPHIC_OBJ_TOOLBOX RID_GRAPHIC_OBJ_TOOLBOX +#define STR_PLUGIN_TOOLBOX RID_PLUGINTOOLBOX +#define STR_DRAW_TOOLBOX RID_DRAW_TOOLBOX +#define STR_SLIDE_TOOLBOX RID_SLIDE_TOOLBOX +#define STR_DRAW_OBJ_TOOLBOX RID_DRAW_OBJ_TOOLBOX +#define STR_SLIDE_OBJ_TOOLBOX RID_SLIDE_OBJ_TOOLBOX +#define STR_BEZIER_TOOLBOX RID_BEZIER_TOOLBOX +#define STR_DRAW_TEXT_TOOLBOX RID_DRAW_TEXT_TOOLBOX +#define STR_DRAW_TABLE_TOOLBOX RID_DRAW_TABLE_TOOLBOX +#define STR_OUTLINE_TOOLBOX RID_OUTLINE_TOOLBOX +#define STR_DRAW_POLYLINEOBJ_POPUP RID_DRAW_POLYLINEOBJ_POPUP +#define STR_GLUEPOINTS_TOOLBOX RID_GLUEPOINTS_TOOLBOX +#define STR_DRAW_OPTIONS_TOOLBOX RID_DRAW_OPTIONS_TOOLBOX +#define STR_DRAW_COMMONTASK_TOOLBOX RID_DRAW_COMMONTASK_TOOLBOX + +#define STR_GRAPHIC_TOOLBOX RID_GRAPHIC_TOOLBOX +#define STR_GRAPHIC_OPTIONS_TOOLBOX RID_GRAPHIC_OPTIONS_TOOLBOX +#define STR_GRAPHIC_OBJ_TOOLBOX RID_GRAPHIC_OBJ_TOOLBOX #define STR_GRAPHIC_TEXT_TOOLBOX RID_GRAPHIC_TEXT_TOOLBOX -#define STR_DRAW_GRAF_TOOLBOX RID_DRAW_GRAF_TOOLBOX -#define STR_DRAW_MEDIA_TOOLBOX RID_DRAW_MEDIA_TOOLBOX +#define STR_DRAW_GRAF_TOOLBOX RID_DRAW_GRAF_TOOLBOX +#define STR_DRAW_MEDIA_TOOLBOX RID_DRAW_MEDIA_TOOLBOX // IDs fuer Praesentationsfolien -#define STR_AUTOLAYOUT_NONE (RID_APP_START+210) -#define STR_AUTOLAYOUT_ONLY_TITLE (RID_APP_START+211) -#define STR_AUTOLAYOUT_ONLY_TEXT (RID_APP_START+212) -#define STR_AUTOLAYOUT_TITLE (RID_APP_START+213) -#define STR_AUTOLAYOUT_CONTENT (RID_APP_START+214) -#define STR_AUTOLAYOUT_2CONTENT (RID_APP_START+215) -#define STR_AUTOLAYOUT_CONTENT_2CONTENT (RID_APP_START+217) -#define STR_AUTOLAYOUT_2CONTENT_CONTENT (RID_APP_START+218) -#define STR_AUTOLAYOUT_CONTENT_OVER_2CONTENT (RID_APP_START+219) -#define STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT (RID_APP_START+220) -#define STR_AUTOLAYOUT_CONTENT_OVER_CONTENT (RID_APP_START+221) -#define STR_AUTOLAYOUT_4CONTENT (RID_APP_START+222) -#define STR_AUTOLAYOUT_6CONTENT (RID_APP_START+223) - -#define STR_AUTOLAYOUT_HANDOUT1 (RID_APP_START+231) -#define STR_AUTOLAYOUT_HANDOUT2 (RID_APP_START+232) -#define STR_AUTOLAYOUT_HANDOUT3 (RID_APP_START+233) -#define STR_AUTOLAYOUT_HANDOUT4 (RID_APP_START+234) -#define STR_AUTOLAYOUT_HANDOUT6 (RID_APP_START+235) -#define STR_AUTOLAYOUT_NOTES (RID_APP_START+236) -#define STR_AUTOLAYOUT_HANDOUT9 (RID_APP_START+237) - -#define STR_TRANSFORM (RID_APP_START+240) - -#define STR_EXPORT_HTML_NAME (RID_APP_START+244) -#define STR_EXPORT_HTML_FILTER (RID_APP_START+245) -#define STR_EXPORT_DIALOG_TITLE (RID_APP_START+261) -#define STR_TWAIN_NO_SOURCE_UNX (RID_APP_START+262) -#define STR_UNDO_DELETEPAGES (RID_APP_START+265) -#define STR_UNDO_INSERTPAGES (RID_APP_START+266) +#define STR_AUTOLAYOUT_NONE (RID_APP_START+210) +#define STR_AUTOLAYOUT_ONLY_TITLE (RID_APP_START+211) +#define STR_AUTOLAYOUT_ONLY_TEXT (RID_APP_START+212) +#define STR_AUTOLAYOUT_TITLE (RID_APP_START+213) +#define STR_AUTOLAYOUT_CONTENT (RID_APP_START+214) +#define STR_AUTOLAYOUT_2CONTENT (RID_APP_START+215) +#define STR_AUTOLAYOUT_CONTENT_2CONTENT (RID_APP_START+217) +#define STR_AUTOLAYOUT_2CONTENT_CONTENT (RID_APP_START+218) +#define STR_AUTOLAYOUT_CONTENT_OVER_2CONTENT (RID_APP_START+219) +#define STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT (RID_APP_START+220) +#define STR_AUTOLAYOUT_CONTENT_OVER_CONTENT (RID_APP_START+221) +#define STR_AUTOLAYOUT_4CONTENT (RID_APP_START+222) +#define STR_AUTOLAYOUT_6CONTENT (RID_APP_START+223) + +#define STR_AUTOLAYOUT_HANDOUT1 (RID_APP_START+231) +#define STR_AUTOLAYOUT_HANDOUT2 (RID_APP_START+232) +#define STR_AUTOLAYOUT_HANDOUT3 (RID_APP_START+233) +#define STR_AUTOLAYOUT_HANDOUT4 (RID_APP_START+234) +#define STR_AUTOLAYOUT_HANDOUT6 (RID_APP_START+235) +#define STR_AUTOLAYOUT_NOTES (RID_APP_START+236) +#define STR_AUTOLAYOUT_HANDOUT9 (RID_APP_START+237) + +#define STR_TRANSFORM (RID_APP_START+240) + +#define STR_EXPORT_HTML_NAME (RID_APP_START+244) +#define STR_EXPORT_HTML_FILTER (RID_APP_START+245) +#define STR_EXPORT_DIALOG_TITLE (RID_APP_START+261) +#define STR_TWAIN_NO_SOURCE_UNX (RID_APP_START+262) +#define STR_UNDO_DELETEPAGES (RID_APP_START+265) +#define STR_UNDO_INSERTPAGES (RID_APP_START+266) //free (RID_APP_START+267) -#define STR_ASK_DELETE_LAYER (RID_APP_START+268) -#define STR_UNDO_CHANGE_TITLE_AND_LAYOUT (RID_APP_START+269) -#define STR_WAV_FILE (RID_APP_START+270) -#define STR_MIDI_FILE (RID_APP_START+271) -#define STR_SD_PAGE (RID_APP_START+272) -#define STR_ALL_FILES (RID_APP_START+274) -#define STR_UNDO_INSERT_TEXTFRAME (RID_APP_START+275) -#define STR_ACTION_NOTPOSSIBLE (RID_APP_START+278) -#define STR_DLG_INSERT_PAGES_FROM_FILE (RID_APP_START+279) -#define STR_SCALE_OBJECTS (RID_APP_START+281) -#define STR_CREATE_PAGES (RID_APP_START+282) +#define STR_ASK_DELETE_LAYER (RID_APP_START+268) +#define STR_UNDO_CHANGE_TITLE_AND_LAYOUT (RID_APP_START+269) +#define STR_WAV_FILE (RID_APP_START+270) +#define STR_MIDI_FILE (RID_APP_START+271) +#define STR_SD_PAGE (RID_APP_START+272) +#define STR_ALL_FILES (RID_APP_START+274) +#define STR_UNDO_INSERT_TEXTFRAME (RID_APP_START+275) +#define STR_ACTION_NOTPOSSIBLE (RID_APP_START+278) +#define STR_DLG_INSERT_PAGES_FROM_FILE (RID_APP_START+279) +#define STR_SCALE_OBJECTS (RID_APP_START+281) +#define STR_CREATE_PAGES (RID_APP_START+282) -#define STR_UNDO_CHANGE_PAGEFORMAT (RID_APP_START+283) -#define STR_UNDO_CHANGE_PAGEBORDER (RID_APP_START+284) +#define STR_UNDO_CHANGE_PAGEFORMAT (RID_APP_START+283) +#define STR_UNDO_CHANGE_PAGEBORDER (RID_APP_START+284) -#define STR_EDIT_OBJ (RID_APP_START+288) +#define STR_EDIT_OBJ (RID_APP_START+288) -#define STR_READ_DATA_ERROR (RID_APP_START+290) +#define STR_READ_DATA_ERROR (RID_APP_START+290) /****************************************************************************** * Ab (RID_APP_START+300 beginnen die Ids in sdstring.hrc! ******************************************************************************/ -#define STR_DELETE_PAGES (RID_APP_START+332) -#define STR_WARN_PRINTFORMAT_FAILURE (RID_APP_START+333) -#define STR_REMOVE_LINK (RID_APP_START+334) - -#define STR_IMPORT_GRFILTER_OPENERROR (RID_APP_START+335) -#define STR_IMPORT_GRFILTER_IOERROR (RID_APP_START+336) -#define STR_IMPORT_GRFILTER_FORMATERROR (RID_APP_START+337) -#define STR_IMPORT_GRFILTER_VERSIONERROR (RID_APP_START+338) -#define STR_IMPORT_GRFILTER_FILTERERROR (RID_APP_START+339) -#define STR_IMPORT_GRFILTER_TOOBIG (RID_APP_START+340) - -#define STR_OBJECTS (RID_APP_START+341) -#define STR_END_SEARCHING (RID_APP_START+342) -#define STR_END_SPELLING (RID_APP_START+343) -#define STR_NOLANGUAGE (RID_APP_START+344) -#define STR_ASK_FOR_CONVERT_TO_BEZIER (RID_APP_START+347) -#define STR_UNDO_CHANGE_PRES_OBJECT (RID_APP_START+349) -#define STR_UNDO_MODIFY_PAGE (RID_APP_START+350) -#define STR_STATSTR_PRINT (RID_APP_START+351) -#define STR_UNDO_INSERT_FILE (RID_APP_START+352) -#define STR_UNDO_INSERT_SPECCHAR (RID_APP_START+353) -#define STR_UNDO_SET_PRESLAYOUT (RID_APP_START+354) -#define STR_STRING_NOTFOUND (RID_APP_START+355) -#define STR_PLAY (RID_APP_START+356) -#define STR_STOP (RID_APP_START+357) -#define STR_UNDO_ORIGINALSIZE (RID_APP_START+359) -#define STR_PRINT_DRAWING (RID_APP_START+361) -#define STR_PRINT_NOTES (RID_APP_START+362) -#define STR_PRINT_HANDOUT (RID_APP_START+363) -#define STR_PRINT_OUTLINE (RID_APP_START+364) -#define STR_WARN_SCALE_FAIL (RID_APP_START+365) +#define STR_DELETE_PAGES (RID_APP_START+332) +#define STR_WARN_PRINTFORMAT_FAILURE (RID_APP_START+333) +#define STR_REMOVE_LINK (RID_APP_START+334) + +#define STR_IMPORT_GRFILTER_OPENERROR (RID_APP_START+335) +#define STR_IMPORT_GRFILTER_IOERROR (RID_APP_START+336) +#define STR_IMPORT_GRFILTER_FORMATERROR (RID_APP_START+337) +#define STR_IMPORT_GRFILTER_VERSIONERROR (RID_APP_START+338) +#define STR_IMPORT_GRFILTER_FILTERERROR (RID_APP_START+339) +#define STR_IMPORT_GRFILTER_TOOBIG (RID_APP_START+340) + +#define STR_OBJECTS (RID_APP_START+341) +#define STR_END_SEARCHING (RID_APP_START+342) +#define STR_END_SPELLING (RID_APP_START+343) +#define STR_NOLANGUAGE (RID_APP_START+344) +#define STR_ASK_FOR_CONVERT_TO_BEZIER (RID_APP_START+347) +#define STR_UNDO_CHANGE_PRES_OBJECT (RID_APP_START+349) +#define STR_UNDO_MODIFY_PAGE (RID_APP_START+350) +#define STR_STATSTR_PRINT (RID_APP_START+351) +#define STR_UNDO_INSERT_FILE (RID_APP_START+352) +#define STR_UNDO_INSERT_SPECCHAR (RID_APP_START+353) +#define STR_UNDO_SET_PRESLAYOUT (RID_APP_START+354) +#define STR_STRING_NOTFOUND (RID_APP_START+355) +#define STR_PLAY (RID_APP_START+356) +#define STR_STOP (RID_APP_START+357) +#define STR_UNDO_ORIGINALSIZE (RID_APP_START+359) +#define STR_PRINT_DRAWING (RID_APP_START+361) +#define STR_PRINT_NOTES (RID_APP_START+362) +#define STR_PRINT_HANDOUT (RID_APP_START+363) +#define STR_PRINT_OUTLINE (RID_APP_START+364) +#define STR_WARN_SCALE_FAIL (RID_APP_START+365) // Strings fuer Klick-Effekte (Reihenfolge beibehalten) -#define STR_CLICK_ACTION_NONE (RID_APP_START+366) -#define STR_CLICK_ACTION_PREVPAGE (RID_APP_START+367) -#define STR_CLICK_ACTION_NEXTPAGE (RID_APP_START+368) -#define STR_CLICK_ACTION_FIRSTPAGE (RID_APP_START+369) -#define STR_CLICK_ACTION_LASTPAGE (RID_APP_START+370) -#define STR_CLICK_ACTION_BOOKMARK (RID_APP_START+371) -#define STR_CLICK_ACTION_DOCUMENT (RID_APP_START+372) -#define STR_CLICK_ACTION_VANISH (RID_APP_START+373) -#define STR_CLICK_ACTION_INVISIBLE (RID_APP_START+374) -#define STR_CLICK_ACTION_SOUND (RID_APP_START+375) -#define STR_CLICK_ACTION_VERB (RID_APP_START+376) -#define STR_CLICK_ACTION_PROGRAM (RID_APP_START+377) -#define STR_CLICK_ACTION_MACRO (RID_APP_START+378) +#define STR_CLICK_ACTION_NONE (RID_APP_START+366) +#define STR_CLICK_ACTION_PREVPAGE (RID_APP_START+367) +#define STR_CLICK_ACTION_NEXTPAGE (RID_APP_START+368) +#define STR_CLICK_ACTION_FIRSTPAGE (RID_APP_START+369) +#define STR_CLICK_ACTION_LASTPAGE (RID_APP_START+370) +#define STR_CLICK_ACTION_BOOKMARK (RID_APP_START+371) +#define STR_CLICK_ACTION_DOCUMENT (RID_APP_START+372) +#define STR_CLICK_ACTION_VANISH (RID_APP_START+373) +#define STR_CLICK_ACTION_INVISIBLE (RID_APP_START+374) +#define STR_CLICK_ACTION_SOUND (RID_APP_START+375) +#define STR_CLICK_ACTION_VERB (RID_APP_START+376) +#define STR_CLICK_ACTION_PROGRAM (RID_APP_START+377) +#define STR_CLICK_ACTION_MACRO (RID_APP_START+378) // Mind. bis 380 freihalten -#define STR_EFFECTDLG_SOUND (RID_APP_START+380) -#define STR_EFFECTDLG_PAGE_OBJECT (RID_APP_START+382) -#define STR_EFFECTDLG_DOCUMENT (RID_APP_START+383) -#define STR_EFFECTDLG_PROGRAM (RID_APP_START+384) -#define STR_EFFECTDLG_MACRO (RID_APP_START+385) -#define STR_EFFECTDLG_JUMP (RID_APP_START+386) -#define STR_EFFECTDLG_ACTION (RID_APP_START+387) - -/* Fortsetzung von RID_APP_START+43 bis RID_APP_START+58: - * Dummy-Strings, diese ResourceIDs duerfen nicht an andere Strings vergeben - * werden, da sie fuer Popup-Menues benutzt werden (ein Popup-Menue und sein - * Konfigurationsstring muessen dieselbe ResourceID haben!). - * siehe auch: res_bmp.hrc, popup.src +#define STR_EFFECTDLG_SOUND (RID_APP_START+380) +#define STR_EFFECTDLG_PAGE_OBJECT (RID_APP_START+382) +#define STR_EFFECTDLG_DOCUMENT (RID_APP_START+383) +#define STR_EFFECTDLG_PROGRAM (RID_APP_START+384) +#define STR_EFFECTDLG_MACRO (RID_APP_START+385) +#define STR_EFFECTDLG_JUMP (RID_APP_START+386) +#define STR_EFFECTDLG_ACTION (RID_APP_START+387) + +/* Fortsetzung von RID_APP_START+43 bis RID_APP_START+58: + * Dummy-Strings, diese ResourceIDs duerfen nicht an andere Strings vergeben + * werden, da sie fuer Popup-Menues benutzt werden (ein Popup-Menue und sein + * Konfigurationsstring muessen dieselbe ResourceID haben!). + * siehe auch: res_bmp.hrc, popup.src */ -#define STR_DRAW_SNAPOBJECT_POPUP (RID_APP_START+390) -#define STR_DRAW_GLUEPOINT_POPUP (RID_APP_START+392) -#define STR_DRAW_CONTROL_POPUP (RID_APP_START+393) +#define STR_DRAW_SNAPOBJECT_POPUP (RID_APP_START+390) +#define STR_DRAW_GLUEPOINT_POPUP (RID_APP_START+392) +#define STR_DRAW_CONTROL_POPUP (RID_APP_START+393) -#define STR_EFFECT_NONE (RID_APP_START+400) +#define STR_EFFECT_NONE (RID_APP_START+400) -#define STR_INSERT_TEXT (RID_APP_START+432) -#define STR_SLIDE_SINGULAR (RID_APP_START+433) -#define STR_SLIDE_PLURAL (RID_APP_START+434) -#define STR_AU_FILE (RID_APP_START+435) -#define STR_VOC_FILE (RID_APP_START+436) -#define STR_AIFF_FILE (RID_APP_START+437) -#define STR_SVX_FILE (RID_APP_START+438) +#define STR_INSERT_TEXT (RID_APP_START+432) +#define STR_SLIDE_SINGULAR (RID_APP_START+433) +#define STR_SLIDE_PLURAL (RID_APP_START+434) +#define STR_AU_FILE (RID_APP_START+435) +#define STR_VOC_FILE (RID_APP_START+436) +#define STR_AIFF_FILE (RID_APP_START+437) +#define STR_SVX_FILE (RID_APP_START+438) -/* Stringdefinitionen fuer die Chartbeschriftung +/* Stringdefinitionen fuer die Chartbeschriftung */ -#define STR_LOAD_PRESENTATION_LAYOUT (RID_APP_START+448) +#define STR_LOAD_PRESENTATION_LAYOUT (RID_APP_START+448) #define STR_CLICK_ACTION_STOPPRESENTATION (RID_APP_START+475) @@ -313,171 +313,171 @@ #define STR_GRAPHIC_DOCUMENT (RID_APP_START+499) #define STR_GRAPHIC_DOCUMENT_FULLTYPE_60 (RID_APP_START+501) -#define STR_FIX (RID_APP_START+502) -#define STR_VAR (RID_APP_START+503) -#define STR_STANDARD_NORMAL (RID_APP_START+504) -#define STR_STANDARD_SMALL (RID_APP_START+505) -#define STR_STANDARD_BIG (RID_APP_START+506) -#define STR_FILEFORMAT_NAME_EXT (RID_APP_START+507) -#define STR_FILEFORMAT_FULLPATH (RID_APP_START+508) -#define STR_FILEFORMAT_PATH (RID_APP_START+509) -#define STR_FILEFORMAT_NAME (RID_APP_START+510) +#define STR_FIX (RID_APP_START+502) +#define STR_VAR (RID_APP_START+503) +#define STR_STANDARD_NORMAL (RID_APP_START+504) +#define STR_STANDARD_SMALL (RID_APP_START+505) +#define STR_STANDARD_BIG (RID_APP_START+506) +#define STR_FILEFORMAT_NAME_EXT (RID_APP_START+507) +#define STR_FILEFORMAT_FULLPATH (RID_APP_START+508) +#define STR_FILEFORMAT_PATH (RID_APP_START+509) +#define STR_FILEFORMAT_NAME (RID_APP_START+510) -#define STR_RELEASE_GRAPHICLINK (RID_APP_START+511) +#define STR_RELEASE_GRAPHICLINK (RID_APP_START+511) -#define STR_NEW_CUSTOMSHOW (RID_APP_START+512) -#define STR_COPY_CUSTOMSHOW (RID_APP_START+513) +#define STR_NEW_CUSTOMSHOW (RID_APP_START+512) +#define STR_COPY_CUSTOMSHOW (RID_APP_START+513) -#define STR_VIEWTYPE_DUMMY (RID_APP_START+518) +#define STR_VIEWTYPE_DUMMY (RID_APP_START+518) -#define STR_BREAK_METAFILE (RID_APP_START+521) -#define STR_BREAK_FAIL (RID_APP_START+522) +#define STR_BREAK_METAFILE (RID_APP_START+521) +#define STR_BREAK_FAIL (RID_APP_START+522) -#define STR_PUBDLG_SAMENAME (RID_APP_START+523) +#define STR_PUBDLG_SAMENAME (RID_APP_START+523) -#define STR_HTMLATTR_TEXT (RID_APP_START+524) -#define STR_HTMLATTR_LINK (RID_APP_START+525) -#define STR_HTMLATTR_VLINK (RID_APP_START+526) -#define STR_HTMLATTR_ALINK (RID_APP_START+527) +#define STR_HTMLATTR_TEXT (RID_APP_START+524) +#define STR_HTMLATTR_LINK (RID_APP_START+525) +#define STR_HTMLATTR_VLINK (RID_APP_START+526) +#define STR_HTMLATTR_ALINK (RID_APP_START+527) -#define STR_HTMLEXP_NOTES (RID_APP_START+528) -#define STR_HTMLEXP_CONTENTS (RID_APP_START+529) -#define STR_HTMLEXP_CLICKSTART (RID_APP_START+530) -#define STR_HTMLEXP_AUTHOR (RID_APP_START+531) -#define STR_HTMLEXP_EMAIL (RID_APP_START+532) -#define STR_HTMLEXP_HOMEPAGE (RID_APP_START+533) -#define STR_HTMLEXP_INFO (RID_APP_START+534) -#define STR_HTMLEXP_DOWNLOAD (RID_APP_START+536) -#define STR_HTMLEXP_NOFRAMES (RID_APP_START+537) -#define STR_HTMLEXP_FIRSTPAGE (RID_APP_START+538) -#define STR_HTMLEXP_LASTPAGE (RID_APP_START+539) -#define STR_HTMLEXP_SETTEXT (RID_APP_START+540) -#define STR_HTMLEXP_SETGRAPHIC (RID_APP_START+541) -#define STR_HTMLEXP_OUTLINE (RID_APP_START+542) -#define STR_HTMLEXP_NOOUTLINE (RID_APP_START+543) +#define STR_HTMLEXP_NOTES (RID_APP_START+528) +#define STR_HTMLEXP_CONTENTS (RID_APP_START+529) +#define STR_HTMLEXP_CLICKSTART (RID_APP_START+530) +#define STR_HTMLEXP_AUTHOR (RID_APP_START+531) +#define STR_HTMLEXP_EMAIL (RID_APP_START+532) +#define STR_HTMLEXP_HOMEPAGE (RID_APP_START+533) +#define STR_HTMLEXP_INFO (RID_APP_START+534) +#define STR_HTMLEXP_DOWNLOAD (RID_APP_START+536) +#define STR_HTMLEXP_NOFRAMES (RID_APP_START+537) +#define STR_HTMLEXP_FIRSTPAGE (RID_APP_START+538) +#define STR_HTMLEXP_LASTPAGE (RID_APP_START+539) +#define STR_HTMLEXP_SETTEXT (RID_APP_START+540) +#define STR_HTMLEXP_SETGRAPHIC (RID_APP_START+541) +#define STR_HTMLEXP_OUTLINE (RID_APP_START+542) +#define STR_HTMLEXP_NOOUTLINE (RID_APP_START+543) -#define STR_PRES_SOFTEND (RID_APP_START+550) -#define STR_PRES_PAUSE (RID_APP_START+551) +#define STR_PRES_SOFTEND (RID_APP_START+550) +#define STR_PRES_PAUSE (RID_APP_START+551) -#define STR_WIZARD_ORIGINAL (RID_APP_START+552) +#define STR_WIZARD_ORIGINAL (RID_APP_START+552) -#define STR_ISLOADING (RID_APP_START+554) +#define STR_ISLOADING (RID_APP_START+554) -#define STR_WEBVIEW_SAVE (RID_APP_START+555) +#define STR_WEBVIEW_SAVE (RID_APP_START+555) -#define STR_UNDO_APPLY_3D_FAVOURITE (RID_APP_START+556) +#define STR_UNDO_APPLY_3D_FAVOURITE (RID_APP_START+556) //free (RID_APP_START+557) -#define RID_UNDO_DELETE_WARNING (RID_APP_START+558) -#define IMG_UNDO_DELETE_WARNING (RID_APP_START+559) -#define FT_UNDO_DELETE_WARNING (RID_APP_START+560) -#define CB_UNDO_DELETE_DISABLE (RID_APP_START+561) -#define BTN_UNDO_DELETE_YES (RID_APP_START+562) -#define BTN_UNDO_DELETE_NO (RID_APP_START+564) +#define RID_UNDO_DELETE_WARNING (RID_APP_START+558) +#define IMG_UNDO_DELETE_WARNING (RID_APP_START+559) +#define FT_UNDO_DELETE_WARNING (RID_APP_START+560) +#define CB_UNDO_DELETE_DISABLE (RID_APP_START+561) +#define BTN_UNDO_DELETE_YES (RID_APP_START+562) +#define BTN_UNDO_DELETE_NO (RID_APP_START+564) #define STR_WARNING_NOSOUNDFILE (RID_APP_START+565) -#define STR_UNDO_GRAFFILTER (RID_APP_START+570) +#define STR_UNDO_GRAFFILTER (RID_APP_START+570) -#define STR_UNDO_CONVERT_TO_METAFILE (RID_APP_START+571) -#define STR_UNDO_CONVERT_TO_BITMAP (RID_APP_START+572) +#define STR_UNDO_CONVERT_TO_METAFILE (RID_APP_START+571) +#define STR_UNDO_CONVERT_TO_BITMAP (RID_APP_START+572) -#define STR_HTMLEXP_ERROR_CREATE_FILE (RID_APP_START+578) -#define STR_HTMLEXP_ERROR_OPEN_FILE (RID_APP_START+579) -#define STR_HTMLEXP_ERROR_COPY_FILE (RID_APP_START+580) +#define STR_HTMLEXP_ERROR_CREATE_FILE (RID_APP_START+578) +#define STR_HTMLEXP_ERROR_OPEN_FILE (RID_APP_START+579) +#define STR_HTMLEXP_ERROR_COPY_FILE (RID_APP_START+580) -#define STR_PAGE_BACKGROUND_TXT (RID_APP_START+583) -#define STR_PAGE_BACKGROUND_TITLE (RID_APP_START+584) +#define STR_PAGE_BACKGROUND_TXT (RID_APP_START+583) +#define STR_PAGE_BACKGROUND_TITLE (RID_APP_START+584) // additional effects -#define STR_EFFECT_DISCARD_SHORT (RID_APP_START+598) - -#define STR_EFFECT_DISCARD_FROM_UL (RID_APP_START+600) -#define STR_EFFECT_DISCARD_FROM_UR (RID_APP_START+601) -#define STR_EFFECT_DISCARD_FROM_LR (RID_APP_START+602) -#define STR_EFFECT_DISCARD_FROM_LL (RID_APP_START+603) -#define STR_EFFECT_DISCARD_S_FROM_L (RID_APP_START+604) -#define STR_EFFECT_DISCARD_S_FROM_UL (RID_APP_START+605) -#define STR_EFFECT_DISCARD_S_FROM_T (RID_APP_START+606) -#define STR_EFFECT_DISCARD_S_FROM_UR (RID_APP_START+607) -#define STR_EFFECT_DISCARD_S_FROM_R (RID_APP_START+608) -#define STR_EFFECT_DISCARD_S_FROM_LR (RID_APP_START+609) -#define STR_EFFECT_DISCARD_S_FROM_B (RID_APP_START+610) -#define STR_EFFECT_DISCARD_S_FROM_LL (RID_APP_START+611) -#define STR_EFFECT_VERTICAL_CHECKERBOARD (RID_APP_START+612) -#define STR_EFFECT_HORIZONTAL_CHECKERBOARD (RID_APP_START+613) - -#define STR_EFFECT_MOVE_TO_UL (RID_APP_START+620) -#define STR_EFFECT_MOVE_TO_UR (RID_APP_START+621) -#define STR_EFFECT_MOVE_TO_LR (RID_APP_START+622) -#define STR_EFFECT_MOVE_TO_LL (RID_APP_START+623) -#define STR_EFFECT_MOVE_S_TO_L (RID_APP_START+625) -#define STR_EFFECT_MOVE_S_TO_UL (RID_APP_START+626) -#define STR_EFFECT_MOVE_S_TO_T (RID_APP_START+627) -#define STR_EFFECT_MOVE_S_TO_UR (RID_APP_START+628) -#define STR_EFFECT_MOVE_S_TO_R (RID_APP_START+629) -#define STR_EFFECT_MOVE_S_TO_LR (RID_APP_START+630) -#define STR_EFFECT_MOVE_S_TO_B (RID_APP_START+631) -#define STR_EFFECT_MOVE_S_TO_LL (RID_APP_START+632) - -#define STR_EFFECT_STRTCH (RID_APP_START+634) -#define STR_EFFECT_STRTCH_FROM_L (RID_APP_START+635) -#define STR_EFFECT_STRTCH_FROM_UL (RID_APP_START+636) -#define STR_EFFECT_STRTCH_FROM_T (RID_APP_START+637) -#define STR_EFFECT_STRTCH_FROM_UR (RID_APP_START+638) -#define STR_EFFECT_STRTCH_FROM_R (RID_APP_START+639) -#define STR_EFFECT_STRTCH_FROM_LR (RID_APP_START+640) -#define STR_EFFECT_STRTCH_FROM_B (RID_APP_START+641) -#define STR_EFFECT_STRTCH_FROM_LL (RID_APP_START+642) - -#define STR_EFFECT_STRTCH_ROTATE (RID_APP_START+643) -#define STR_EFFECT_STRTCH_HORIZONTAL (RID_APP_START+644) -#define STR_EFFECT_STRTCH_VERTICAL (RID_APP_START+645) -#define STR_EFFECT_ROTATE_HORIZONTAL (RID_APP_START+646) -#define STR_EFFECT_ROTATE_VERTICAL (RID_APP_START+647) - -#define STR_EFFECT_UNCOVER (RID_APP_START+650) -#define STR_EFFECT_UNCOVER_TO_L (RID_APP_START+651) -#define STR_EFFECT_UNCOVER_TO_UL (RID_APP_START+652) -#define STR_EFFECT_UNCOVER_TO_T (RID_APP_START+653) -#define STR_EFFECT_UNCOVER_TO_UR (RID_APP_START+654) -#define STR_EFFECT_UNCOVER_TO_R (RID_APP_START+655) -#define STR_EFFECT_UNCOVER_TO_LR (RID_APP_START+656) -#define STR_EFFECT_UNCOVER_TO_B (RID_APP_START+657) -#define STR_EFFECT_UNCOVER_TO_LL (RID_APP_START+658) - -#define STR_TWAIN_NO_SOURCE (RID_APP_START+670) -#define STR_UNDO_VECTORIZE (RID_APP_START+671) - -#define STR_AL_VERT_TITLE_TEXT_CHART (RID_APP_START+672) -#define STR_AL_VERT_TITLE_VERT_OUTLINE (RID_APP_START+673) +#define STR_EFFECT_DISCARD_SHORT (RID_APP_START+598) + +#define STR_EFFECT_DISCARD_FROM_UL (RID_APP_START+600) +#define STR_EFFECT_DISCARD_FROM_UR (RID_APP_START+601) +#define STR_EFFECT_DISCARD_FROM_LR (RID_APP_START+602) +#define STR_EFFECT_DISCARD_FROM_LL (RID_APP_START+603) +#define STR_EFFECT_DISCARD_S_FROM_L (RID_APP_START+604) +#define STR_EFFECT_DISCARD_S_FROM_UL (RID_APP_START+605) +#define STR_EFFECT_DISCARD_S_FROM_T (RID_APP_START+606) +#define STR_EFFECT_DISCARD_S_FROM_UR (RID_APP_START+607) +#define STR_EFFECT_DISCARD_S_FROM_R (RID_APP_START+608) +#define STR_EFFECT_DISCARD_S_FROM_LR (RID_APP_START+609) +#define STR_EFFECT_DISCARD_S_FROM_B (RID_APP_START+610) +#define STR_EFFECT_DISCARD_S_FROM_LL (RID_APP_START+611) +#define STR_EFFECT_VERTICAL_CHECKERBOARD (RID_APP_START+612) +#define STR_EFFECT_HORIZONTAL_CHECKERBOARD (RID_APP_START+613) + +#define STR_EFFECT_MOVE_TO_UL (RID_APP_START+620) +#define STR_EFFECT_MOVE_TO_UR (RID_APP_START+621) +#define STR_EFFECT_MOVE_TO_LR (RID_APP_START+622) +#define STR_EFFECT_MOVE_TO_LL (RID_APP_START+623) +#define STR_EFFECT_MOVE_S_TO_L (RID_APP_START+625) +#define STR_EFFECT_MOVE_S_TO_UL (RID_APP_START+626) +#define STR_EFFECT_MOVE_S_TO_T (RID_APP_START+627) +#define STR_EFFECT_MOVE_S_TO_UR (RID_APP_START+628) +#define STR_EFFECT_MOVE_S_TO_R (RID_APP_START+629) +#define STR_EFFECT_MOVE_S_TO_LR (RID_APP_START+630) +#define STR_EFFECT_MOVE_S_TO_B (RID_APP_START+631) +#define STR_EFFECT_MOVE_S_TO_LL (RID_APP_START+632) + +#define STR_EFFECT_STRTCH (RID_APP_START+634) +#define STR_EFFECT_STRTCH_FROM_L (RID_APP_START+635) +#define STR_EFFECT_STRTCH_FROM_UL (RID_APP_START+636) +#define STR_EFFECT_STRTCH_FROM_T (RID_APP_START+637) +#define STR_EFFECT_STRTCH_FROM_UR (RID_APP_START+638) +#define STR_EFFECT_STRTCH_FROM_R (RID_APP_START+639) +#define STR_EFFECT_STRTCH_FROM_LR (RID_APP_START+640) +#define STR_EFFECT_STRTCH_FROM_B (RID_APP_START+641) +#define STR_EFFECT_STRTCH_FROM_LL (RID_APP_START+642) + +#define STR_EFFECT_STRTCH_ROTATE (RID_APP_START+643) +#define STR_EFFECT_STRTCH_HORIZONTAL (RID_APP_START+644) +#define STR_EFFECT_STRTCH_VERTICAL (RID_APP_START+645) +#define STR_EFFECT_ROTATE_HORIZONTAL (RID_APP_START+646) +#define STR_EFFECT_ROTATE_VERTICAL (RID_APP_START+647) + +#define STR_EFFECT_UNCOVER (RID_APP_START+650) +#define STR_EFFECT_UNCOVER_TO_L (RID_APP_START+651) +#define STR_EFFECT_UNCOVER_TO_UL (RID_APP_START+652) +#define STR_EFFECT_UNCOVER_TO_T (RID_APP_START+653) +#define STR_EFFECT_UNCOVER_TO_UR (RID_APP_START+654) +#define STR_EFFECT_UNCOVER_TO_R (RID_APP_START+655) +#define STR_EFFECT_UNCOVER_TO_LR (RID_APP_START+656) +#define STR_EFFECT_UNCOVER_TO_B (RID_APP_START+657) +#define STR_EFFECT_UNCOVER_TO_LL (RID_APP_START+658) + +#define STR_TWAIN_NO_SOURCE (RID_APP_START+670) +#define STR_UNDO_VECTORIZE (RID_APP_START+671) + +#define STR_AL_VERT_TITLE_TEXT_CHART (RID_APP_START+672) +#define STR_AL_VERT_TITLE_VERT_OUTLINE (RID_APP_START+673) #define STR_AL_TITLE_VERT_OUTLINE (RID_APP_START+674) #define STR_AL_TITLE_VERT_OUTLINE_CLIPART (RID_APP_START+675) -#define STR_HTMLEXP_DEFAULT_EXTENSION (RID_APP_START+680) +#define STR_HTMLEXP_DEFAULT_EXTENSION (RID_APP_START+680) -#define STR_SET_BACKGROUND_PICTURE (RID_APP_START+681) +#define STR_SET_BACKGROUND_PICTURE (RID_APP_START+681) #define STR_DESC_RENAMESLIDE (RID_APP_START+682) #define STR_TITLE_RENAMESLIDE (RID_APP_START+683) -#define STR_PLACEHOLDER_DESCRIPTION_TITLE (RID_APP_START+684) -#define STR_PLACEHOLDER_DESCRIPTION_OUTLINE (RID_APP_START+685) -#define STR_PLACEHOLDER_DESCRIPTION_FOOTER (RID_APP_START+686) -#define STR_PLACEHOLDER_DESCRIPTION_HEADER (RID_APP_START+687) -#define STR_PLACEHOLDER_DESCRIPTION_DATETIME (RID_APP_START+688) -#define STR_PLACEHOLDER_DESCRIPTION_NUMBER (RID_APP_START+689) -#define STR_PLACEHOLDER_DESCRIPTION_SLIDE (RID_APP_START+690) -#define STR_PLACEHOLDER_DESCRIPTION_NOTES (RID_APP_START+691) +#define STR_PLACEHOLDER_DESCRIPTION_TITLE (RID_APP_START+684) +#define STR_PLACEHOLDER_DESCRIPTION_OUTLINE (RID_APP_START+685) +#define STR_PLACEHOLDER_DESCRIPTION_FOOTER (RID_APP_START+686) +#define STR_PLACEHOLDER_DESCRIPTION_HEADER (RID_APP_START+687) +#define STR_PLACEHOLDER_DESCRIPTION_DATETIME (RID_APP_START+688) +#define STR_PLACEHOLDER_DESCRIPTION_NUMBER (RID_APP_START+689) +#define STR_PLACEHOLDER_DESCRIPTION_SLIDE (RID_APP_START+690) +#define STR_PLACEHOLDER_DESCRIPTION_NOTES (RID_APP_START+691) -#define STR_FIELD_PLACEHOLDER_HEADER (RID_APP_START+692) -#define STR_FIELD_PLACEHOLDER_FOOTER (RID_APP_START+693) -#define STR_FIELD_PLACEHOLDER_DATETIME (RID_APP_START+694) -#define STR_FIELD_PLACEHOLDER_NUMBER (RID_APP_START+695) +#define STR_FIELD_PLACEHOLDER_HEADER (RID_APP_START+692) +#define STR_FIELD_PLACEHOLDER_FOOTER (RID_APP_START+693) +#define STR_FIELD_PLACEHOLDER_DATETIME (RID_APP_START+694) +#define STR_FIELD_PLACEHOLDER_NUMBER (RID_APP_START+695) #define STR_UNDO_HANGULHANJACONVERSION (RID_APP_START+696) -#define STR_FIELD_PLACEHOLDER_COUNT (RID_APP_START+697) +#define STR_FIELD_PLACEHOLDER_COUNT (RID_APP_START+697) #define STR_LEFT_PANE_DRAW_TITLE (RID_APP_START+700) #define STR_LEFT_PANE_IMPRESS_TITLE (RID_APP_START+701) @@ -492,21 +492,21 @@ #define STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION (RID_APP_START+711) #define STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION (RID_APP_START+712) #define STR_TASKPANEL_LAYOUT_MENU_TITLE (RID_APP_START+713) -#define STR_RESTORE_DRAW_MODE (RID_APP_START+714) +#define STR_RESTORE_DRAW_MODE (RID_APP_START+714) #define STR_GRAPHICS_STYLE_FAMILY (RID_APP_START+715) -#define STR_TITLE_SAVE_AS_PICTURE (RID_APP_START+716) -#define STR_CELL_STYLE_FAMILY (RID_APP_START+717) +#define STR_TITLE_SAVE_AS_PICTURE (RID_APP_START+716) +#define STR_CELL_STYLE_FAMILY (RID_APP_START+717) #define STR_NAVIGATOR_SHOW_NAMED_SHAPES (RID_APP_START+718) #define STR_NAVIGATOR_SHOW_ALL_SHAPES (RID_APP_START+719) #define STR_NAVIGATOR_SHAPE_BASE_NAME (RID_APP_START+720) -#define STR_RESET_LAYOUT (RID_APP_START+721) -#define STR_INSERT_TABLE (RID_APP_START+722) -#define STR_INSERT_CHART (RID_APP_START+723) -#define STR_INSERT_PICTURE (RID_APP_START+724) -#define STR_INSERT_MOVIE (RID_APP_START+725) +#define STR_RESET_LAYOUT (RID_APP_START+721) +#define STR_INSERT_TABLE (RID_APP_START+722) +#define STR_INSERT_CHART (RID_APP_START+723) +#define STR_INSERT_PICTURE (RID_APP_START+724) +#define STR_INSERT_MOVIE (RID_APP_START+725) /****************************************************************************** * The ids in glob.hrc start at RID_APP_START+750! diff --git a/sd/source/ui/inc/tabtempl.hrc b/sd/source/ui/inc/tabtempl.hrc index 19fd9105b318..898140703093 100644 --- a/sd/source/ui/inc/tabtempl.hrc +++ b/sd/source/ui/inc/tabtempl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,6 +25,6 @@ * ************************************************************************/ #include <sfx2/sfx.hrc> -/* #define TAB_TEMPLATE RID_APP_START+??? */ -#define TAB_TEMPLATE 637 +/* #define TAB_TEMPLATE RID_APP_START+??? */ +#define TAB_TEMPLATE 637 #define TAB_CONTROL 1 diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx index b96231dd3969..6a10797d2757 100644 --- a/sd/source/ui/inc/tabtempl.hxx +++ b/sd/source/ui/inc/tabtempl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,26 +50,26 @@ class XLineEndList; class SdTabTemplateDlg : public SfxStyleDialog { private: - const SfxObjectShell& rDocShell; - SdrView* pSdrView; + const SfxObjectShell& rDocShell; + SdrView* pSdrView; - XColorTable* pColorTab; - XGradientList* pGradientList; - XHatchList* pHatchingList; - XBitmapList* pBitmapList; - XDashList* pDashList; - XLineEndList* pLineEndList; + XColorTable* pColorTab; + XGradientList* pGradientList; + XHatchList* pHatchingList; + XBitmapList* pBitmapList; + XDashList* pDashList; + XLineEndList* pLineEndList; - USHORT nPageType; - USHORT nDlgType; - USHORT nPos; - ChangeType nColorTableState; - ChangeType nBitmapListState; - ChangeType nGradientListState; - ChangeType nHatchingListState; + USHORT nPageType; + USHORT nDlgType; + USHORT nPos; + ChangeType nColorTableState; + ChangeType nBitmapListState; + ChangeType nGradientListState; + ChangeType nHatchingListState; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); - virtual const SfxItemSet* GetRefreshedSet(); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual const SfxItemSet* GetRefreshedSet(); public: SdTabTemplateDlg( Window* pParent, diff --git a/sd/source/ui/inc/taskpane/ControlContainer.hxx b/sd/source/ui/inc/taskpane/ControlContainer.hxx index 9c1652f05887..62cf548d26fa 100755 --- a/sd/source/ui/inc/taskpane/ControlContainer.hxx +++ b/sd/source/ui/inc/taskpane/ControlContainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx b/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx index 5aad9fa29f78..67f2986b7d67 100755 --- a/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx +++ b/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ public: /** This interface has to be implemented by windows that want to be - layouted by a SubToolPanel or ScrollablePanel object. + layouted by a SubToolPanel or ScrollablePanel object. */ class ILayoutableWindow { @@ -79,10 +79,10 @@ public: /** Return wether the window is generally resizable. When used by a VerticalLayouter then the width will always be resized and the return value of this method determines whether the height - may be modified as well. + may be modified as well. */ virtual bool IsResizable (void) = 0; - + /** Return the window so that its size and position can be set. @return Returns the window which is layouted or NULL to indicate @@ -92,7 +92,7 @@ public: /** Return the minimal width of the window. */ - virtual sal_Int32 GetMinimumWidth (void) = 0; + virtual sal_Int32 GetMinimumWidth (void) = 0; }; diff --git a/sd/source/ui/inc/taskpane/PanelId.hxx b/sd/source/ui/inc/taskpane/PanelId.hxx index 565745f97140..16f861ebc7bb 100644 --- a/sd/source/ui/inc/taskpane/PanelId.hxx +++ b/sd/source/ui/inc/taskpane/PanelId.hxx @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/taskpane/ScrollPanel.hxx b/sd/source/ui/inc/taskpane/ScrollPanel.hxx index f820edc69f09..4bc94197a58f 100755 --- a/sd/source/ui/inc/taskpane/ScrollPanel.hxx +++ b/sd/source/ui/inc/taskpane/ScrollPanel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ public: title bar as children is returned. */ TitledControl* AddControl ( - ::std::auto_ptr<TreeNode> pControl, + ::std::auto_ptr<TreeNode> pControl, const String& rTitle, ULONG nHelpId); @@ -125,7 +125,7 @@ public: @param pWindow This window is used to translate the given coordinates into ones that are relative to the scroll panel. - + */ void MakeRectangleVisible ( Rectangle& aRectangle, diff --git a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx index 933a25f4067d..8511e4a793c7 100755 --- a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx +++ b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,7 +71,7 @@ public: virtual void Resize (void); static SlideSorterCacheDisplay* Instance (const SdDrawDocument* pDocument); - + void SetPageCount (sal_Int32 nPageCount); enum PageStatus { NONE, @@ -191,10 +191,10 @@ void SscdSetUpToDate (const SdrPage* pPage, bool bUpToDate) #else -#define SSCD_SET_REQUEST_CLASS(Page,RequestClass) -#define SSCD_SET_STATUS(RequestData,Status) -#define SSCD_SET_VISIBILITY(Model,Index,Visible) -#define SSCD_SET_UPTODATE(Page,UpToDate) +#define SSCD_SET_REQUEST_CLASS(Page,RequestClass) +#define SSCD_SET_STATUS(RequestData,Status) +#define SSCD_SET_VISIBILITY(Model,Index,Visible) +#define SSCD_SET_UPTODATE(Page,UpToDate) #endif diff --git a/sd/source/ui/inc/taskpane/SubToolPanel.hxx b/sd/source/ui/inc/taskpane/SubToolPanel.hxx index 669c51cfcfad..19a6da2f1dc7 100755 --- a/sd/source/ui/inc/taskpane/SubToolPanel.hxx +++ b/sd/source/ui/inc/taskpane/SubToolPanel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx index c86c496a770d..6d16c01578c8 100755 --- a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx index a1a430c49328..0ac37bbf12ca 100755 --- a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,7 +83,7 @@ public: /** Return the joined minimum width of all children, i.e. the largest of the minimum widths. */ - virtual sal_Int32 GetMinimumWidth (void); + virtual sal_Int32 GetMinimumWidth (void); /** The default implementaion always returns <FALSE/> */ @@ -93,7 +93,7 @@ public: called node has to be changed, e.g. when the layout menu shows more or less items than before. As a typical result the node will layout and resize its children according to their size requirements. - + Please remember that the size of the children can be changed in the first place because scroll bars can give a node the space it needs. @@ -156,7 +156,7 @@ public: The accessible parent of the accessible object to create. It is not necessaryly the accessible object of the parent window of GetWindow(). - + */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> CreateAccessibleObject ( @@ -179,7 +179,7 @@ public: void FireStateChangeEvent ( TreeNodeStateChangeEventId eEventId, TreeNode* pChild = NULL) const; - + protected: ::std::auto_ptr<ControlContainer> mpControlContainer; diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx index 995117516529..03ff4d6f8002 100755 --- a/sd/source/ui/inc/taskpane/TitleBar.hxx +++ b/sd/source/ui/inc/taskpane/TitleBar.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx index cb7cd3b2159c..63513333185f 100755 --- a/sd/source/ui/inc/taskpane/TitledControl.hxx +++ b/sd/source/ui/inc/taskpane/TitledControl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ class TitledControl { public: typedef ::boost::function1<void, TitledControl&> ClickHandler; - + /** Create a new descriptor for the given control. @param pParent The parent window of the new descriptor. @@ -70,11 +70,11 @@ public: @param eType Type of the title bar. This specifies how the title bar will be formated. For more information see TitleBar. - + */ TitledControl ( TreeNode* pParent, - ::std::auto_ptr<TreeNode> pControl, + ::std::auto_ptr<TreeNode> pControl, const String& rTitle, const ClickHandler& rClickHandler, TitleBar::TitleBarType eType); @@ -147,7 +147,7 @@ private: const TitledControl& aDescriptor); void UpdateStates (void); - + DECL_LINK(WindowEventListener, VclSimpleEvent*); }; diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index 5bd0cd877803..b510a33f9988 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ public: SFX_DECL_INTERFACE(SD_IF_SDTOOLPANELSHELL) ToolPanelViewShell ( - SfxViewFrame* pFrame, + SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameView); @@ -92,8 +92,8 @@ public: virtual void KeyInput (const KeyEvent& rEvent); using sd::ViewShell::KeyInput; - virtual SdPage* GetActualPage (void); - virtual SdPage* getCurrentPage (void) const; + virtual SdPage* GetActualPage (void); + virtual SdPage* getCurrentPage (void) const; void Execute (SfxRequest& rRequest); void GetState (SfxItemSet& rItemSet); diff --git a/sd/source/ui/inc/tbx_ww.hrc b/sd/source/ui/inc/tbx_ww.hrc index 0189eecf2739..efcb657b1357 100644 --- a/sd/source/ui/inc/tbx_ww.hrc +++ b/sd/source/ui/inc/tbx_ww.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/tbx_ww.hxx b/sd/source/ui/inc/tbx_ww.hxx index e8c3b93a7fa2..43cb90870d62 100644 --- a/sd/source/ui/inc/tbx_ww.hxx +++ b/sd/source/ui/inc/tbx_ww.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,11 +38,11 @@ class SdPopupWindowTbx : public SfxPopupWindow { private: - SfxToolBoxManager aTbx; + SfxToolBoxManager aTbx; SdResId aSdResIdWin; SdResId aSdResIdTbx; - WindowAlign eTbxAlign; - Link aSelectLink; + WindowAlign eTbxAlign; + Link aSelectLink; DECL_LINK( TbxSelectHdl, ToolBox * ); @@ -55,8 +55,8 @@ public: virtual void PopupModeEnd(); - void StartSelection() { aTbx.GetToolBox().StartSelection(); } - void Update(); + void StartSelection() { aTbx.GetToolBox().StartSelection(); } + void Update(); private: @@ -71,7 +71,7 @@ private: class SdTbxControl : public SfxToolBoxControl { private: - BOOL IsCheckable( USHORT nSId ); + BOOL IsCheckable( USHORT nSId ); public: SFX_DECL_TOOLBOX_CONTROL(); @@ -79,11 +79,11 @@ public: SdTbxControl(USHORT nSlotId, USHORT nId, ToolBox& rTbx ); ~SdTbxControl() {} - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindowType GetPopupWindowType() const; + virtual SfxPopupWindow* CreatePopupWindow(); virtual void StateChanged( USHORT nSId, SfxItemState eState, const SfxPoolItem* pState ); }; -#endif // _SD_TBX_WW_HXX +#endif // _SD_TBX_WW_HXX diff --git a/sd/source/ui/inc/tmplctrl.hxx b/sd/source/ui/inc/tmplctrl.hxx index 6a85b0f7b4fb..0b96004d94ec 100644 --- a/sd/source/ui/inc/tmplctrl.hxx +++ b/sd/source/ui/inc/tmplctrl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ public: SdTemplateControl( USHORT nSlotId, USHORT nId, StatusBar& rStb ); ~SdTemplateControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rEvt ); SFX_DECL_STATUSBAR_CONTROL(); diff --git a/sd/source/ui/inc/tools/AsynchronousCall.hxx b/sd/source/ui/inc/tools/AsynchronousCall.hxx index e123afaa06fe..705057ffac33 100644 --- a/sd/source/ui/inc/tools/AsynchronousCall.hxx +++ b/sd/source/ui/inc/tools/AsynchronousCall.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,8 +42,8 @@ namespace sd { namespace tools { objects can be used. b) When more than one function objects are posted to be executed later then the pending ones are erased and only the last one will actually be - executed. - + executed. + Use this class like this: aInstanceOfAsynchronousCall.Post( ::boost::bind( @@ -58,7 +58,7 @@ public: one (semantical) type of call. */ AsynchronousCall (void); - + ~AsynchronousCall (void); /** Post a function object that is to be executed asynchronously. When diff --git a/sd/source/ui/inc/tools/AsynchronousTask.hxx b/sd/source/ui/inc/tools/AsynchronousTask.hxx index f3135d3fcce7..cb0e60719d6c 100644 --- a/sd/source/ui/inc/tools/AsynchronousTask.hxx +++ b/sd/source/ui/inc/tools/AsynchronousTask.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ #ifndef SD_ASYNCHRONOUS_TASK_HXX #define SD_ASYNCHRONOUS_TASK_HXX - + namespace sd { namespace tools { /** Interface for the asynchronous execution of a task. This interface diff --git a/sd/source/ui/inc/tools/ConfigurationAccess.hxx b/sd/source/ui/inc/tools/ConfigurationAccess.hxx index 953012dfa668..64ff1d777d14 100644 --- a/sd/source/ui/inc/tools/ConfigurationAccess.hxx +++ b/sd/source/ui/inc/tools/ConfigurationAccess.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ class ConfigurationAccess { public: enum WriteMode { READ_WRITE, READ_ONLY }; - + /** Create a new object to access the configuration entries below the given root. @param rsRootName @@ -105,7 +105,7 @@ public: const ::rtl::OUString&, const std::vector<css::uno::Any>&) > Functor; - /** Execute a functor for all elements of the given container. + /** Execute a functor for all elements of the given container. @param rxContainer The container is a XNameAccess to a list of the configuration. This can be a node returned by GetConfigurationNode(). diff --git a/sd/source/ui/inc/tools/IconCache.hxx b/sd/source/ui/inc/tools/IconCache.hxx index 008e99639849..9edca8ee7eef 100644 --- a/sd/source/ui/inc/tools/IconCache.hxx +++ b/sd/source/ui/inc/tools/IconCache.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ class IconCache { public: /** The lifetime of the returned reference is limited to that of the sd - module. + module. */ static IconCache& Instance (void); diff --git a/sd/source/ui/inc/tools/IdleDetection.hxx b/sd/source/ui/inc/tools/IdleDetection.hxx index 3369dc1dd177..b300ad405364 100644 --- a/sd/source/ui/inc/tools/IdleDetection.hxx +++ b/sd/source/ui/inc/tools/IdleDetection.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include <sal/types.h> class Window; - + namespace sd { namespace tools { /** Detect whether the system is idle and some time consuming operation may diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx index 998b4f0e2142..f5a9a3060bd1 100755 --- a/sd/source/ui/inc/tools/PropertySet.hxx +++ b/sd/source/ui/inc/tools/PropertySet.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ namespace { support constrained properties and thus does not support vetoable listeners. It does not support the optional property set info. - In order to use it you have to derive from this class and implement the + In order to use it you have to derive from this class and implement the GetPropertyValue() and SetPropertyValue() methods. */ class PropertySet @@ -67,7 +67,7 @@ public: virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo (void) throw(css::uno::RuntimeException); - + virtual void SAL_CALL setPropertyValue ( const rtl::OUString& rsPropertyName, const css::uno::Any& rsPropertyValue) @@ -76,12 +76,12 @@ public: css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); - + virtual css::uno::Any SAL_CALL getPropertyValue (const rtl::OUString& rsPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - + virtual void SAL_CALL addPropertyChangeListener ( const rtl::OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx index d0661a61636b..8541c2b6c139 100755 --- a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx +++ b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ public: /** Add a resource to the container. The ownership of the resource is transferred to the container. The resource is destroyed when the container is destroyed, i.e. when the sd module is destroyed. - + When in doubt, use the shared_ptr variant of this method. */ void AddResource (::std::auto_ptr<SdGlobalResource> pResource); diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx index 1f45aef331ab..ba9c3ea0f54f 100755 --- a/sd/source/ui/inc/tools/SlotStateListener.hxx +++ b/sd/source/ui/inc/tools/SlotStateListener.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ namespace sd { namespace tools { -typedef cppu::WeakComponentImplHelper1< +typedef cppu::WeakComponentImplHelper1< ::com::sun::star::frame::XStatusListener > SlotStateListenerInterfaceBase; @@ -97,7 +97,7 @@ public: @throws DisposedException */ void ObserveSlot (const ::rtl::OUString& rSlotName); - + //===== frame::XStatusListener ========================================== /** Called by slot state change broadcasters. In turn the callback is @@ -112,7 +112,7 @@ public: //===== lang::XEventListener ============================================ virtual void SAL_CALL - disposing(const com::sun::star::lang::EventObject& rEvent) + disposing(const com::sun::star::lang::EventObject& rEvent) throw(com::sun::star::uno::RuntimeException); protected: @@ -150,7 +150,7 @@ private: /** Return an XDispatch object for the given URL. */ - ::com::sun::star::uno::Reference<com::sun::star::frame::XDispatch> + ::com::sun::star::uno::Reference<com::sun::star::frame::XDispatch> GetDispatch ( const ::com::sun::star::util::URL& rURL) const; }; diff --git a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx index 33ec3ccd9993..2157a485c490 100644 --- a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx +++ b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ class AsynchronousTask; /** Execute an AsynchronousTask timer based, i.e. every nMillisecondsBetweenSteps milliseconds as much steps are executed as fit into a nMaxTimePerStep millisecond intervall. - + When a task is executed completely, i.e. HasNextStep() returns <FALSE/>, the TimerBasedTaskExecution destroys itself. This, of course, works only if the creating instance does not hold a shared_ptr to that object. @@ -71,7 +71,7 @@ public: exceptions. */ static void ReleaseTask (const ::boost::weak_ptr<TimerBasedTaskExecution>& rpTask); - + private: ::boost::shared_ptr<AsynchronousTask> mpTask; Timer maTimer; diff --git a/sd/source/ui/inc/tpaction.hrc b/sd/source/ui/inc/tpaction.hrc index e273b9cb573c..70bf2e1bf904 100644 --- a/sd/source/ui/inc/tpaction.hrc +++ b/sd/source/ui/inc/tpaction.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 2ee8bbe6771a..05622ca4a27f 100755 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ class SdDrawDocument; class SdActionDlg : public SfxSingleTabDialog { private: - const SfxItemSet& rOutAttrs; + const SfxItemSet& rOutAttrs; public: @@ -73,31 +73,31 @@ public: class SdTPAction : public SfxTabPage { private: - FixedText aFtAction; // always visible - ListBox aLbAction; - - FixedText aFtTree; // jump destination controls - SdPageObjsTLB aLbTree; - SdPageObjsTLB aLbTreeDocument; - ListBox aLbOLEAction; + FixedText aFtAction; // always visible + ListBox aLbAction; + + FixedText aFtTree; // jump destination controls + SdPageObjsTLB aLbTree; + SdPageObjsTLB aLbTreeDocument; + ListBox aLbOLEAction; FixedLine aFlSeparator; - Edit aEdtSound; + Edit aEdtSound; Edit aEdtBookmark; Edit aEdtDocument; Edit aEdtProgram; Edit aEdtMacro; PushButton aBtnSearch; PushButton aBtnSeek; - - const SfxItemSet& rOutAttrs; - const ::sd::View* mpView; - SdDrawDocument* mpDoc; - XColorTable* pColTab; - - BOOL bTreeUpdated; - List* pCurrentActions; - String aLastFile; + + const SfxItemSet& rOutAttrs; + const ::sd::View* mpView; + SdDrawDocument* mpDoc; + XColorTable* pColTab; + + BOOL bTreeUpdated; + List* pCurrentActions; + String aLastFile; ::std::vector< long > aVerbVector; //------------------------------------ @@ -107,15 +107,15 @@ private: DECL_LINK( SelectTreeHdl, void * ); DECL_LINK( CheckFileHdl, void * ); - void UpdateTree(); - virtual void OpenFileDialog(); - ::com::sun::star::presentation::ClickAction GetActualClickAction(); - void SetActualClickAction( ::com::sun::star::presentation::ClickAction eCA ); - void SetActualAnimationEffect( ::com::sun::star::presentation::AnimationEffect eAE ); - void SetEditText( String const & rStr ); - String GetEditText( BOOL bURL = FALSE ); - USHORT GetClickActionSdResId( ::com::sun::star::presentation::ClickAction eCA ); - USHORT GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE ); + void UpdateTree(); + virtual void OpenFileDialog(); + ::com::sun::star::presentation::ClickAction GetActualClickAction(); + void SetActualClickAction( ::com::sun::star::presentation::ClickAction eCA ); + void SetActualAnimationEffect( ::com::sun::star::presentation::AnimationEffect eAE ); + void SetEditText( String const & rStr ); + String GetEditText( BOOL bURL = FALSE ); + USHORT GetClickActionSdResId( ::com::sun::star::presentation::ClickAction eCA ); + USHORT GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE ); public: SdTPAction( Window* pParent, const SfxItemSet& rInAttrs ); @@ -131,11 +131,11 @@ public: void Construct(); - void SetView( const ::sd::View* pSdView ); + void SetView( const ::sd::View* pSdView ); using TabPage::ActivatePage; using TabPage::DeactivatePage; }; -#endif // _SD_TPACTION_HXX +#endif // _SD_TPACTION_HXX diff --git a/sd/source/ui/inc/tpoption.hrc b/sd/source/ui/inc/tpoption.hrc index caa1ca0f3812..b75726fa723e 100644 --- a/sd/source/ui/inc/tpoption.hrc +++ b/sd/source/ui/inc/tpoption.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index e8e17f335a76..530ed6876471 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ public: SdTpOptionsSnap( Window* pParent, const SfxItemSet& rInAttrs ); ~SdTpOptionsSnap(); - static SfxTabPage* Create( Window*, const SfxItemSet& ); + static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); @@ -76,16 +76,16 @@ class SdTpOptionsContents : public SfxTabPage private: FixedLine aGrpDisplay; CheckBox aCbxRuler; - CheckBox aCbxDragStripes; - CheckBox aCbxHandlesBezier; - CheckBox aCbxMoveOutline; + CheckBox aCbxDragStripes; + CheckBox aCbxHandlesBezier; + CheckBox aCbxMoveOutline; public: SdTpOptionsContents( Window* pParent, const SfxItemSet& rInAttrs ); ~SdTpOptionsContents(); - static SfxTabPage* Create( Window*, const SfxItemSet& ); + static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); }; @@ -118,7 +118,7 @@ private: FixedText aTxtMetric; ListBox aLbMetric; FixedText aTxtTabstop; - MetricField aMtrFldTabstop; + MetricField aMtrFldTabstop; CheckBox aCbxStartWithActualPage; FixedLine aGrpStartWithActualPage; @@ -135,25 +135,25 @@ private: FixedText aFtEquivalent; FixedText aFtPageWidth; - FixedInfo aFiInfo1; + FixedInfo aFiInfo1; MetricField aMtrFldOriginalWidth; FixedText aFtPageHeight; - FixedInfo aFiInfo2; + FixedInfo aFiInfo2; MetricField aMtrFldOriginalHeight; MetricField aMtrFldInfo1; - MetricField aMtrFldInfo2; + MetricField aMtrFldInfo2; UINT32 nWidth; - UINT32 nHeight; - String aInfo1; - String aInfo2; + UINT32 nHeight; + String aInfo1; + String aInfo2; - SfxMapUnit ePoolUnit; + SfxMapUnit ePoolUnit; - String GetScale( INT32 nX, INT32 nY ); - BOOL SetScale( const String& aScale, INT32& rX, INT32& rY ); + String GetScale( INT32 nX, INT32 nY ); + BOOL SetScale( const String& aScale, INT32& rX, INT32& rY ); DECL_LINK( ModifyScaleHdl, void * ); DECL_LINK( ModifyOriginalScaleHdl, void * ); @@ -167,13 +167,13 @@ private: protected: virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual int DeactivatePage( SfxItemSet* pSet ); public: SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ); ~SdTpOptionsMisc(); - static SfxTabPage* Create( Window*, const SfxItemSet& ); + static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); @@ -188,7 +188,7 @@ public: <member>SetDrawMode()</member> method more than once. */ void SetImpressMode (void); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet); using TabPage::ActivatePage; using TabPage::DeactivatePage; diff --git a/sd/source/ui/inc/unchss.hxx b/sd/source/ui/inc/unchss.hxx index d607182aa20e..b540581e725c 100644 --- a/sd/source/ui/inc/unchss.hxx +++ b/sd/source/ui/inc/unchss.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/undoback.hxx b/sd/source/ui/inc/undoback.hxx index ca62c6cae0b0..f1ad848d2c0e 100644 --- a/sd/source/ui/inc/undoback.hxx +++ b/sd/source/ui/inc/undoback.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,15 +44,15 @@ private: SdPage& mrPage; SfxItemSet* mpItemSet; - + void ImplRestoreBackgroundObj(); public: - + TYPEINFO(); - - SdBackgroundObjUndoAction( - SdDrawDocument& rDoc, + + SdBackgroundObjUndoAction( + SdDrawDocument& rDoc, SdPage& rPage, const SfxItemSet& rItenSet); virtual ~SdBackgroundObjUndoAction(); diff --git a/sd/source/ui/inc/undoheaderfooter.hxx b/sd/source/ui/inc/undoheaderfooter.hxx index a61030b753f7..e884ad872dd4 100644 --- a/sd/source/ui/inc/undoheaderfooter.hxx +++ b/sd/source/ui/inc/undoheaderfooter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,8 +41,8 @@ class SD_DLLPUBLIC SdHeaderFooterUndoAction : public SdUndoAction { SdPage* mpPage; - const sd::HeaderFooterSettings maOldSettings; - const sd::HeaderFooterSettings maNewSettings; + const sd::HeaderFooterSettings maOldSettings; + const sd::HeaderFooterSettings maNewSettings; public: TYPEINFO(); @@ -53,5 +53,5 @@ public: virtual void Redo(); }; -#endif // _SD_UNDOHEADERFOOTER_HXX +#endif // _SD_UNDOHEADERFOOTER_HXX diff --git a/sd/source/ui/inc/undolayer.hxx b/sd/source/ui/inc/undolayer.hxx index 9abe2ee54c91..8ab83df18245 100644 --- a/sd/source/ui/inc/undolayer.hxx +++ b/sd/source/ui/inc/undolayer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ class SdrLayer; class SdLayerModifyUndoAction : public SdUndoAction { - + public: TYPEINFO(); SdLayerModifyUndoAction( SdDrawDocument* _pDoc, SdrLayer* pLayer, @@ -63,5 +63,5 @@ private: bool mbNewIsPrintable; }; -#endif // _SD_UNDOLAYER_HXX +#endif // _SD_UNDOLAYER_HXX diff --git a/sd/source/ui/inc/undopage.hxx b/sd/source/ui/inc/undopage.hxx index fc6a1770f6be..a854ec363057 100644 --- a/sd/source/ui/inc/undopage.hxx +++ b/sd/source/ui/inc/undopage.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,45 +64,45 @@ class SdPageFormatUndoAction : public SdUndoAction public: TYPEINFO(); - SdPageFormatUndoAction( SdDrawDocument* pDoc, - SdPage* pThePage, - const Size& rOldSz, - INT32 nOldLft, - INT32 nOldRgt, - INT32 nOldUpr, - INT32 nOldLwr, + SdPageFormatUndoAction( SdDrawDocument* pDoc, + SdPage* pThePage, + const Size& rOldSz, + INT32 nOldLft, + INT32 nOldRgt, + INT32 nOldUpr, + INT32 nOldLwr, BOOL bOldScl, Orientation eOldOrient, - USHORT nOPaperBin, - BOOL bOFullSize, + USHORT nOPaperBin, + BOOL bOFullSize, const Size& rNewSz, - INT32 nNewLft, - INT32 nNewRgt, - INT32 nNewUpr, + INT32 nNewLft, + INT32 nNewRgt, + INT32 nNewUpr, INT32 nNewLwr, BOOL bNewScl, Orientation eNewOrient, - USHORT nNPaperBin, - BOOL bNFullSize + USHORT nNPaperBin, + BOOL bNFullSize ) : SdUndoAction(pDoc), - mpPage (pThePage), - maOldSize (rOldSz), - mnOldLeft (nOldLft), - mnOldRight (nOldRgt), - mnOldUpper (nOldUpr), - mnOldLower (nOldLwr), + mpPage (pThePage), + maOldSize (rOldSz), + mnOldLeft (nOldLft), + mnOldRight (nOldRgt), + mnOldUpper (nOldUpr), + mnOldLower (nOldLwr), mbOldScale (bOldScl), meOldOrientation(eOldOrient), mnOldPaperBin (nOPaperBin), mbOldFullSize (bOFullSize), - maNewSize (rNewSz), - mnNewLeft (nNewLft), - mnNewRight (nNewRgt), - mnNewUpper (nNewUpr), + maNewSize (rNewSz), + mnNewLeft (nNewLft), + mnNewRight (nNewRgt), + mnNewUpper (nNewUpr), mnNewLower (nNewLwr), mbNewScale (bNewScl), meNewOrientation(eNewOrient), @@ -120,12 +120,12 @@ public: class SdPageLRUndoAction : public SdUndoAction { - SdPage* mpPage; + SdPage* mpPage; - INT32 mnOldLeft; - INT32 mnOldRight; - INT32 mnNewLeft; - INT32 mnNewRight; + INT32 mnOldLeft; + INT32 mnOldRight; + INT32 mnNewLeft; + INT32 mnNewRight; public: TYPEINFO(); @@ -133,11 +133,11 @@ public: INT32 nOldLft, INT32 nOldRgt, INT32 nNewLft, INT32 nNewRgt ) : SdUndoAction(pDoc), - mpPage (pThePage), - mnOldLeft (nOldLft), - mnOldRight (nOldRgt), - mnNewLeft (nNewLft), - mnNewRight (nNewRgt) + mpPage (pThePage), + mnOldLeft (nOldLft), + mnOldRight (nOldRgt), + mnNewLeft (nNewLft), + mnNewRight (nNewRgt) {} virtual ~SdPageLRUndoAction(); @@ -149,12 +149,12 @@ public: class SdPageULUndoAction : public SdUndoAction { - SdPage* mpPage; + SdPage* mpPage; - INT32 mnOldUpper; - INT32 mnOldLower; - INT32 mnNewUpper; - INT32 mnNewLower; + INT32 mnOldUpper; + INT32 mnOldLower; + INT32 mnNewUpper; + INT32 mnNewLower; public: TYPEINFO(); @@ -162,11 +162,11 @@ public: INT32 nOldUpr, INT32 nOldLwr, INT32 nNewUpr, INT32 nNewLwr ) : SdUndoAction(pDoc), - mpPage (pThePage), - mnOldUpper (nOldUpr), - mnOldLower (nOldLwr), - mnNewUpper (nNewUpr), - mnNewLower (nNewLwr) + mpPage (pThePage), + mnOldUpper (nOldUpr), + mnOldLower (nOldLwr), + mnNewUpper (nNewUpr), + mnNewLower (nNewLwr) {} virtual ~SdPageULUndoAction(); @@ -176,5 +176,5 @@ public: -#endif // _SD_UNDOPAGE_HXX +#endif // _SD_UNDOPAGE_HXX diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx index 185dc90b24bf..f4808d7b8da4 100644 --- a/sd/source/ui/inc/unmodpg.hxx +++ b/sd/source/ui/inc/unmodpg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ class SdPage; class ModifyPageUndoAction : public SdUndoAction { // #67720# - SfxUndoManager* mpManager; + SfxUndoManager* mpManager; SdPage* mpPage; String maOldName; @@ -54,13 +54,13 @@ class ModifyPageUndoAction : public SdUndoAction public: TYPEINFO(); ModifyPageUndoAction( - SfxUndoManager* pManager, // #67720# - SdDrawDocument* pTheDoc, - SdPage* pThePage, - String aTheNewName, - AutoLayout eTheNewAutoLayout, - BOOL bTheNewBckgrndVisible, - BOOL bTheNewBckgrndObjsVisible); + SfxUndoManager* pManager, // #67720# + SdDrawDocument* pTheDoc, + SdPage* pThePage, + String aTheNewName, + AutoLayout eTheNewAutoLayout, + BOOL bTheNewBckgrndVisible, + BOOL bTheNewBckgrndObjsVisible); virtual ~ModifyPageUndoAction(); virtual void Undo(); diff --git a/sd/source/ui/inc/unmovss.hxx b/sd/source/ui/inc/unmovss.hxx index dc1d47099a53..36aee55051ad 100644 --- a/sd/source/ui/inc/unmovss.hxx +++ b/sd/source/ui/inc/unmovss.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,9 +36,9 @@ class SdDrawDocument; class SdMoveStyleSheetsUndoAction : public SdUndoAction { - SdStyleSheetVector maStyles; - std::vector< SdStyleSheetVector > maListOfChildLists; - bool mbMySheets; + SdStyleSheetVector maStyles; + std::vector< SdStyleSheetVector > maListOfChildLists; + bool mbMySheets; public: SdMoveStyleSheetsUndoAction(SdDrawDocument* pTheDoc, SdStyleSheetVector& rTheStyles, bool bInserted); diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx index a2a80963ad63..873e7e738224 100755 --- a/sd/source/ui/inc/unoaprms.hxx +++ b/sd/source/ui/inc/unoaprms.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,11 +42,11 @@ class SdrObject; class SdAnimationPrmsUndoAction : public SdUndoAction { - SdrObject* pObject; - BOOL bOldActive; - BOOL bNewActive; + SdrObject* pObject; + BOOL bOldActive; + BOOL bNewActive; BOOL bOldDimPrevious; - BOOL bNewDimPrevious; + BOOL bNewDimPrevious; BOOL bOldDimHide; BOOL bNewDimHide; BOOL bOldSoundOn; @@ -62,13 +62,13 @@ class SdAnimationPrmsUndoAction : public SdUndoAction ::com::sun::star::presentation::AnimationEffect eOldTextEffect; ::com::sun::star::presentation::AnimationEffect eNewTextEffect; ::com::sun::star::presentation::AnimationSpeed eOldSpeed; - ::com::sun::star::presentation::AnimationSpeed eNewSpeed; + ::com::sun::star::presentation::AnimationSpeed eNewSpeed; ::com::sun::star::presentation::AnimationEffect eOldSecondEffect; ::com::sun::star::presentation::AnimationEffect eNewSecondEffect; ::com::sun::star::presentation::AnimationSpeed eOldSecondSpeed; ::com::sun::star::presentation::AnimationSpeed eNewSecondSpeed; Color aOldDimColor; - Color aNewDimColor; + Color aNewDimColor; Color aOldBlueScreen; Color aNewBlueScreen; String aOldSoundFile; @@ -83,8 +83,8 @@ class SdAnimationPrmsUndoAction : public SdUndoAction BOOL bNewInvisibleInPres; USHORT nOldVerb; USHORT nNewVerb; - ULONG nOldPresOrder; - ULONG nNewPresOrder; + ULONG nOldPresOrder; + ULONG nNewPresOrder; BOOL bInfoCreated; @@ -92,8 +92,8 @@ public: TYPEINFO(); SdAnimationPrmsUndoAction(SdDrawDocument* pTheDoc, SdrObject* pObj, BOOL bCreated): - SdUndoAction (pTheDoc), - pObject (pObj), + SdUndoAction (pTheDoc), + pObject (pObj), bInfoCreated (bCreated) {} @@ -145,5 +145,5 @@ public: virtual void Redo(); }; -#endif // _SD_UNOAPRMS_HXX +#endif // _SD_UNOAPRMS_HXX diff --git a/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx index 161653616f60..01a9a9dc9d05 100644 --- a/sd/source/ui/inc/unokywds.hxx +++ b/sd/source/ui/inc/unokywds.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -96,11 +96,11 @@ SD_CONSTASCII_ACTION( sUNO_SdLayerManager, "SdUnoLayerManager" ); // SdLayer SD_CONSTASCII_ACTION( sUNO_SdLayer, "SdUnoLayer" ); -SD_CONSTASCII_ACTION( sUNO_LayerName_background, "background" ); +SD_CONSTASCII_ACTION( sUNO_LayerName_background, "background" ); SD_CONSTASCII_ACTION( sUNO_LayerName_background_objects, "backgroundobjects" ); -SD_CONSTASCII_ACTION( sUNO_LayerName_layout, "layout" ); -SD_CONSTASCII_ACTION( sUNO_LayerName_controls, "controls" ); -SD_CONSTASCII_ACTION( sUNO_LayerName_measurelines, "measurelines" ); +SD_CONSTASCII_ACTION( sUNO_LayerName_layout, "layout" ); +SD_CONSTASCII_ACTION( sUNO_LayerName_controls, "controls" ); +SD_CONSTASCII_ACTION( sUNO_LayerName_measurelines, "measurelines" ); // SdXShape SD_CONSTASCII_ACTION( sUNO_shape_style, "Style" ); @@ -129,87 +129,87 @@ SD_CONSTASCII_ACTION( sUNO_Service_ImageMapCircleObject, UNO_PREFIX "image.Image SD_CONSTASCII_ACTION( sUNO_Service_ImageMapPolygonObject, UNO_PREFIX "image.ImageMapPolygonObject" ); // properties -SD_CONSTASCII_ACTION( sUNO_Prop_Background, "Background" ); -SD_CONSTASCII_ACTION( sUNO_Prop_ForbiddenCharacters, "ForbiddenCharacters" ); -SD_CONSTASCII_ACTION( sUNO_Prop_MapUnit, "MapUnit" ); -SD_CONSTASCII_ACTION( sUNO_Prop_VisibleArea, "VisibleArea" ); -SD_CONSTASCII_ACTION( sUNO_Prop_Aspect, "Aspect" ); -SD_CONSTASCII_ACTION( sUNO_Prop_TabStop, "TabStop" ); -SD_CONSTASCII_ACTION( sUNO_Prop_CharLocale, "CharLocale" ); -SD_CONSTASCII_ACTION( sUNO_Prop_AutomContFocus, "AutomaticControlFocus" ); -SD_CONSTASCII_ACTION( sUNO_Prop_ApplyFrmDsgnMode, "ApplyFormDesignMode" ); -SD_CONSTASCII_ACTION( sUNO_Prop_IsBackgroundVisible, "IsBackgroundVisible" ); -SD_CONSTASCII_ACTION( sUNO_Prop_IsBackgroundObjectsVisible, "IsBackgroundObjectsVisible" ); +SD_CONSTASCII_ACTION( sUNO_Prop_Background, "Background" ); +SD_CONSTASCII_ACTION( sUNO_Prop_ForbiddenCharacters, "ForbiddenCharacters" ); +SD_CONSTASCII_ACTION( sUNO_Prop_MapUnit, "MapUnit" ); +SD_CONSTASCII_ACTION( sUNO_Prop_VisibleArea, "VisibleArea" ); +SD_CONSTASCII_ACTION( sUNO_Prop_Aspect, "Aspect" ); +SD_CONSTASCII_ACTION( sUNO_Prop_TabStop, "TabStop" ); +SD_CONSTASCII_ACTION( sUNO_Prop_CharLocale, "CharLocale" ); +SD_CONSTASCII_ACTION( sUNO_Prop_AutomContFocus, "AutomaticControlFocus" ); +SD_CONSTASCII_ACTION( sUNO_Prop_ApplyFrmDsgnMode, "ApplyFormDesignMode" ); +SD_CONSTASCII_ACTION( sUNO_Prop_IsBackgroundVisible, "IsBackgroundVisible" ); +SD_CONSTASCII_ACTION( sUNO_Prop_IsBackgroundObjectsVisible, "IsBackgroundObjectsVisible" ); SD_CONSTASCII_ACTION( sUNO_Prop_UserDefinedAttributes, "UserDefinedAttributes" ); -SD_CONSTASCII_ACTION( sUNO_Prop_BookmarkURL, "BookmarkURL" ); +SD_CONSTASCII_ACTION( sUNO_Prop_BookmarkURL, "BookmarkURL" ); SD_CONSTASCII_ACTION( sUNO_Prop_RuntimeUID, "RuntimeUID" ); SD_CONSTASCII_ACTION( sUNO_Prop_HasValidSignatures, "HasValidSignatures" ); // view settings -SD_CONSTASCII_ACTION( sUNO_View_ViewId, "ViewId" ); -SD_CONSTASCII_ACTION( sUNO_View_SnapLinesDrawing, "SnapLinesDrawing" ); -SD_CONSTASCII_ACTION( sUNO_View_SnapLinesNotes, "SnapLinesNotes" ); -SD_CONSTASCII_ACTION( sUNO_View_SnapLinesHandout, "SnapLinesHandout" ); -SD_CONSTASCII_ACTION( sUNO_View_RulerIsVisible, "RulerIsVisible" ); -SD_CONSTASCII_ACTION( sUNO_View_PageKind, "PageKind" ); -SD_CONSTASCII_ACTION( sUNO_View_SelectedPage, "SelectedPage" ); -SD_CONSTASCII_ACTION( sUNO_View_IsLayerMode, "IsLayerMode" ); -SD_CONSTASCII_ACTION( sUNO_View_IsQuickEdit, "IsQuickEdit" ); -SD_CONSTASCII_ACTION( sUNO_View_IsBigHandles, "IsBigHandles" ); -SD_CONSTASCII_ACTION( sUNO_View_IsDoubleClickTextEdit, "IsDoubleClickTextEdit" ); -SD_CONSTASCII_ACTION( sUNO_View_IsClickChangeRotation, "IsClickChangeRotation" ); -SD_CONSTASCII_ACTION( sUNO_View_IsDragWithCopy, "IsDragWithCopy" ); -SD_CONSTASCII_ACTION( sUNO_View_SlidesPerRow, "SlidesPerRow" ); -SD_CONSTASCII_ACTION( sUNO_View_DrawMode, "DrawMode" ); -SD_CONSTASCII_ACTION( sUNO_View_PreviewDrawMode, "PreviewDrawMode" ); -SD_CONSTASCII_ACTION( sUNO_View_IsShowPreviewInPageMode, "IsShowPreviewInPageMode" ); -SD_CONSTASCII_ACTION( sUNO_View_IsShowPreviewInMasterPageMode, "IsShowPreviewInMasterPageMode" ); -SD_CONSTASCII_ACTION( sUNO_View_SetShowPreviewInOutlineMode, "SetShowPreviewInOutlineMode" ); -SD_CONSTASCII_ACTION( sUNO_View_EditModeStandard, "EditModeStandard" ); -SD_CONSTASCII_ACTION( sUNO_View_EditModeNotes, "EditModeNotes" ); -SD_CONSTASCII_ACTION( sUNO_View_EditModeHandout, "EditModeHandout" ); -SD_CONSTASCII_ACTION( sUNO_View_VisArea, "VisArea" ); - -SD_CONSTASCII_ACTION( sUNO_View_GridIsVisible, "GridIsVisible" ); -SD_CONSTASCII_ACTION( sUNO_View_GridIsFront, "GridIsFront" ); -SD_CONSTASCII_ACTION( sUNO_View_IsSnapToGrid, "IsSnapToGrid" ); -SD_CONSTASCII_ACTION( sUNO_View_IsSnapToPageMargins, "IsSnapToPageMargins" ); -SD_CONSTASCII_ACTION( sUNO_View_IsSnapToSnapLines, "IsSnapToSnapLines" ); -SD_CONSTASCII_ACTION( sUNO_View_IsSnapToObjectFrame, "IsSnapToObjectFrame" ); -SD_CONSTASCII_ACTION( sUNO_View_IsSnapToObjectPoints, "IsSnapToObjectPoints" ); -SD_CONSTASCII_ACTION( sUNO_View_IsSnapLinesVisible, "IsSnapLinesVisible" ); -SD_CONSTASCII_ACTION( sUNO_View_IsDragStripes, "IsDragStripes" ); -SD_CONSTASCII_ACTION( sUNO_View_IsPlusHandlesAlwaysVisible, "IsPlusHandlesAlwaysVisible" ); -SD_CONSTASCII_ACTION( sUNO_View_IsFrameDragSingles, "IsFrameDragSingles" ); -SD_CONSTASCII_ACTION( sUNO_View_IsMarkedHitMovesAlways, "IsMarkedHitMovesAlways" ); -SD_CONSTASCII_ACTION( sUNO_View_EliminatePolyPointLimitAngle, "EliminatePolyPointLimitAngle" ); -SD_CONSTASCII_ACTION( sUNO_View_IsEliminatePolyPoints, "IsEliminatePolyPoints" ); -SD_CONSTASCII_ACTION( sUNO_View_IsLineDraft, "IsLineDraft" ); -SD_CONSTASCII_ACTION( sUNO_View_IsFillDraft, "IsFillDraft" ); -SD_CONSTASCII_ACTION( sUNO_View_IsTextDraft, "IsTextDraft" ); -SD_CONSTASCII_ACTION( sUNO_View_IsGrafDraft, "IsGrafDraft" ); -SD_CONSTASCII_ACTION( sUNO_View_ActiveLayer, "ActiveLayer" ); -SD_CONSTASCII_ACTION( sUNO_View_NoAttribs, "NoAttribs" ); -SD_CONSTASCII_ACTION( sUNO_View_NoColors, "NoColors" ); -SD_CONSTASCII_ACTION( sUNO_View_GridCoarseWidth, "GridCoarseWidth" ); -SD_CONSTASCII_ACTION( sUNO_View_GridCoarseHeight, "GridCoarseHeight" ); -SD_CONSTASCII_ACTION( sUNO_View_GridFineWidth, "GridFineWidth" ); -SD_CONSTASCII_ACTION( sUNO_View_GridFineHeight, "GridFineHeight" ); -SD_CONSTASCII_ACTION( sUNO_View_IsAngleSnapEnabled, "IsAngleSnapEnabled" ); -SD_CONSTASCII_ACTION( sUNO_View_SnapAngle, "SnapAngle" ); -SD_CONSTASCII_ACTION( sUNO_View_GridSnapWidthXNumerator, "GridSnapWidthXNumerator" ); -SD_CONSTASCII_ACTION( sUNO_View_GridSnapWidthXDenominator, "GridSnapWidthXDenominator" ); -SD_CONSTASCII_ACTION( sUNO_View_GridSnapWidthYNumerator, "GridSnapWidthYNumerator" ); -SD_CONSTASCII_ACTION( sUNO_View_GridSnapWidthYDenominator, "GridSnapWidthYDenominator" ); -SD_CONSTASCII_ACTION( sUNO_View_VisibleLayers, "VisibleLayers" ); -SD_CONSTASCII_ACTION( sUNO_View_PrintableLayers, "PrintableLayers" ); -SD_CONSTASCII_ACTION( sUNO_View_LockedLayers, "LockedLayers" ); - -SD_CONSTASCII_ACTION( sUNO_View_VisibleAreaTop, "VisibleAreaTop" ); -SD_CONSTASCII_ACTION( sUNO_View_VisibleAreaLeft, "VisibleAreaLeft" ); -SD_CONSTASCII_ACTION( sUNO_View_VisibleAreaWidth, "VisibleAreaWidth" ); -SD_CONSTASCII_ACTION( sUNO_View_VisibleAreaHeight, "VisibleAreaHeight" ); - -SD_CONSTASCII_ACTION( sUNO_View_ZoomOnPage, "ZoomOnPage" ); +SD_CONSTASCII_ACTION( sUNO_View_ViewId, "ViewId" ); +SD_CONSTASCII_ACTION( sUNO_View_SnapLinesDrawing, "SnapLinesDrawing" ); +SD_CONSTASCII_ACTION( sUNO_View_SnapLinesNotes, "SnapLinesNotes" ); +SD_CONSTASCII_ACTION( sUNO_View_SnapLinesHandout, "SnapLinesHandout" ); +SD_CONSTASCII_ACTION( sUNO_View_RulerIsVisible, "RulerIsVisible" ); +SD_CONSTASCII_ACTION( sUNO_View_PageKind, "PageKind" ); +SD_CONSTASCII_ACTION( sUNO_View_SelectedPage, "SelectedPage" ); +SD_CONSTASCII_ACTION( sUNO_View_IsLayerMode, "IsLayerMode" ); +SD_CONSTASCII_ACTION( sUNO_View_IsQuickEdit, "IsQuickEdit" ); +SD_CONSTASCII_ACTION( sUNO_View_IsBigHandles, "IsBigHandles" ); +SD_CONSTASCII_ACTION( sUNO_View_IsDoubleClickTextEdit, "IsDoubleClickTextEdit" ); +SD_CONSTASCII_ACTION( sUNO_View_IsClickChangeRotation, "IsClickChangeRotation" ); +SD_CONSTASCII_ACTION( sUNO_View_IsDragWithCopy, "IsDragWithCopy" ); +SD_CONSTASCII_ACTION( sUNO_View_SlidesPerRow, "SlidesPerRow" ); +SD_CONSTASCII_ACTION( sUNO_View_DrawMode, "DrawMode" ); +SD_CONSTASCII_ACTION( sUNO_View_PreviewDrawMode, "PreviewDrawMode" ); +SD_CONSTASCII_ACTION( sUNO_View_IsShowPreviewInPageMode, "IsShowPreviewInPageMode" ); +SD_CONSTASCII_ACTION( sUNO_View_IsShowPreviewInMasterPageMode, "IsShowPreviewInMasterPageMode" ); +SD_CONSTASCII_ACTION( sUNO_View_SetShowPreviewInOutlineMode, "SetShowPreviewInOutlineMode" ); +SD_CONSTASCII_ACTION( sUNO_View_EditModeStandard, "EditModeStandard" ); +SD_CONSTASCII_ACTION( sUNO_View_EditModeNotes, "EditModeNotes" ); +SD_CONSTASCII_ACTION( sUNO_View_EditModeHandout, "EditModeHandout" ); +SD_CONSTASCII_ACTION( sUNO_View_VisArea, "VisArea" ); + +SD_CONSTASCII_ACTION( sUNO_View_GridIsVisible, "GridIsVisible" ); +SD_CONSTASCII_ACTION( sUNO_View_GridIsFront, "GridIsFront" ); +SD_CONSTASCII_ACTION( sUNO_View_IsSnapToGrid, "IsSnapToGrid" ); +SD_CONSTASCII_ACTION( sUNO_View_IsSnapToPageMargins, "IsSnapToPageMargins" ); +SD_CONSTASCII_ACTION( sUNO_View_IsSnapToSnapLines, "IsSnapToSnapLines" ); +SD_CONSTASCII_ACTION( sUNO_View_IsSnapToObjectFrame, "IsSnapToObjectFrame" ); +SD_CONSTASCII_ACTION( sUNO_View_IsSnapToObjectPoints, "IsSnapToObjectPoints" ); +SD_CONSTASCII_ACTION( sUNO_View_IsSnapLinesVisible, "IsSnapLinesVisible" ); +SD_CONSTASCII_ACTION( sUNO_View_IsDragStripes, "IsDragStripes" ); +SD_CONSTASCII_ACTION( sUNO_View_IsPlusHandlesAlwaysVisible, "IsPlusHandlesAlwaysVisible" ); +SD_CONSTASCII_ACTION( sUNO_View_IsFrameDragSingles, "IsFrameDragSingles" ); +SD_CONSTASCII_ACTION( sUNO_View_IsMarkedHitMovesAlways, "IsMarkedHitMovesAlways" ); +SD_CONSTASCII_ACTION( sUNO_View_EliminatePolyPointLimitAngle, "EliminatePolyPointLimitAngle" ); +SD_CONSTASCII_ACTION( sUNO_View_IsEliminatePolyPoints, "IsEliminatePolyPoints" ); +SD_CONSTASCII_ACTION( sUNO_View_IsLineDraft, "IsLineDraft" ); +SD_CONSTASCII_ACTION( sUNO_View_IsFillDraft, "IsFillDraft" ); +SD_CONSTASCII_ACTION( sUNO_View_IsTextDraft, "IsTextDraft" ); +SD_CONSTASCII_ACTION( sUNO_View_IsGrafDraft, "IsGrafDraft" ); +SD_CONSTASCII_ACTION( sUNO_View_ActiveLayer, "ActiveLayer" ); +SD_CONSTASCII_ACTION( sUNO_View_NoAttribs, "NoAttribs" ); +SD_CONSTASCII_ACTION( sUNO_View_NoColors, "NoColors" ); +SD_CONSTASCII_ACTION( sUNO_View_GridCoarseWidth, "GridCoarseWidth" ); +SD_CONSTASCII_ACTION( sUNO_View_GridCoarseHeight, "GridCoarseHeight" ); +SD_CONSTASCII_ACTION( sUNO_View_GridFineWidth, "GridFineWidth" ); +SD_CONSTASCII_ACTION( sUNO_View_GridFineHeight, "GridFineHeight" ); +SD_CONSTASCII_ACTION( sUNO_View_IsAngleSnapEnabled, "IsAngleSnapEnabled" ); +SD_CONSTASCII_ACTION( sUNO_View_SnapAngle, "SnapAngle" ); +SD_CONSTASCII_ACTION( sUNO_View_GridSnapWidthXNumerator, "GridSnapWidthXNumerator" ); +SD_CONSTASCII_ACTION( sUNO_View_GridSnapWidthXDenominator, "GridSnapWidthXDenominator" ); +SD_CONSTASCII_ACTION( sUNO_View_GridSnapWidthYNumerator, "GridSnapWidthYNumerator" ); +SD_CONSTASCII_ACTION( sUNO_View_GridSnapWidthYDenominator, "GridSnapWidthYDenominator" ); +SD_CONSTASCII_ACTION( sUNO_View_VisibleLayers, "VisibleLayers" ); +SD_CONSTASCII_ACTION( sUNO_View_PrintableLayers, "PrintableLayers" ); +SD_CONSTASCII_ACTION( sUNO_View_LockedLayers, "LockedLayers" ); + +SD_CONSTASCII_ACTION( sUNO_View_VisibleAreaTop, "VisibleAreaTop" ); +SD_CONSTASCII_ACTION( sUNO_View_VisibleAreaLeft, "VisibleAreaLeft" ); +SD_CONSTASCII_ACTION( sUNO_View_VisibleAreaWidth, "VisibleAreaWidth" ); +SD_CONSTASCII_ACTION( sUNO_View_VisibleAreaHeight, "VisibleAreaHeight" ); + +SD_CONSTASCII_ACTION( sUNO_View_ZoomOnPage, "ZoomOnPage" ); #endif diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index 4881a053aaff..472ce790a5c1 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -119,11 +119,11 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxMarkerTable; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDrawingPool; - const SvxItemPropertySet* mpPropSet; + const SvxItemPropertySet* mpPropSet; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > maTypeSequence; - rtl::OUString maBuildId; + rtl::OUString maBuildId; void initializeDocument(); public: @@ -134,8 +134,8 @@ public: static rtl::Reference< SdXImpressDocument > GetModel( SdDrawDocument* pDoc ); // intern - virtual int operator==( const SdXImpressDocument& rModel ) const { return mpDoc == rModel.mpDoc; } - virtual int operator!=( const SdXImpressDocument& rModel ) const { return mpDoc != rModel.mpDoc; } + virtual int operator==( const SdXImpressDocument& rModel ) const { return mpDoc == rModel.mpDoc; } + virtual int operator!=( const SdXImpressDocument& rModel ) const { return mpDoc != rModel.mpDoc; } ::sd::DrawDocShell* GetDocShell() const { return mpDocShell; } SdDrawDocument* GetDoc() const { return mpDoc; } @@ -146,7 +146,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XForbiddenCharacters > getForbiddenCharsTable(); // SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); UNO3_GETIMPLEMENTATION_DECL(SdXImpressDocument) @@ -243,7 +243,7 @@ private: SdXImpressDocument* mpModel; public: - SdDrawPagesAccess( SdXImpressDocument& rMyModel ) throw(); + SdDrawPagesAccess( SdXImpressDocument& rMyModel ) throw(); virtual ~SdDrawPagesAccess() throw(); // XDrawPages @@ -283,7 +283,7 @@ public: class SdMasterPagesAccess : public ::cppu::WeakImplHelper3< ::com::sun::star::drawing::XDrawPages, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XComponent > { private: - SdXImpressDocument* mpModel; + SdXImpressDocument* mpModel; public: SdMasterPagesAccess( SdXImpressDocument& rMyModel ) throw(); @@ -320,10 +320,10 @@ class SdDocLinkTargets : public ::cppu::WeakImplHelper3< ::com::sun::star::conta ::com::sun::star::lang::XServiceInfo , ::com::sun::star::lang::XComponent > { private: - SdXImpressDocument* mpModel; + SdXImpressDocument* mpModel; public: - SdDocLinkTargets( SdXImpressDocument& rMyModel ) throw(); + SdDocLinkTargets( SdXImpressDocument& rMyModel ) throw(); virtual ~SdDocLinkTargets() throw(); // XNameAccess diff --git a/sd/source/ui/inc/unoprnms.hxx b/sd/source/ui/inc/unoprnms.hxx index 4bf30c307ded..1324bcbfccd6 100644 --- a/sd/source/ui/inc/unoprnms.hxx +++ b/sd/source/ui/inc/unoprnms.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,74 +27,74 @@ #ifndef _SD_UNOPRNMS_HXX #define _SD_UNOPRNMS_HXX -#define UNO_NAME_MODEL_LANGUAGE "CharLocale" -#define UNO_NAME_MODEL_TABSTOP "TabStop" +#define UNO_NAME_MODEL_LANGUAGE "CharLocale" +#define UNO_NAME_MODEL_TABSTOP "TabStop" -#define UNO_NAME_PAGE_BACKGROUND "Background" -#define UNO_NAME_PAGE_LEFT "BorderLeft" -#define UNO_NAME_PAGE_RIGHT "BorderRight" -#define UNO_NAME_PAGE_TOP "BorderTop" -#define UNO_NAME_PAGE_BOTTOM "BorderBottom" -#define UNO_NAME_PAGE_CHANGE "Change" -#define UNO_NAME_PAGE_DURATION "Duration" -#define UNO_NAME_PAGE_EFFECT "Effect" -#define UNO_NAME_PAGE_HEIGHT "Height" -#define UNO_NAME_PAGE_LAYOUT "Layout" -#define UNO_NAME_PAGE_NUMBER "Number" -#define UNO_NAME_PAGE_OBJECTS "Objects" -#define UNO_NAME_PAGE_ORIENTATION "Orientation" -#define UNO_NAME_PAGE_SPEED "Speed" -#define UNO_NAME_PAGE_WIDTH "Width" -#define UNO_NAME_PAGE_PREVIEW "Preview" -#define UNO_NAME_PAGE_PREVIEWBITMAP "PreviewBitmap" -#define UNO_NAME_PAGE_VISIBLE "Visible" +#define UNO_NAME_PAGE_BACKGROUND "Background" +#define UNO_NAME_PAGE_LEFT "BorderLeft" +#define UNO_NAME_PAGE_RIGHT "BorderRight" +#define UNO_NAME_PAGE_TOP "BorderTop" +#define UNO_NAME_PAGE_BOTTOM "BorderBottom" +#define UNO_NAME_PAGE_CHANGE "Change" +#define UNO_NAME_PAGE_DURATION "Duration" +#define UNO_NAME_PAGE_EFFECT "Effect" +#define UNO_NAME_PAGE_HEIGHT "Height" +#define UNO_NAME_PAGE_LAYOUT "Layout" +#define UNO_NAME_PAGE_NUMBER "Number" +#define UNO_NAME_PAGE_OBJECTS "Objects" +#define UNO_NAME_PAGE_ORIENTATION "Orientation" +#define UNO_NAME_PAGE_SPEED "Speed" +#define UNO_NAME_PAGE_WIDTH "Width" +#define UNO_NAME_PAGE_PREVIEW "Preview" +#define UNO_NAME_PAGE_PREVIEWBITMAP "PreviewBitmap" +#define UNO_NAME_PAGE_VISIBLE "Visible" -#define UNO_NAME_OBJ_BOOKMARK "Bookmark" -#define UNO_NAME_OBJ_DIMCOLOR "DimColor" -#define UNO_NAME_OBJ_DIMHIDE "DimHide" -#define UNO_NAME_OBJ_DIMPREV "DimPrevious" -#define UNO_NAME_OBJ_EFFECT "Effect" -#define UNO_NAME_OBJ_ISEMPTYPRESOBJ "IsEmptyPresentationObject" -#define UNO_NAME_OBJ_ISPRESOBJ "IsPresentationObject" -#define UNO_NAME_OBJ_CLICKACTION "OnClick" -#define UNO_NAME_OBJ_PLAYFULL "PlayFull" -#define UNO_NAME_OBJ_PRESORDER "PresentationOrder" -#define UNO_NAME_OBJ_SOUNDFILE "Sound" -#define UNO_NAME_OBJ_SOUNDON "SoundOn" -#define UNO_NAME_OBJ_SPEED "Speed" -#define UNO_NAME_OBJ_TEXTEFFECT "TextEffect" -#define UNO_NAME_OBJ_BLUESCREEN "TransparentColor" -#define UNO_NAME_OBJ_VERB "Verb" -#define UNO_NAME_OBJ_STYLE "Style" -#define UNO_NAME_OBJ_MASTERDEPENDENT "IsPlaceholderDependent" -#define UNO_NAME_OBJ_ANIMATIONPATH "AnimationPath" +#define UNO_NAME_OBJ_BOOKMARK "Bookmark" +#define UNO_NAME_OBJ_DIMCOLOR "DimColor" +#define UNO_NAME_OBJ_DIMHIDE "DimHide" +#define UNO_NAME_OBJ_DIMPREV "DimPrevious" +#define UNO_NAME_OBJ_EFFECT "Effect" +#define UNO_NAME_OBJ_ISEMPTYPRESOBJ "IsEmptyPresentationObject" +#define UNO_NAME_OBJ_ISPRESOBJ "IsPresentationObject" +#define UNO_NAME_OBJ_CLICKACTION "OnClick" +#define UNO_NAME_OBJ_PLAYFULL "PlayFull" +#define UNO_NAME_OBJ_PRESORDER "PresentationOrder" +#define UNO_NAME_OBJ_SOUNDFILE "Sound" +#define UNO_NAME_OBJ_SOUNDON "SoundOn" +#define UNO_NAME_OBJ_SPEED "Speed" +#define UNO_NAME_OBJ_TEXTEFFECT "TextEffect" +#define UNO_NAME_OBJ_BLUESCREEN "TransparentColor" +#define UNO_NAME_OBJ_VERB "Verb" +#define UNO_NAME_OBJ_STYLE "Style" +#define UNO_NAME_OBJ_MASTERDEPENDENT "IsPlaceholderDependent" +#define UNO_NAME_OBJ_ANIMATIONPATH "AnimationPath" -#define UNO_NAME_LAYER_LOCKED "IsLocked" -#define UNO_NAME_LAYER_PRINTABLE "IsPrintable" -#define UNO_NAME_LAYER_VISIBLE "IsVisible" -#define UNO_NAME_LAYER_NAME "Name" +#define UNO_NAME_LAYER_LOCKED "IsLocked" +#define UNO_NAME_LAYER_PRINTABLE "IsPrintable" +#define UNO_NAME_LAYER_VISIBLE "IsVisible" +#define UNO_NAME_LAYER_NAME "Name" -#define UNO_NAME_SHOW_ALLOWANIM "AllowAnimations" -#define UNO_NAME_SHOW_CUSTOMSHOW "CustomShow" -#define UNO_NAME_SHOW_FIRSTPAGE "FirstPage" -#define UNO_NAME_SHOW_ONTOP "IsAlwaysOnTop" -#define UNO_NAME_SHOW_AUTOMATIC "IsAutomatic" -#define UNO_NAME_SHOW_ENDLESS "IsEndless" -#define UNO_NAME_SHOW_FULLSCREEN "IsFullScreen" -#define UNO_NAME_SHOW_MOUSEVISIBLE "IsMouseVisible" -#define UNO_NAME_SHOW_PAGERANGE "PageRange" -#define UNO_NAME_SHOW_PAUSE "Pause" -#define UNO_NAME_SHOW_STARTWITHNAV "StartWithNavigator" -#define UNO_NAME_SHOW_USEPEN "UsePen" +#define UNO_NAME_SHOW_ALLOWANIM "AllowAnimations" +#define UNO_NAME_SHOW_CUSTOMSHOW "CustomShow" +#define UNO_NAME_SHOW_FIRSTPAGE "FirstPage" +#define UNO_NAME_SHOW_ONTOP "IsAlwaysOnTop" +#define UNO_NAME_SHOW_AUTOMATIC "IsAutomatic" +#define UNO_NAME_SHOW_ENDLESS "IsEndless" +#define UNO_NAME_SHOW_FULLSCREEN "IsFullScreen" +#define UNO_NAME_SHOW_MOUSEVISIBLE "IsMouseVisible" +#define UNO_NAME_SHOW_PAGERANGE "PageRange" +#define UNO_NAME_SHOW_PAUSE "Pause" +#define UNO_NAME_SHOW_STARTWITHNAV "StartWithNavigator" +#define UNO_NAME_SHOW_USEPEN "UsePen" -#define UNO_NAME_SEARCH_BACKWARDS "SearchBackwards" -#define UNO_NAME_SEARCH_CASE "SearchCaseSensitive" -#define UNO_NAME_SEARCH_WORDS "SearchWords" +#define UNO_NAME_SEARCH_BACKWARDS "SearchBackwards" +#define UNO_NAME_SEARCH_CASE "SearchCaseSensitive" +#define UNO_NAME_SEARCH_WORDS "SearchWords" -#define UNO_NAME_LINKDISPLAYNAME "LinkDisplayName" -#define UNO_NAME_LINKDISPLAYBITMAP "LinkDisplayBitmap" +#define UNO_NAME_LINKDISPLAYNAME "LinkDisplayName" +#define UNO_NAME_LINKDISPLAYBITMAP "LinkDisplayBitmap" -#define UNO_NAME_STYLE_FAMILY "Family" +#define UNO_NAME_STYLE_FAMILY "Family" #endif diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx index b19f3751e836..36add67936ec 100755 --- a/sd/source/ui/inc/unosrch.hxx +++ b/sd/source/ui/inc/unosrch.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,7 +92,7 @@ protected: sal_Bool mbReplace; - ::rtl::OUString maSearchStr; + ::rtl::OUString maSearchStr; ::rtl::OUString maReplaceStr; public: @@ -116,9 +116,9 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); }; diff --git a/sd/source/ui/inc/unprlout.hxx b/sd/source/ui/inc/unprlout.hxx index d0c22946b46b..b2e8da9465b2 100644 --- a/sd/source/ui/inc/unprlout.hxx +++ b/sd/source/ui/inc/unprlout.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/inc/unslsel.hxx b/sd/source/ui/inc/unslsel.hxx index acb653677b5e..b133c6b1af90 100644 --- a/sd/source/ui/inc/unslsel.hxx +++ b/sd/source/ui/inc/unslsel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,9 +42,9 @@ public: : SdUndoAction(pTheDoc), pOldOrder(pOld), pNewOrder(pNew) {} - virtual ~SlideSelectionUndoAction() {} + virtual ~SlideSelectionUndoAction() {} virtual void Undo(); virtual void Redo(); }; -#endif // _SD_UNSLSEL_HXX +#endif // _SD_UNSLSEL_HXX diff --git a/sd/source/ui/inc/vectdlg.hrc b/sd/source/ui/inc/vectdlg.hrc index ca84ae2746db..e87eed2b705f 100644 --- a/sd/source/ui/inc/vectdlg.hrc +++ b/sd/source/ui/inc/vectdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,29 +25,29 @@ * ************************************************************************/ -#define DLG_VECTORIZE 654 +#define DLG_VECTORIZE 654 -#define BTN_OK 1 -#define BTN_CANCEL 1 -#define BTN_HELP 1 +#define BTN_OK 1 +#define BTN_CANCEL 1 +#define BTN_HELP 1 -#define BTN_PREVIEW 1 +#define BTN_PREVIEW 1 -#define GRP_SETTINGS 1 -#define GRP_PRGS 2 +#define GRP_SETTINGS 1 +#define GRP_PRGS 2 -#define CTL_BMP 1 -#define CTL_WMF 2 -#define WND_PRGS 3 +#define CTL_BMP 1 +#define CTL_WMF 2 +#define WND_PRGS 3 -#define FT_LAYERS 1 -#define FT_REDUCE 3 -#define FT_FILLHOLES 4 -#define FT_ORIGINAL 5 -#define FT_VECTORIZED 6 +#define FT_LAYERS 1 +#define FT_REDUCE 3 +#define FT_FILLHOLES 4 +#define FT_ORIGINAL 5 +#define FT_VECTORIZED 6 -#define NM_LAYERS 1 -#define MT_REDUCE 3 -#define MT_FILLHOLES 4 +#define NM_LAYERS 1 +#define MT_REDUCE 3 +#define MT_FILLHOLES 4 -#define CB_FILLHOLES 1 +#define CB_FILLHOLES 1 diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx index 0df81c78d652..bd77ac1357e5 100644 --- a/sd/source/ui/inc/vectdlg.hxx +++ b/sd/source/ui/inc/vectdlg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,43 +50,43 @@ class DrawDocShell; class SdVectorizeDlg : public ModalDialog { - ::sd::DrawDocShell * mpDocSh; - FixedLine aGrpSettings; - FixedText aFtLayers; - NumericField aNmLayers; - FixedText aFtReduce; - MetricField aMtReduce; - FixedText aFtFillHoles; - MetricField aMtFillHoles; - CheckBox aCbFillHoles; - - FixedText aFtOriginal; - GraphCtrl aBmpWin; - - FixedText aFtVectorized; - GraphCtrl aMtfWin; - - FixedText aGrpPrgs; - ProgressBar aPrgs; - - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - PushButton aBtnPreview; - - Bitmap aBmp; - Bitmap aPreviewBmp; - GDIMetaFile aMtf; - - void LoadSettings(); - void SaveSettings() const; - void InitPreviewBmp(); - void UpdatePreviewMtf(); - - Rectangle GetRect( const Size& rDispSize, const Size& rBmpSize ) const; - Bitmap GetPreparedBitmap( Bitmap& rBmp, Fraction& rScale ); - void Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ); - void AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, + ::sd::DrawDocShell * mpDocSh; + FixedLine aGrpSettings; + FixedText aFtLayers; + NumericField aNmLayers; + FixedText aFtReduce; + MetricField aMtReduce; + FixedText aFtFillHoles; + MetricField aMtFillHoles; + CheckBox aCbFillHoles; + + FixedText aFtOriginal; + GraphCtrl aBmpWin; + + FixedText aFtVectorized; + GraphCtrl aMtfWin; + + FixedText aGrpPrgs; + ProgressBar aPrgs; + + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + PushButton aBtnPreview; + + Bitmap aBmp; + Bitmap aPreviewBmp; + GDIMetaFile aMtf; + + void LoadSettings(); + void SaveSettings() const; + void InitPreviewBmp(); + void UpdatePreviewMtf(); + + Rectangle GetRect( const Size& rDispSize, const Size& rBmpSize ) const; + Bitmap GetPreparedBitmap( Bitmap& rBmp, Fraction& rScale ); + void Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ); + void AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, long nPosX, long nPosY, long nWidth, long nHeight ); DECL_LINK( ProgressHdl, void* ); @@ -100,7 +100,7 @@ public: SdVectorizeDlg( Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ); ~SdVectorizeDlg(); - const GDIMetaFile& GetGDIMetaFile() const { return aMtf; } + const GDIMetaFile& GetGDIMetaFile() const { return aMtf; } }; #endif diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx index 9b56267ff327..77d0dbcfd921 100755 --- a/sd/source/ui/inc/view/viewoverlaymanager.hxx +++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ class ViewOverlayManager : public SfxListener public: ViewOverlayManager( ViewShellBase& rViewShellBase ); virtual ~ViewOverlayManager(); - + void onZoomChanged(); void UpdateTags(); @@ -63,7 +63,7 @@ private: ViewShellBase& mrBase; ULONG mnUpdateTagsEvent; - ViewTagVector maTagVector; + ViewTagVector maTagVector; }; } diff --git a/sd/source/ui/inc/zoomlist.hxx b/sd/source/ui/inc/zoomlist.hxx index 6957bfed25ce..b1798ec1b5a3 100755 --- a/sd/source/ui/inc/zoomlist.hxx +++ b/sd/source/ui/inc/zoomlist.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,15 +43,15 @@ public: ZoomList(ViewShell* pViewShell); virtual ~ZoomList(); - void InsertZoomRect(const Rectangle& rRect); - Rectangle GetNextZoomRect(); - Rectangle GetPreviousZoomRect(); - BOOL IsNextPossible() const; - BOOL IsPreviousPossible() const; + void InsertZoomRect(const Rectangle& rRect); + Rectangle GetNextZoomRect(); + Rectangle GetPreviousZoomRect(); + BOOL IsNextPossible() const; + BOOL IsPreviousPossible() const; private: - ViewShell* mpViewShell; - ULONG mnCurPos; + ViewShell* mpViewShell; + ULONG mnCurPos; }; } // end of namespace sd diff --git a/sd/source/ui/notes/EditWindow.cxx b/sd/source/ui/notes/EditWindow.cxx index 54e3589bc87e..fc2e10c3ac39 100755 --- a/sd/source/ui/notes/EditWindow.cxx +++ b/sd/source/ui/notes/EditWindow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ #include <editeng/fontitem.hxx> #include <editeng/editstat.hxx> -#define SCROLL_LINE 24 +#define SCROLL_LINE 24 using namespace com::sun::star::accessibility; using namespace com::sun::star; @@ -121,11 +121,11 @@ void SmGetLeftSelectionPart(const ESelection aSel, (aSel.nStartPara < aSel.nEndPara) || (aSel.nStartPara == aSel.nEndPara && aSel.nStartPos < aSel.nEndPos) ) - { nPara = aSel.nStartPara; + { nPara = aSel.nStartPara; nPos = aSel.nStartPos; } else - { nPara = aSel.nEndPara; + { nPara = aSel.nEndPara; nPos = aSel.nEndPos; } } @@ -249,7 +249,7 @@ void EditWindow::DataChanged (const DataChangedEvent&) //! see also SmDocShell::GetEditEngine() ! //! - // pEditEngine->SetDefTab( USHORT( GetTextWidth( C2S("XXXX") ) ) ); + // pEditEngine->SetDefTab( USHORT( GetTextWidth( C2S("XXXX") ) ) ); USHORT aFntInfoId[3] = { EE_CHAR_FONTINFO, EE_CHAR_FONTINFO_CJK, EE_CHAR_FONTINFO_CTL }; @@ -280,7 +280,7 @@ void EditWindow::DataChanged (const DataChangedEvent&) // unfortunately this resets the whole edit engine // thus we need to save at least the text String aTxt( pEditEngine->GetText( LINEEND_LF ) ); - pEditEngine->Clear(); //#77957 incorrect font size + pEditEngine->Clear(); //#77957 incorrect font size pEditEngine->SetText( aTxt ); } @@ -332,7 +332,7 @@ void EditWindow::MouseButtonUp(const MouseEvent &rEvt) Window::MouseButtonUp (rEvt); // ggf FormulaCursor neu positionieren - // CursorMoveTimerHdl(&aCursorMoveTimer); + // CursorMoveTimerHdl(&aCursorMoveTimer); } @@ -353,7 +353,7 @@ void EditWindow::MouseButtonDown(const MouseEvent &rEvt) void EditWindow::Command(const CommandEvent& rCEvt) { - /* if (rCEvt.GetCommand() == COMMAND_CONTEXTMENU) + /* if (rCEvt.GetCommand() == COMMAND_CONTEXTMENU) { GetParent()->ToTop(); @@ -400,7 +400,7 @@ IMPL_LINK_INLINE_END( EditWindow, MenuSelectHdl, Menu *, EMPTYARG ) void EditWindow::KeyInput(const KeyEvent& ) { - /* if (rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE) + /* if (rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE) { BOOL bCallBase = TRUE; SfxViewShell* pViewShell = SfxViewShell::Current(); diff --git a/sd/source/ui/notes/EditWindow.hxx b/sd/source/ui/notes/EditWindow.hxx index 010a6bd09697..f2d6174b993c 100755 --- a/sd/source/ui/notes/EditWindow.hxx +++ b/sd/source/ui/notes/EditWindow.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ class Timer; namespace sd { namespace notes { -class EditWindow +class EditWindow : public Window, public DropTargetHelper { @@ -85,11 +85,11 @@ private: DECL_LINK(EditStatusHdl ,EditStatus *); DECL_LINK(ScrollHdl, ScrollBar *); - void CreateEditView(); + void CreateEditView(); - Rectangle AdjustScrollBars(); - void SetScrollBarRanges(); - void InitScrollBars(); + Rectangle AdjustScrollBars(); + void SetScrollBarRanges(); + void InitScrollBars(); // SmDocShell * GetDoc(); // SmViewShell * GetView(); @@ -98,26 +98,26 @@ private: EditEngine* CreateEditEngine (void); // Window - virtual void SetText(const XubString &rText); - virtual XubString GetText(); - virtual void GetFocus(); - virtual void LoseFocus(); - - ESelection GetSelection() const; - void SetSelection(const ESelection &rSel); - - BOOL IsEmpty() const; - BOOL IsSelected() const; - BOOL IsAllSelected() const; - void Cut(); - void Copy(); - void Paste(); - void Delete(); - void SelectAll(); - void MarkError(const Point &rPos); - void SelNextMark(); - void SelPrevMark(); - BOOL HasMark(const String &rText) const; + virtual void SetText(const XubString &rText); + virtual XubString GetText(); + virtual void GetFocus(); + virtual void LoseFocus(); + + ESelection GetSelection() const; + void SetSelection(const ESelection &rSel); + + BOOL IsEmpty() const; + BOOL IsSelected() const; + BOOL IsAllSelected() const; + void Cut(); + void Copy(); + void Paste(); + void Delete(); + void SelectAll(); + void MarkError(const Point &rPos); + void SelNextMark(); + void SelPrevMark(); + BOOL HasMark(const String &rText) const; void ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg ); }; diff --git a/sd/source/ui/notes/NotesChildWindow.cxx b/sd/source/ui/notes/NotesChildWindow.cxx index d62fc2f25e4b..2c397c68d6c8 100755 --- a/sd/source/ui/notes/NotesChildWindow.cxx +++ b/sd/source/ui/notes/NotesChildWindow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,10 +38,10 @@ namespace sd { namespace notes { NotesChildWindow::NotesChildWindow ( - ::Window* _pParent, - USHORT nId, - SfxBindings* pBindings, - SfxChildWinInfo* pInfo) + ::Window* _pParent, + USHORT nId, + SfxBindings* pBindings, + SfxChildWinInfo* pInfo) : SfxChildWindow (_pParent, nId) { pWindow = new NotesDockingWindow (pBindings, this, _pParent); diff --git a/sd/source/ui/notes/NotesChildWindow.src b/sd/source/ui/notes/NotesChildWindow.src index f01a258bf812..9e2087937dac 100755 --- a/sd/source/ui/notes/NotesChildWindow.src +++ b/sd/source/ui/notes/NotesChildWindow.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/notes/NotesDockingWindow.cxx b/sd/source/ui/notes/NotesDockingWindow.cxx index 2464696c4eff..c78e91cbeb39 100755 --- a/sd/source/ui/notes/NotesDockingWindow.cxx +++ b/sd/source/ui/notes/NotesDockingWindow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/notes/NotesDockingWindow.hxx b/sd/source/ui/notes/NotesDockingWindow.hxx index b26756c14e30..b51d19548548 100755 --- a/sd/source/ui/notes/NotesDockingWindow.hxx +++ b/sd/source/ui/notes/NotesDockingWindow.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/notes/TextLogger.cxx b/sd/source/ui/notes/TextLogger.cxx index bf73b67aad23..05b12199a734 100755 --- a/sd/source/ui/notes/TextLogger.cxx +++ b/sd/source/ui/notes/TextLogger.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -96,7 +96,7 @@ void TextLogger::ConnectToEditWindow (EditWindow* pEditWindow) if (pEditWindow != NULL) pEditWindow->AddEventListener( LINK(this, TextLogger, WindowEventHandler)); - else + else mpEditWindow->RemoveEventListener( LINK(this, TextLogger, WindowEventHandler)); @@ -112,7 +112,7 @@ IMPL_LINK(TextLogger, WindowEventHandler, VclWindowEvent*, pEvent) if (pEvent != NULL) { DBG_ASSERT(static_cast<VclWindowEvent*>(pEvent)->GetWindow() - == mpEditWindow, + == mpEditWindow, "TextLogger: received event from unknown window"); switch (pEvent->GetId()) { diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx b/sd/source/ui/presenter/CanvasUpdateRequester.cxx index 4435c265e989..a7f1b58c082b 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.cxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx index 6a93f5e85d27..c9b575561bf4 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.hxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,18 +57,18 @@ public: const css::uno::Reference<css::rendering::XSpriteCanvas>& rxCanvas); void RequestUpdate (const sal_Bool bUpdateAll); - + private: CanvasUpdateRequester (const css::uno::Reference<css::rendering::XSpriteCanvas>& rxCanvas); ~CanvasUpdateRequester (void); class Deleter; friend class Deleter; - + typedef ::std::vector< ::std::pair< - css::uno::Reference<css::rendering::XSpriteCanvas>, + css::uno::Reference<css::rendering::XSpriteCanvas>, ::boost::shared_ptr<CanvasUpdateRequester> > > RequesterMap; static RequesterMap maRequesterMap; - + css::uno::Reference<css::rendering::XSpriteCanvas> mxCanvas; ULONG mnUserEventId; sal_Bool mbUpdateFlag; diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index a1f583a4e40c..1beb78f998a4 100755 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -108,15 +108,15 @@ public: virtual void SAL_CALL setAlpha (double nAlpha) throw (lang::IllegalArgumentException,RuntimeException); - + virtual void SAL_CALL move (const geometry::RealPoint2D& rNewPos, const rendering::ViewState& rViewState, const rendering::RenderState& rRenderState) throw (lang::IllegalArgumentException,RuntimeException); - + virtual void SAL_CALL transform (const geometry::AffineMatrix2D& rTransformation) throw (lang::IllegalArgumentException,RuntimeException); - + virtual void SAL_CALL clip (const Reference<rendering::XPolyPolygon2D>& rClip) throw (RuntimeException); @@ -125,13 +125,13 @@ public: virtual void SAL_CALL show (void) throw (RuntimeException); - + virtual void SAL_CALL hide (void) throw (RuntimeException); - + // XCustomSprite - + virtual Reference<rendering::XCanvas> SAL_CALL getContentCanvas (void) throw (RuntimeException); @@ -141,7 +141,7 @@ private: Reference<awt::XWindow> mxBaseWindow; geometry::RealPoint2D maPosition; geometry::RealSize2D maSpriteSize; - + void ThrowIfDisposed (void) throw (css::lang::DisposedException); }; @@ -187,7 +187,7 @@ PresenterCanvas::PresenterCanvas ( { if (mxWindow.is()) mxWindow->addWindowListener(this); - + if (mxUpdateCanvas.is()) mpUpdateRequester = CanvasUpdateRequester::Instance(mxUpdateCanvas); } @@ -213,7 +213,7 @@ void SAL_CALL PresenterCanvas::disposing (void) //----- XInitialization ------------------------------------------------------- - + void SAL_CALL PresenterCanvas::initialize ( const Sequence<Any>& rArguments) throw(Exception, RuntimeException) @@ -625,7 +625,7 @@ Reference<rendering::XAnimatedSprite> SAL_CALL else return NULL; } - + @@ -646,7 +646,7 @@ Reference<rendering::XAnimatedSprite> SAL_CALL else return NULL; } - + @@ -867,11 +867,11 @@ css::rendering::ViewState PresenterCanvas::MergeViewState ( // Prepare the local clip rectangle. ::basegfx::B2DRectangle aWindowRange (GetClipRectangle(aViewState.AffineTransform, rOffset)); - + // Adapt the offset of the view state. aViewState.AffineTransform.m02 += rOffset.X; aViewState.AffineTransform.m12 += rOffset.Y; - + // Adapt the clip polygon. if ( ! aViewState.Clip.is()) { @@ -963,7 +963,7 @@ awt::Point PresenterCanvas::GetOffset (const Reference<awt::XWindow>& rxBaseWind maClipRectangle.X + maClipRectangle.Width + rOffset.X, maClipRectangle.Y + maClipRectangle.Height + rOffset.Y); } - + // The local clip rectangle is used to clip the view state clipping // polygon. ::basegfx::B2DRectangle aWindowRectangle ( @@ -1118,7 +1118,7 @@ void SAL_CALL PresenterCustomSprite::setAlpha (const double nAlpha) ThrowIfDisposed(); mxSprite->setAlpha(nAlpha); } - + @@ -1197,7 +1197,7 @@ void SAL_CALL PresenterCustomSprite::hide (void) //----- XCustomSprite --------------------------------------------------------- - + Reference<rendering::XCanvas> PresenterCustomSprite::getContentCanvas (void) throw (RuntimeException) { diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx index 6cc97d14c6fa..c5a31b1fdb6c 100644 --- a/sd/source/ui/presenter/PresenterCanvas.hxx +++ b/sd/source/ui/presenter/PresenterCanvas.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -150,52 +150,52 @@ public: const css::geometry::RealPoint2D& rLocation, const css::geometry::RealSize2D& rSize); - + // XInitialization - + virtual void SAL_CALL initialize ( const css::uno::Sequence<css::uno::Any>& rArguments) throw(css::uno::Exception, css::uno::RuntimeException); - + // XCanvas virtual void SAL_CALL clear (void) throw (css::uno::RuntimeException); - + virtual void SAL_CALL drawPoint ( const css::geometry::RealPoint2D& aPoint, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual void SAL_CALL drawLine ( const css::geometry::RealPoint2D& aStartPoint, const css::geometry::RealPoint2D& aEndPoint, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual void SAL_CALL drawBezier ( const css::geometry::RealBezierSegment2D& aBezierSegment, const css::geometry::RealPoint2D& aEndPoint, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL drawPolyPolygon ( const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL strokePolyPolygon ( const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState, const css::rendering::StrokeAttributes& aStrokeAttributes) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL strokeTexturedPolyPolygon ( const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, @@ -206,7 +206,7 @@ public: throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL strokeTextureMappedPolyPolygon( const css::uno::Reference<css::rendering::XPolyPolygon2D >& xPolyPolygon, @@ -218,7 +218,7 @@ public: throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XPolyPolygon2D> SAL_CALL queryStrokeShapes( const css::uno::Reference<css::rendering::XPolyPolygon2D>& xPolyPolygon, @@ -226,7 +226,7 @@ public: const css::rendering::RenderState& aRenderState, const css::rendering::StrokeAttributes& aStrokeAttributes) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL fillPolyPolygon( const css::uno::Reference<css::rendering::XPolyPolygon2D>& xPolyPolygon, @@ -234,7 +234,7 @@ public: const css::rendering::RenderState& aRenderState) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL fillTexturedPolyPolygon( const css::uno::Reference<css::rendering::XPolyPolygon2D>& xPolyPolygon, @@ -244,7 +244,7 @@ public: throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL fillTextureMappedPolyPolygon( const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, @@ -255,7 +255,7 @@ public: throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCanvasFont> SAL_CALL createFont( const css::rendering::FontRequest& aFontRequest, @@ -263,13 +263,13 @@ public: const css::geometry::Matrix2D& aFontMatrix) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Sequence<css::rendering::FontInfo> SAL_CALL queryAvailableFonts( const css::rendering::FontInfo& aFilter, const css::uno::Sequence< css::beans::PropertyValue >& aFontProperties) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL drawText( const css::rendering::StringContext& aText, @@ -278,14 +278,14 @@ public: const css::rendering::RenderState& aRenderState, ::sal_Int8 nTextDirection) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL drawTextLayout( const css::uno::Reference< css::rendering::XTextLayout >& xLayoutetText, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL drawBitmap( const css::uno::Reference< css::rendering::XBitmap >& xBitmap, @@ -294,7 +294,7 @@ public: throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL drawBitmapModulated( const css::uno::Reference< css::rendering::XBitmap>& xBitmap, @@ -303,7 +303,7 @@ public: throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XGraphicDevice> SAL_CALL getDevice (void) throw (css::uno::RuntimeException); @@ -323,14 +323,14 @@ public: css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException); - + // XSpriteCanvas css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation ( const css::uno::Reference< css::rendering::XAnimation >& animation) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromBitmaps ( const css::uno::Sequence< @@ -339,17 +339,17 @@ public: throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException); - + css::uno::Reference< css::rendering::XCustomSprite > SAL_CALL createCustomSprite ( const css::geometry::RealSize2D& spriteSize) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + css::uno::Reference< css::rendering::XSprite > SAL_CALL createClonedSprite ( const css::uno::Reference< css::rendering::XSprite >& original) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + ::sal_Bool SAL_CALL updateScreen (::sal_Bool bUpdateAll) throw (css::uno::RuntimeException); @@ -364,13 +364,13 @@ public: virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException); - + virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException); - + virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException); - + virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException); @@ -382,10 +382,10 @@ public: virtual sal_Bool SAL_CALL hasAlpha (void) throw (css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XBitmapCanvas> SAL_CALL queryBitmapCanvas (void) throw (css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XBitmap> SAL_CALL getScaledBitmap( const css::geometry::RealSize2D& rNewSize, sal_Bool bFast) diff --git a/sd/source/ui/presenter/PresenterCanvasFactory.cxx b/sd/source/ui/presenter/PresenterCanvasFactory.cxx index 7ce6bb4815b7..8d30fbd965a4 100644 --- a/sd/source/ui/presenter/PresenterCanvasFactory.cxx +++ b/sd/source/ui/presenter/PresenterCanvasFactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -205,7 +205,7 @@ Reference<rendering::XCanvas> PresenterCanvasFactory::CreateCanvasForSprite ( { OSL_ASSERT(rxSharedWindow.is()); (void)rxWindow.is(); - + SharedWindowContainer::iterator iDescriptor ( mpSharedWindows->FindDescriptor(rxSharedWindow)); if (iDescriptor != mpSharedWindows->end()) @@ -238,14 +238,14 @@ Reference<rendering::XCanvas> PresenterCanvasFactory::CreateCanvas ( if (pWindow != NULL) { Sequence<Any> aArg (5); - + // common: first any is VCL pointer to window (for VCL canvas) aArg[0] = makeAny(reinterpret_cast<sal_Int64>(pWindow)); aArg[1] = Any(); aArg[2] = makeAny(::com::sun::star::awt::Rectangle()); aArg[3] = makeAny(sal_False); aArg[4] = makeAny(rxWindow); - + Reference<lang::XMultiServiceFactory> xFactory (::comphelper::getProcessServiceFactory()); return Reference<rendering::XCanvas>( xFactory->createInstanceWithArguments( diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index 6157c47c0d66..7897cde78aa5 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,7 +102,7 @@ void SAL_CALL PresenterHelper::initialize (const Sequence<Any>& rArguments) { (void)rArguments; } - + @@ -179,7 +179,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createSharedCanvas ( OUString::createFromAscii("illegal argument"), Reference<XInterface>(static_cast<XWeak*>(this))); } - + if (rxWindow == rxSharedWindow) return rxSharedCanvas; else @@ -208,14 +208,14 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas ( if (pWindow != NULL) { Sequence<Any> aArg (5); - + // common: first any is VCL pointer to window (for VCL canvas) aArg[0] = makeAny(reinterpret_cast<sal_Int64>(pWindow)); aArg[1] = Any(); aArg[2] = makeAny(::com::sun::star::awt::Rectangle()); aArg[3] = makeAny(sal_False); aArg[4] = makeAny(rxWindow); - + Reference<lang::XMultiServiceFactory> xFactory ( mxComponentContext->getServiceManager(), UNO_QUERY_THROW); return Reference<rendering::XCanvas>( @@ -255,7 +255,7 @@ Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap ( { if ( ! rxCanvas.is()) return NULL; - + ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); if (mpGraphicFilter.get() == NULL) diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx index 75b3bb9f7a75..af5aaab6bb1d 100644 --- a/sd/source/ui/presenter/PresenterHelper.hxx +++ b/sd/source/ui/presenter/PresenterHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ public: virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) throw(css::uno::Exception,css::uno::RuntimeException); - + // XPresenterHelper @@ -75,7 +75,7 @@ public: sal_Bool bEnableChildTransparentMode, sal_Bool bEnableParentClip) throw (css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCanvas> SAL_CALL createSharedCanvas ( const css::uno::Reference<css::rendering::XSpriteCanvas>& rxUpdateCanvas, const css::uno::Reference<css::awt::XWindow>& rxUpdateWindow, @@ -109,7 +109,7 @@ public: const css::uno::Reference<css::awt::XWindow>& rxChildWindow, const css::uno::Reference<css::awt::XWindow>& rxParentWindow) throw (css::uno::RuntimeException); - + private: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; ::boost::scoped_ptr<GraphicFilter> mpGraphicFilter; diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index 3f50c6f7a1b7..823bf3600d5a 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -371,7 +371,7 @@ void PresenterPreviewCache::PresenterCacheContext::NotifyPreviewCreation ( const ::boost::shared_ptr<BitmapEx>& rPreview) { (void)rPreview; - + if ( ! mxSlides.is()) return; const sal_Int32 nCount(mxSlides->getCount()); @@ -426,10 +426,10 @@ const SdrPage* PresenterPreviewCache::PresenterCacheContext::GetPage (CacheKey a PresenterPreviewCache::PresenterCacheContext::GetEntryList (bool bVisible) { ::boost::shared_ptr<std::vector<CacheKey> > pKeys (new std::vector<CacheKey>()); - + if ( ! mxSlides.is()) return pKeys; - + const sal_Int32 nFirstIndex (bVisible ? mnFirstVisibleSlideIndex : 0); const sal_Int32 nLastIndex (bVisible ? mnLastVisibleSlideIndex : mxSlides->getCount()-1); @@ -453,11 +453,11 @@ sal_Int32 PresenterPreviewCache::PresenterCacheContext::GetPriority (CacheKey aK return 0; const sal_Int32 nCount (mxSlides->getCount()); - + for (sal_Int32 nIndex=mnFirstVisibleSlideIndex; nIndex<=mnLastVisibleSlideIndex; ++nIndex) if (aKey == GetPage(nIndex)) return -nCount-1+nIndex; - + for (sal_Int32 nIndex=0; nIndex<=nCount; ++nIndex) if (aKey == GetPage(nIndex)) return nIndex; diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx index 115212e0281c..5d1b3262a59e 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.hxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,15 +66,15 @@ public: */ virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) throw(css::uno::Exception,css::uno::RuntimeException); - + // XSlidePreviewCache - + virtual void SAL_CALL setDocumentSlides ( const css::uno::Reference<css::container::XIndexAccess>& rxSlides, const css::uno::Reference<css::uno::XInterface>& rxDocument) throw (css::uno::RuntimeException); - + virtual void SAL_CALL setVisibleRange ( sal_Int32 nFirstVisibleSlideIndex, sal_Int32 nLastVisibleSlideIndex) diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index ba90a92939ca..9114f6957151 100755 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx index 85c7d87efeb4..6524fbccb4dd 100644 --- a/sd/source/ui/presenter/PresenterTextView.hxx +++ b/sd/source/ui/presenter/PresenterTextView.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ public: virtual ~PresenterTextView (void); // XInitialization - + virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) throw (css::uno::Exception, css::uno::RuntimeException); diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx index 92c570604dcd..81c66b84dba3 100644 --- a/sd/source/ui/presenter/SlideRenderer.cxx +++ b/sd/source/ui/presenter/SlideRenderer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -205,7 +205,7 @@ BitmapEx SlideRenderer::CreatePreview ( OUString::createFromAscii("SlideRenderer::createPreview() called with invalid slide"), static_cast<XWeak*>(this), 0); - + // Determine the size of the current slide and its aspect ratio. Size aPageSize = pPage->GetSize(); if (aPageSize.Height() <= 0) @@ -230,14 +230,14 @@ BitmapEx SlideRenderer::CreatePreview ( nFactor = 1; else if (nFactor > 10) nFactor = 10; - + // Create the preview. When the super sample factor n is greater than 1 // then a preview is created in size (n*width, n*height) and then scaled // down to (width, height). This is a poor mans antialiasing for the // time being. When we have true antialiasing support this workaround // can be removed. const Image aPreview = maPreviewRenderer.RenderPage ( - pPage, + pPage, Size(aPreviewSize.Width*nFactor, aPreviewSize.Height*nFactor), ::rtl::OUString()); if (nFactor == 1) diff --git a/sd/source/ui/presenter/SlideRenderer.hxx b/sd/source/ui/presenter/SlideRenderer.hxx index e5705dbb3cfb..d4adbff08f55 100644 --- a/sd/source/ui/presenter/SlideRenderer.hxx +++ b/sd/source/ui/presenter/SlideRenderer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,13 +63,13 @@ public: // XInitialization - + virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) throw (css::uno::Exception, css::uno::RuntimeException); - + // XSlideRenderer - + virtual css::uno::Reference<css::awt::XBitmap> SAL_CALL createPreview ( const ::css::uno::Reference<css::drawing::XDrawPage>& rxSlide, const css::awt::Size& rMaximumPreviewPixelSize, @@ -87,7 +87,7 @@ public: double nSlideAspectRatio, const css::awt::Size& rMaximumPreviewPixelSize) throw (css::uno::RuntimeException); - + private: PreviewRenderer maPreviewRenderer; diff --git a/sd/source/ui/slideshow/PaneHider.cxx b/sd/source/ui/slideshow/PaneHider.cxx index 2841891f31ce..b6d793824858 100755 --- a/sd/source/ui/slideshow/PaneHider.cxx +++ b/sd/source/ui/slideshow/PaneHider.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slideshow/PaneHider.hxx b/sd/source/ui/slideshow/PaneHider.hxx index 0a865c683adb..01d5b504cd84 100644 --- a/sd/source/ui/slideshow/PaneHider.hxx +++ b/sd/source/ui/slideshow/PaneHider.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx index dc2c3b3fe5ea..6938826fc795 100644 --- a/sd/source/ui/slideshow/SlideShowRestarter.cxx +++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -128,7 +128,7 @@ IMPL_LINK(SlideShowRestarter, EndPresentation, void*, EMPTYARG) // console (which is displayed in the FullScreenPane). But the // timing has to be right and I did not find a better place for // it. - + // Wait for the full screen pane, which displays the presenter // console, to disappear. Only when it is gone, call // InitiatePresenterStart(), in order to begin the asynchronous @@ -142,7 +142,7 @@ IMPL_LINK(SlideShowRestarter, EndPresentation, void*, EMPTYARG) { ::sd::framework::ConfigurationController::Lock aLock ( pHelper->GetConfigurationController()); - + pHelper->RunOnConfigurationEvent( FrameworkHelper::msConfigurationUpdateEndEvent, ::boost::bind(&SlideShowRestarter::StartPresentation, shared_from_this())); diff --git a/sd/source/ui/slideshow/SlideShowRestarter.hxx b/sd/source/ui/slideshow/SlideShowRestarter.hxx index 64ee3e4551f6..de713fbc7abb 100644 --- a/sd/source/ui/slideshow/SlideShowRestarter.hxx +++ b/sd/source/ui/slideshow/SlideShowRestarter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index fe6f9483b8b6..e2c094556012 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,7 +85,7 @@ ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, :: maMouseTimer.SetTimeout( HIDE_MOUSE_TIMEOUT ); maShowBackground = Wallpaper( Color( COL_BLACK ) ); -// SetBackground( Wallpaper( Color( COL_BLACK ) ) ); +// SetBackground( Wallpaper( Color( COL_BLACK ) ) ); SetBackground(); // avoids that VCL paints any background! GetParent()->Show(); AddEventListener( LINK( this, ShowWindow, EventHdl ) ); @@ -290,7 +290,7 @@ void ShowWindow::Paint(const Rectangle& rRect) { /* Region aOldClipRegion( GetClipRegion() ); - + Region aClipRegion( rRect ); aClipRegion.Exclude( maPresArea ); SetClipRegion( aClipRegion ); @@ -397,8 +397,8 @@ BOOL ShowWindow::SetEndMode() { DeleteWindowFromPaintView(); meShowWindowMode = SHOWWINDOWMODE_END; -// maShowBackground = GetBackground(); -// SetBackground( Wallpaper( Color( COL_BLACK ) ) ); +// maShowBackground = GetBackground(); +// SetBackground( Wallpaper( Color( COL_BLACK ) ) ); maShowBackground = Wallpaper( Color( COL_BLACK ) ); // hide navigator if it is visible @@ -433,8 +433,8 @@ BOOL ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout mnPauseTimeout = nTimeout; mnRestartPageIndex = nPageIndexToRestart; meShowWindowMode = SHOWWINDOWMODE_PAUSE; -// maShowBackground = GetBackground(); -// SetBackground( Wallpaper( Color( COL_BLACK ) ) ); +// maShowBackground = GetBackground(); +// SetBackground( Wallpaper( Color( COL_BLACK ) ) ); maShowBackground = Wallpaper( Color( COL_BLACK ) ); // hide navigator if it is visible @@ -465,8 +465,8 @@ BOOL ShowWindow::SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlan DeleteWindowFromPaintView(); mnRestartPageIndex = nPageIndexToRestart; meShowWindowMode = SHOWWINDOWMODE_BLANK; -// maShowBackground = GetBackground(); -// SetBackground( Wallpaper( rBlankColor ) ); +// maShowBackground = GetBackground(); +// SetBackground( Wallpaper( rBlankColor ) ); maShowBackground = Wallpaper( rBlankColor ); // hide navigator if it is visible @@ -497,7 +497,7 @@ void ShowWindow::TerminateShow() maPauseTimer.Stop(); maMouseTimer.Stop(); Erase(); -// SetBackground( maShowBackground ); +// SetBackground( maShowBackground ); maShowBackground = Wallpaper( Color( COL_BLACK ) ); meShowWindowMode = SHOWWINDOWMODE_NORMAL; mnPauseTimeout = SLIDE_NO_TIMEOUT; @@ -535,7 +535,7 @@ void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart ) maLogo.Clear(); maPauseTimer.Stop(); Erase(); -// SetBackground( maShowBackground ); +// SetBackground( maShowBackground ); maShowBackground = Wallpaper( Color( COL_BLACK ) ); meShowWindowMode = SHOWWINDOWMODE_NORMAL; mnPauseTimeout = SLIDE_NO_TIMEOUT; @@ -543,11 +543,11 @@ void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart ) if( mpViewShell ) { rtl::Reference< SlideShow > xSlideShow( SlideShow::GetSlideShow( mpViewShell->GetViewShellBase() ) ); - + if( xSlideShow.is() ) { AddWindowToPaintView(); - + if( SHOWWINDOWMODE_BLANK == eOldShowWindowMode ) { xSlideShow->pause(false); @@ -574,16 +574,16 @@ void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart ) void ShowWindow::DrawPauseScene( BOOL bTimeoutOnly ) { - const MapMode& rMap = GetMapMode(); - const Point aOutOrg( PixelToLogic( Point() ) ); - const Size aOutSize( GetOutputSize() ); - const Size aTextSize( LogicToLogic( Size( 0, 14 ), MAP_POINT, rMap ) ); - const Size aOffset( LogicToLogic( Size( 1000, 1000 ), MAP_100TH_MM, rMap ) ); - String aText( SdResId( STR_PRES_PAUSE ) ); - BOOL bDrawn = FALSE; + const MapMode& rMap = GetMapMode(); + const Point aOutOrg( PixelToLogic( Point() ) ); + const Size aOutSize( GetOutputSize() ); + const Size aTextSize( LogicToLogic( Size( 0, 14 ), MAP_POINT, rMap ) ); + const Size aOffset( LogicToLogic( Size( 1000, 1000 ), MAP_100TH_MM, rMap ) ); + String aText( SdResId( STR_PRES_PAUSE ) ); + BOOL bDrawn = FALSE; - Font aFont( GetSettings().GetStyleSettings().GetMenuFont() ); - const Font aOldFont( GetFont() ); + Font aFont( GetSettings().GetStyleSettings().GetMenuFont() ); + const Font aOldFont( GetFont() ); aFont.SetSize( aTextSize ); aFont.SetColor( COL_WHITE ); @@ -599,7 +599,7 @@ void ShowWindow::DrawPauseScene( BOOL bTimeoutOnly ) else aGrfSize = LogicToLogic( maLogo.GetPrefSize(), maLogo.GetPrefMapMode(), rMap ); - const Point aGrfPos( Max( aOutOrg.X() + aOutSize.Width() - aGrfSize.Width() - aOffset.Width(), aOutOrg.X() ), + const Point aGrfPos( Max( aOutOrg.X() + aOutSize.Width() - aGrfSize.Width() - aOffset.Width(), aOutOrg.X() ), Max( aOutOrg.Y() + aOutSize.Height() - aGrfSize.Height() - aOffset.Height(), aOutOrg.Y() ) ); if( maLogo.IsAnimated() ) @@ -610,24 +610,24 @@ void ShowWindow::DrawPauseScene( BOOL bTimeoutOnly ) if( SLIDE_NO_TIMEOUT != mnPauseTimeout ) { - MapMode aVMap( rMap ); - VirtualDevice aVDev( *this ); + MapMode aVMap( rMap ); + VirtualDevice aVDev( *this ); aVMap.SetOrigin( Point() ); aVDev.SetMapMode( aVMap ); aVDev.SetBackground( Wallpaper( Color( COL_BLACK ) ) ); - + // set font first, to determine real output height aVDev.SetFont( aFont ); - + const Size aVDevSize( aOutSize.Width(), aVDev.GetTextHeight() ); if( aVDev.SetOutputSize( aVDevSize ) ) { // Note: if performance gets an issue here, we can use NumberFormatter directly - SvtSysLocale aSysLocale; + SvtSysLocale aSysLocale; const LocaleDataWrapper& aLocaleData = aSysLocale.GetLocaleData(); - + aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " ( " )); aText += aLocaleData.getDuration( Time( 0, 0, mnPauseTimeout ) ); aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " )" )); @@ -649,12 +649,12 @@ void ShowWindow::DrawPauseScene( BOOL bTimeoutOnly ) void ShowWindow::DrawEndScene() { - const Font aOldFont( GetFont() ); - Font aFont( GetSettings().GetStyleSettings().GetMenuFont() ); + const Font aOldFont( GetFont() ); + Font aFont( GetSettings().GetStyleSettings().GetMenuFont() ); - const Point aOutOrg( PixelToLogic( Point() ) ); - const Size aTextSize( LogicToLogic( Size( 0, 14 ), MAP_POINT, GetMapMode() ) ); - const String aText( SdResId( STR_PRES_SOFTEND ) ); + const Point aOutOrg( PixelToLogic( Point() ) ); + const Size aTextSize( LogicToLogic( Size( 0, 14 ), MAP_POINT, GetMapMode() ) ); + const String aText( SdResId( STR_PRES_SOFTEND ) ); aFont.SetSize( aTextSize ); aFont.SetColor( COL_WHITE ); diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx index 9521b6946138..60f2ddeadd81 100644 --- a/sd/source/ui/slideshow/showwindow.hxx +++ b/sd/source/ui/slideshow/showwindow.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,63 +74,63 @@ enum ShowWindowMode class ShowWindow : public ::sd::Window { -// friend class ShowWindowImpl; +// friend class ShowWindowImpl; public: ShowWindow ( const ::rtl::Reference< ::sd::SlideshowImpl >& xController, ::Window* pParent ); virtual ~ShowWindow (void); - BOOL SetEndMode(); - BOOL SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeoutSec = SLIDE_NO_TIMEOUT, Graphic* pLogo = NULL ); - BOOL SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlankColor ); + BOOL SetEndMode(); + BOOL SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeoutSec = SLIDE_NO_TIMEOUT, Graphic* pLogo = NULL ); + BOOL SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlankColor ); - const Color& GetBlankColor() const { return maShowBackground.GetColor(); } + const Color& GetBlankColor() const { return maShowBackground.GetColor(); } - void SetPreviewMode(); - void SetPresentationArea( const Rectangle& rPresArea ); + void SetPreviewMode(); + void SetPresentationArea( const Rectangle& rPresArea ); - void SetMouseAutoHide( bool bMouseAutoHide ) { mbMouseAutoHide = bMouseAutoHide; } + void SetMouseAutoHide( bool bMouseAutoHide ) { mbMouseAutoHide = bMouseAutoHide; } ShowWindowMode GetShowWindowMode() const { return meShowWindowMode; } - void RestartShow( sal_Int32 nPageIndexToRestart ); + void RestartShow( sal_Int32 nPageIndexToRestart ); - virtual void Move(); - virtual void Resize(); - virtual void GetFocus(); - virtual void LoseFocus(); -// virtual void GrabFocus(); + virtual void Move(); + virtual void Resize(); + virtual void GetFocus(); + virtual void LoseFocus(); +// virtual void GrabFocus(); - virtual void KeyInput(const KeyEvent& rKEvt); - virtual void MouseMove(const MouseEvent& rMEvt); - virtual void MouseButtonUp(const MouseEvent& rMEvt); - virtual void MouseButtonDown(const MouseEvent& rMEvt); - virtual void Paint(const Rectangle& rRect); - virtual long Notify(NotifyEvent& rNEvt); + virtual void KeyInput(const KeyEvent& rKEvt); + virtual void MouseMove(const MouseEvent& rMEvt); + virtual void MouseButtonUp(const MouseEvent& rMEvt); + virtual void MouseButtonDown(const MouseEvent& rMEvt); + virtual void Paint(const Rectangle& rRect); + virtual long Notify(NotifyEvent& rNEvt); - void TerminateShow(); - void RestartShow(); + void TerminateShow(); + void RestartShow(); private: - void DrawPauseScene( BOOL bTimeoutOnly ); - void DrawEndScene(); - void DrawBlankScene(); + void DrawPauseScene( BOOL bTimeoutOnly ); + void DrawEndScene(); + void DrawBlankScene(); - void DeleteWindowFromPaintView(); - void AddWindowToPaintView(); + void DeleteWindowFromPaintView(); + void AddWindowToPaintView(); private: - Timer maPauseTimer; - Timer maMouseTimer; - Wallpaper maShowBackground; - Graphic maLogo; - ULONG mnPauseTimeout; - sal_Int32 mnRestartPageIndex; + Timer maPauseTimer; + Timer maMouseTimer; + Wallpaper maShowBackground; + Graphic maLogo; + ULONG mnPauseTimeout; + sal_Int32 mnRestartPageIndex; ShowWindowMode meShowWindowMode; - BOOL mbShowNavigatorAfterSpecialMode; - Rectangle maPresArea; - bool mbMouseAutoHide; - bool mbMouseCursorHidden; - ULONG mnFirstMouseMove; + BOOL mbShowNavigatorAfterSpecialMode; + Rectangle maPresArea; + bool mbMouseAutoHide; + bool mbMouseCursorHidden; + ULONG mnFirstMouseMove; DECL_LINK( PauseTimeoutHdl, Timer* pTimer ); DECL_LINK( MouseTimeoutHdl, Timer* pTimer ); diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 187d0d5ea715..66ca3c7d2630 100755 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -119,21 +119,21 @@ const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap() // NOTE: First member must be sorted static const SfxItemPropertyMapEntry aPresentationPropertyMap_Impl[] = { - { MAP_CHAR_LEN("AllowAnimations"), ATTR_PRESENT_ANIMATION_ALLOWED, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("CustomShow"), ATTR_PRESENT_CUSTOMSHOW, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("Display"), ATTR_PRESENT_DISPLAY, &::getCppuType((const sal_Int32*)0), 0, 0 }, - { MAP_CHAR_LEN("FirstPage"), ATTR_PRESENT_DIANAME, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("IsAlwaysOnTop"), ATTR_PRESENT_ALWAYS_ON_TOP, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("IsAutomatic"), ATTR_PRESENT_MANUEL, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("IsEndless"), ATTR_PRESENT_ENDLESS, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("IsFullScreen"), ATTR_PRESENT_FULLSCREEN, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("IsShowAll"), ATTR_PRESENT_ALL, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("IsMouseVisible"), ATTR_PRESENT_MOUSE, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("IsShowLogo"), ATTR_PRESENT_SHOW_PAUSELOGO, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("IsTransitionOnClick"), ATTR_PRESENT_CHANGE_PAGE, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("Pause"), ATTR_PRESENT_PAUSE_TIMEOUT, &::getCppuType((const sal_Int32*)0), 0, 0 }, - { MAP_CHAR_LEN("StartWithNavigator"), ATTR_PRESENT_NAVIGATOR, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("UsePen"), ATTR_PRESENT_PEN, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("AllowAnimations"), ATTR_PRESENT_ANIMATION_ALLOWED, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("CustomShow"), ATTR_PRESENT_CUSTOMSHOW, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("Display"), ATTR_PRESENT_DISPLAY, &::getCppuType((const sal_Int32*)0), 0, 0 }, + { MAP_CHAR_LEN("FirstPage"), ATTR_PRESENT_DIANAME, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("IsAlwaysOnTop"), ATTR_PRESENT_ALWAYS_ON_TOP, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("IsAutomatic"), ATTR_PRESENT_MANUEL, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("IsEndless"), ATTR_PRESENT_ENDLESS, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("IsFullScreen"), ATTR_PRESENT_FULLSCREEN, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("IsShowAll"), ATTR_PRESENT_ALL, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("IsMouseVisible"), ATTR_PRESENT_MOUSE, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("IsShowLogo"), ATTR_PRESENT_SHOW_PAUSELOGO, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("IsTransitionOnClick"), ATTR_PRESENT_CHANGE_PAGE, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("Pause"), ATTR_PRESENT_PAUSE_TIMEOUT, &::getCppuType((const sal_Int32*)0), 0, 0 }, + { MAP_CHAR_LEN("StartWithNavigator"), ATTR_PRESENT_NAVIGATOR, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("UsePen"), ATTR_PRESENT_PEN, &::getBooleanCppuType(), 0, 0 }, { 0,0,0,0,0,0} }; @@ -182,7 +182,7 @@ rtl::Reference< SlideShow > SlideShow::GetSlideShow( SdDrawDocument* pDocument ) if( pDocument ) xRet = rtl::Reference< SlideShow >( dynamic_cast< SlideShow* >( pDocument->getPresentation().get() ) ); - + return xRet; } @@ -198,7 +198,7 @@ rtl::Reference< SlideShow > SlideShow::GetSlideShow( ViewShellBase& rBase ) ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowController > SlideShow::GetSlideShowController(ViewShellBase& rBase ) { rtl::Reference< SlideShow > xSlideShow( GetSlideShow( rBase ) ); - + Reference< XSlideShowController > xRet; if( xSlideShow.is() ) xRet = xSlideShow->getController(); @@ -320,7 +320,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const case ATTR_PRESENT_ALL: { sal_Bool bVal = sal_False; - + if( aValue >>= bVal ) { bIllegalArgument = false; @@ -342,7 +342,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const if( aValue >>= bVal ) { bIllegalArgument = false; - + if( bVal == rPresSettings.mbLockedPages ) { bValuesChanged = true; @@ -355,7 +355,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const case ATTR_PRESENT_ANIMATION_ALLOWED: { sal_Bool bVal = sal_False; - + if( aValue >>= bVal ) { bIllegalArgument = false; @@ -684,7 +684,7 @@ void SAL_CALL SlideShow::end() throw(RuntimeException) // gone wrong. OSL_ASSERT(!mbIsInStartup); mbIsInStartup = false; - + rtl::Reference< SlideshowImpl > xController( mxController ); if( xController.is() ) { @@ -979,7 +979,7 @@ void SlideShow::activate( ViewShellBase& rBase ) { pShell->FinishInitialization( mpFullScreenFrameView ); mpFullScreenFrameView = 0; - + CreateController( pShell.get(), pShell->GetView(), rBase.GetViewWindow() ); if( mxController->startShow(mxCurrentSettings.get()) ) @@ -1156,8 +1156,8 @@ void SlideShow::StartInPlacePresentation() { bSuccess = mxController->startShow(mxCurrentSettings.get()); } - - if( !bSuccess ) + + if( !bSuccess ) end(); } } @@ -1187,7 +1187,7 @@ void SlideShow::StartFullscreenPresentation( ) delete mpFullScreenFrameView; mpFullScreenFrameView = new FrameView(mpDoc, pOriginalFrameView); -// Reference<XController> xController; +// Reference<XController> xController; // The new frame is created hidden. To make it visible and activate the // new view shell--a prerequisite to process slot calls and initialize @@ -1217,7 +1217,7 @@ sal_Int32 SlideShow::GetDisplay() if( pOptions ) nDisplay = pOptions->GetDisplay(); - if (nDisplay <= 0 ) + if (nDisplay <= 0 ) { try { diff --git a/sd/source/ui/slideshow/slideshow.hrc b/sd/source/ui/slideshow/slideshow.hrc index 709e2a79146e..4db6d22f9a72 100644 --- a/sd/source/ui/slideshow/slideshow.hrc +++ b/sd/source/ui/slideshow/slideshow.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,32 +28,32 @@ #ifndef SD_SLIDESHOW_HRC_ #define SD_SLIDESHOW_HRC_ -#define CM_PREV_SLIDE 1 -#define CM_NEXT_SLIDE 2 -#define CM_GOTO 3 -#define CM_SCREEN 4 -#define CM_SCREEN_BLACK 5 -#define CM_SCREEN_WHITE 6 -#define CM_ENDSHOW 7 -#define CM_FIRST_SLIDE 8 -#define CM_LAST_SLIDE 9 -#define CM_SLIDES 10 +#define CM_PREV_SLIDE 1 +#define CM_NEXT_SLIDE 2 +#define CM_GOTO 3 +#define CM_SCREEN 4 +#define CM_SCREEN_BLACK 5 +#define CM_SCREEN_WHITE 6 +#define CM_ENDSHOW 7 +#define CM_FIRST_SLIDE 8 +#define CM_LAST_SLIDE 9 +#define CM_SLIDES 10 //CM for extra presenter UI -#define CM_ERASE_ALLINK 11 -#define CM_ERASE_INK 12 -#define CM_ERASE_INK_PEN 13 -#define CM_ERASE_INK_PEN_VERY_THIN 14 -#define CM_ERASE_INK_PEN_THIN 15 -#define CM_ERASE_INK_PEN_NORMAL 16 -#define CM_ERASE_INK_PEN_THICK 17 -#define CM_ERASE_INK_PEN_VERY_THICK 18 -#define CM_COLOR_PEN 19 -#define CM_WIDTH_PEN 20 -#define CM_WIDTH_PEN_VERY_THIN 21 -#define CM_WIDTH_PEN_THIN 22 -#define CM_WIDTH_PEN_NORMAL 23 -#define CM_WIDTH_PEN_THICK 24 -#define CM_WIDTH_PEN_VERY_THICK 25 +#define CM_ERASE_ALLINK 11 +#define CM_ERASE_INK 12 +#define CM_ERASE_INK_PEN 13 +#define CM_ERASE_INK_PEN_VERY_THIN 14 +#define CM_ERASE_INK_PEN_THIN 15 +#define CM_ERASE_INK_PEN_NORMAL 16 +#define CM_ERASE_INK_PEN_THICK 17 +#define CM_ERASE_INK_PEN_VERY_THICK 18 +#define CM_COLOR_PEN 19 +#define CM_WIDTH_PEN 20 +#define CM_WIDTH_PEN_VERY_THIN 21 +#define CM_WIDTH_PEN_THIN 22 +#define CM_WIDTH_PEN_NORMAL 23 +#define CM_WIDTH_PEN_THICK 24 +#define CM_WIDTH_PEN_VERY_THICK 25 #define CM_PEN_MODE 26 #define CM_ERASE_MODE 27 #define CM_POINTER_OPTION 28 diff --git a/sd/source/ui/slideshow/slideshow.src b/sd/source/ui/slideshow/slideshow.src index 02c225fb5ea9..a7c05c2b57df 100644 --- a/sd/source/ui/slideshow/slideshow.src +++ b/sd/source/ui/slideshow/slideshow.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ Menu RID_SLIDESHOW_CONTEXTMENU { Identifier = CM_FIRST_SLIDE; Text [ en-US ] = "~First Slide"; - }; + }; MenuItem { Identifier = CM_LAST_SLIDE; @@ -161,7 +161,7 @@ Menu RID_SLIDESHOW_CONTEXTMENU { Identifier = CM_ERASE_INK_PEN_VERY_THIN; Text [ en-US ] = "~Very thin"; - }; + }; MenuItem { Identifier = CM_ERASE_INK_PEN_THIN; @@ -171,7 +171,7 @@ Menu RID_SLIDESHOW_CONTEXTMENU { Identifier = CM_ERASE_INK_PEN_NORMAL; Text [ en-US ] = "~Normal"; - }; + }; MenuItem { Identifier = CM_ERASE_INK_PEN_THICK; @@ -181,7 +181,7 @@ Menu RID_SLIDESHOW_CONTEXTMENU { Identifier = CM_ERASE_INK_PEN_VERY_THICK; Text [ en-US ] = "~Very Thick"; - }; + }; }; }; }; @@ -203,7 +203,7 @@ Menu RID_SLIDESHOW_CONTEXTMENU { Identifier = CM_SCREEN_BLACK; Text [ en-US ] = "~Black"; - }; + }; MenuItem { Identifier = CM_SCREEN_WHITE; diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 5afcb65ab90c..61c6559588d9 100755 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -118,21 +118,21 @@ namespace sd // werden sollen (muss in Reihenfolge der SIDs geordnet sein) static USHORT __READONLY_DATA pAllowed[] = { - SID_OPENDOC , // 5501 // damit interne Spruenge klappen - SID_JUMPTOMARK , // 5598 -// SID_SHOWPOPUPS , // 5929 + SID_OPENDOC , // 5501 // damit interne Spruenge klappen + SID_JUMPTOMARK , // 5598 +// SID_SHOWPOPUPS , // 5929 // SID_GALLERY , // 5960 - SID_OPENHYPERLINK , // 6676 + SID_OPENHYPERLINK , // 6676 // SID_GALLERY_FORMATS , // 10280 - SID_NAVIGATOR , // 10366 -// SID_FM_DESIGN_MODE , // 10629 - SID_PRESENTATION_END , // 27218 - SID_NAVIGATOR_PAGENAME , // 27287 - SID_NAVIGATOR_STATE , // 27288 - SID_NAVIGATOR_INIT , // 27289 - SID_NAVIGATOR_PEN , // 27291 - SID_NAVIGATOR_PAGE , // 27292 - SID_NAVIGATOR_OBJECT // 27293 + SID_NAVIGATOR , // 10366 +// SID_FM_DESIGN_MODE , // 10629 + SID_PRESENTATION_END , // 27218 + SID_NAVIGATOR_PAGENAME , // 27287 + SID_NAVIGATOR_STATE , // 27288 + SID_NAVIGATOR_INIT , // 27289 + SID_NAVIGATOR_PEN , // 27291 + SID_NAVIGATOR_PAGE , // 27292 + SID_NAVIGATOR_OBJECT // 27293 }; /////////////////////////////////////////////////////////////////////// @@ -169,7 +169,7 @@ public: bool nextSlide(); bool previousSlide(); - void displayCurrentSlide( const Reference< XSlideShow >& xShow, + void displayCurrentSlide( const Reference< XSlideShow >& xShow, const Reference< XDrawPagesSupplier>& xDrawPages, const bool bSkipAllMainSequenceEffects ); @@ -229,12 +229,12 @@ void AnimationSlideController::setPreviewNode( const Reference< XAnimationNode > } AnimationSlideController::AnimationSlideController( Reference< XIndexAccess > xSlides, Mode eMode ) -: meMode( eMode ) -, mnStartSlideNumber(-1) -, mnSlideCount( 0 ) -, mnCurrentSlideIndex(0) -, mnHiddenSlideNumber( -1 ) -, mxSlides( xSlides ) +: meMode( eMode ) +, mnStartSlideNumber(-1) +, mnSlideCount( 0 ) +, mnCurrentSlideIndex(0) +, mnHiddenSlideNumber( -1 ) +, mxSlides( xSlides ) { if( mxSlides.is() ) mnSlideCount = xSlides->getCount(); @@ -405,7 +405,7 @@ sal_Int32 AnimationSlideController::getNextSlideIndex() const case FROM: case CUSTOM: return mnHiddenSlideNumber == -1 ? mnCurrentSlideIndex + 1 : mnCurrentSlideIndex; - + default: case PREVIEW: return -1; @@ -468,7 +468,7 @@ bool AnimationSlideController::previousSlide() return jumpToSlideIndex( getPreviousSlideIndex() ); } -void AnimationSlideController::displayCurrentSlide( const Reference< XSlideShow >& xShow, +void AnimationSlideController::displayCurrentSlide( const Reference< XSlideShow >& xShow, const Reference< XDrawPagesSupplier>& xDrawPages, const bool bSkipAllMainSequenceEffects ) { @@ -479,7 +479,7 @@ void AnimationSlideController::displayCurrentSlide( const Reference< XSlideShow Reference< XDrawPage > xSlide; Reference< XAnimationNode > xAnimNode; ::std::vector<PropertyValue> aProperties; - + const sal_Int32 nNextSlideNumber = getNextSlideNumber(); if( getSlideAPI( nNextSlideNumber, xSlide, xAnimNode ) ) { @@ -517,7 +517,7 @@ void AnimationSlideController::displayCurrentSlide( const Reference< XSlideShow Sequence< PropertyValue > aPropertySequence (aProperties.size()); for (int nIndex=0,nCount=aProperties.size();nIndex<nCount; ++nIndex) aPropertySequence[nIndex] = aProperties[nIndex]; - + if( getSlideAPI( nCurrentSlideNumber, xSlide, xAnimNode ) ) xShow->displaySlide( xSlide, xDrawPages, xAnimNode, aPropertySequence ); } @@ -577,7 +577,7 @@ SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation, mpOldActiveWindow = mpViewShell->GetActiveWindow(); maUpdateTimer.SetTimeoutHdl(LINK(this, SlideshowImpl, updateHdl)); - + maDeactivateTimer.SetTimeoutHdl(LINK(this, SlideshowImpl, deactivateHdl)); maDeactivateTimer.SetTimeout( 20 ); @@ -683,7 +683,7 @@ void SAL_CALL SlideshowImpl::disposing() mpViewShell->SetActiveWindow(mpOldActiveWindow); mpShowWindow->SetViewShell( NULL ); } - + if( mpView ) mpView->InvalidateAllWin(); @@ -731,7 +731,7 @@ void SAL_CALL SlideshowImpl::disposing() delete mpTimeButton; mpTimeButton = 0; } - + if( mpShowWindow ) mpShowWindow->Hide(); @@ -775,13 +775,13 @@ void SAL_CALL SlideshowImpl::disposing() mbDisposed = true; } -bool SlideshowImpl::startPreview( +bool SlideshowImpl::startPreview( const Reference< XDrawPage >& xDrawPage, const Reference< XAnimationNode >& xAnimationNode, ::Window* pParent ) { bool bRet = false; - + try { const Reference<lang::XServiceInfo> xServiceInfo( xDrawPage, UNO_QUERY ); @@ -798,7 +798,7 @@ bool SlideshowImpl::startPreview( } } } - + mxPreviewDrawPage = xDrawPage; mxPreviewAnimationNode = xAnimationNode; meAnimationMode = ANIMATIONMODE_PREVIEW; @@ -901,7 +901,7 @@ bool SlideshowImpl::startPreview( bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) { const rtl::Reference<SlideshowImpl> this_(this); - + DBG_ASSERT( !mxShow.is(), "sd::SlideshowImpl::startShow(), called twice!" ); if( mxShow.is() ) return true; @@ -910,7 +910,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) return false; bool bRet = false; - + try { if( pPresSettings ) @@ -921,9 +921,9 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) // --- - String aPresSlide( maPresSettings.maPresPage ); + String aPresSlide( maPresSettings.maPresPage ); SdPage* pStartPage = mpViewShell ? mpViewShell->GetActualPage() : 0; - bool bStartWithActualSlide = pStartPage && + bool bStartWithActualSlide = pStartPage && ( (meAnimationMode != ANIMATIONMODE_SHOW) || SD_MOD()->GetSdOptions( mpDoc->GetDocumentType() )->IsStartWithActualPage() ); @@ -1033,9 +1033,9 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) Help::DisableContextHelp(); Help::DisableExtHelp(); - // mpTimeButton = new PushButton( mpShowWindow, SdResId( RID_TIME_BUTTON ) ); - // maPencil = Pointer( POINTER_PEN ); - // mpTimeButton->Hide(); + // mpTimeButton = new PushButton( mpShowWindow, SdResId( RID_TIME_BUTTON ) ); + // maPencil = Pointer( POINTER_PEN ); + // mpTimeButton->Hide(); if( maPresSettings.mbFullScreen ) { @@ -1096,14 +1096,14 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) OUString( RTL_CONSTASCII_USTRINGPARAM("AdvanceOnClick") ), -1, Any( ! (maPresSettings.mbLockedPages != sal_False) ), beans::PropertyState_DIRECT_VALUE ) ); - + aProperties.push_back( beans::PropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageAnimationsAllowed") ), -1, Any( maPresSettings.mbAnimationAllowed != sal_False ), beans::PropertyState_DIRECT_VALUE ) ); - const sal_Bool bZOrderEnabled( + const sal_Bool bZOrderEnabled( SD_MOD()->GetSdOptions( mpDoc->GetDocumentType() )->IsSlideshowRespectZOrder() ); aProperties.push_back( beans::PropertyValue( @@ -1111,19 +1111,19 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) -1, Any( bZOrderEnabled == sal_False ), beans::PropertyState_DIRECT_VALUE ) ); -/* +/* aProperties.push_back( beans::PropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("MouseVisible") ), -1, Any( maPresSettings.mbMouseVisible != sal_False ), beans::PropertyState_DIRECT_VALUE ) ); -*/ +*/ aProperties.push_back( beans::PropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("ForceManualAdvance") ), -1, Any( maPresSettings.mbManual != sal_False ), beans::PropertyState_DIRECT_VALUE ) ); - + if( maPresSettings.mbMouseAsPen ) { aProperties.push_back( @@ -1133,7 +1133,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) -1, Any( static_cast<sal_Int32>(0x00000000L) ), beans::PropertyState_DIRECT_VALUE ) ); } - + if (mbRehearseTimings) { aProperties.push_back( beans::PropertyValue( @@ -1142,7 +1142,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) } bRet = startShowImpl( Sequence<beans::PropertyValue>( - &aProperties[0], aProperties.size() ) ); + &aProperties[0], aProperties.size() ) ); } @@ -1168,10 +1168,10 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp try { mxShow = Reference< XSlideShow >( createSlideShow(), UNO_QUERY_THROW ); - mxView = mxView.createFromQuery( new SlideShowView( - *mpShowWindow, - mpDoc, - meAnimationMode, + mxView = mxView.createFromQuery( new SlideShowView( + *mpShowWindow, + mpDoc, + meAnimationMode, this, maPresSettings.mbFullScreen) ); @@ -1375,7 +1375,7 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw( Reference< XPropertySet > xSet( xShape, UNO_QUERY ); if( !xSet.is() ) continue; - + Reference< XPropertySetInfo > xSetInfo( xSet->getPropertySetInfo() ); if( !xSetInfo.is() || !xSetInfo->hasPropertyByName( msOnClick ) ) continue; @@ -1440,7 +1440,7 @@ void SlideshowImpl::displayCurrentSlide (const bool bSkipAllMainSequenceEffects) if( mpSlideController.get() && mxShow.is() ) { - Reference< XDrawPagesSupplier > xDrawPages( mpDoc->getUnoModel(), + Reference< XDrawPagesSupplier > xDrawPages( mpDoc->getUnoModel(), UNO_QUERY_THROW ); mpSlideController->displayCurrentSlide( mxShow, xDrawPages, bSkipAllMainSequenceEffects ); registerShapeEvents(mpSlideController->getCurrentSlideNumber()); @@ -1585,11 +1585,11 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun:: switch( pEvent->meClickAction ) { - case ClickAction_PREVPAGE: gotoPreviousSlide(); break; - case ClickAction_NEXTPAGE: gotoNextSlide(); break; - case ClickAction_FIRSTPAGE: gotoFirstSlide(); break; - case ClickAction_LASTPAGE: gotoLastSlide(); break; - case ClickAction_STOPPRESENTATION: endPresentation(); break; + case ClickAction_PREVPAGE: gotoPreviousSlide(); break; + case ClickAction_NEXTPAGE: gotoNextSlide(); break; + case ClickAction_FIRSTPAGE: gotoFirstSlide(); break; + case ClickAction_LASTPAGE: gotoLastSlide(); break; + case ClickAction_STOPPRESENTATION: endPresentation(); break; case ClickAction_BOOKMARK: { gotoBookmark( pEvent->maStrBookmark ); @@ -1919,7 +1919,7 @@ sal_Int32 SlideshowImpl::updateSlideShow (void) double fUpdate = 0.0; if( !xShow->update(fUpdate) ) fUpdate = -1.0; - + if (mxShow.is() && (fUpdate >= 0.0)) { if (::basegfx::fTools::equalZero(fUpdate)) @@ -1945,7 +1945,7 @@ sal_Int32 SlideshowImpl::updateSlideShow (void) // too high (only then conversion to milliseconds and long // integer may lead to zero value.) OSL_ASSERT(static_cast<ULONG>(fUpdate * 1000.0) > 0); - + Application::EnableNoYieldMode(false); Application::RemovePostYieldListener(LINK(this, SlideshowImpl, PostYieldListener)); @@ -2210,7 +2210,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG ) pMenu->EnableItem( CM_PEN_MODE, (maPresSettings.mbMouseAsPen)); // Adding button to displau if in Erase Mode pMenu->EnableItem( CM_ERASE_MODE, (maPresSettings.mbMouseAsPen)); -#endif +#endif const ShowWindowMode eMode = mpShowWindow->GetShowWindowMode(); pMenu->EnableItem( CM_NEXT_SLIDE, ( mpSlideController->getNextSlideIndex() != -1 ) ); @@ -2281,7 +2281,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG ) #ifdef ENABLE_PRESENTER_EXTRA_UI PopupMenu* pWidthMenu = pMenu->GetPopupMenu( CM_WIDTH_PEN); - + // populate color width list if( pWidthMenu ) { @@ -2293,7 +2293,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG ) { sal_Int32 nIterator; double nWidth; - + nWidth = 4.0; for( nIterator = 1; nIterator < 6; nIterator++) { @@ -2317,18 +2317,18 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG ) default: break; } - + pWidthMenu->EnableItem( (USHORT)(CM_WIDTH_PEN + nIterator), TRUE); if( nWidth == mdUserPaintStrokeWidth) pWidthMenu->CheckItem( (USHORT)(CM_WIDTH_PEN + nIterator) ); - + } } } PopupMenu* pEraseWidthMenu = pMenu->GetPopupMenu( CM_ERASE_INK_PEN); - + // populate eraser width list if( pEraseWidthMenu ) { @@ -2340,7 +2340,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG ) { sal_Int32 nEIterator; double nEWidth; - + nEWidth = 100.0; for( nEIterator = 1; nEIterator < 6; nEIterator++) { @@ -2364,15 +2364,15 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG ) default: break; } - + pEraseWidthMenu->EnableItem( (USHORT)(CM_ERASE_INK_PEN + nEIterator), TRUE); if( nEWidth == mnEraseInkSize) pEraseWidthMenu->CheckItem( (USHORT)(CM_ERASE_INK_PEN + nEIterator) ); if( mbSwitchPenMode ) - pMenu->CheckItem( (USHORT)(CM_PEN_MODE)); + pMenu->CheckItem( (USHORT)(CM_PEN_MODE)); if( mbSwitchEraserMode ) - pMenu->CheckItem( (USHORT)(CM_ERASE_MODE)); - + pMenu->CheckItem( (USHORT)(CM_ERASE_MODE)); + } } } @@ -2449,7 +2449,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) ::Color aColor( mnUserPaintColor ); SvColorDialog aColorDlg( mpShowWindow); aColorDlg.SetColor( aColor ); - + if (aColorDlg.Execute() ) { aColor = aColorDlg.GetColor(); @@ -2459,45 +2459,45 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) mbWasPaused = false; } break; - + case CM_WIDTH_PEN_VERY_THIN: { setPenWidth(4.0); mbWasPaused = false; } break; - + case CM_WIDTH_PEN_THIN: { setPenWidth(100.0); mbWasPaused = false; } break; - + case CM_WIDTH_PEN_NORMAL: { setPenWidth(150.0); mbWasPaused = false; } break; - + case CM_WIDTH_PEN_THICK: { setPenWidth(200.0); mbWasPaused = false; } break; - + case CM_WIDTH_PEN_VERY_THICK: { setPenWidth(400.0); mbWasPaused = false; } - break; + break; case CM_ERASE_ALLINK: { setEraseAllInk(true); - mbWasPaused = false; + mbWasPaused = false; } break; case CM_PEN_MODE: @@ -2518,7 +2518,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) mbWasPaused = false; } break; - + case CM_ERASE_INK_PEN_THIN: { setEraseInk(200); @@ -2532,7 +2532,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) mbWasPaused = false; } break; - + case CM_ERASE_INK_PEN_THICK: { setEraseInk(400); @@ -2544,7 +2544,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) setEraseInk(500); mbWasPaused = false; } - break; + break; } #endif @@ -2575,7 +2575,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) break; } } - + return 0; } @@ -2587,11 +2587,11 @@ Reference< XSlideShow > SlideshowImpl::createSlideShow() const try { - Reference< lang::XMultiServiceFactory > xFactory( + Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); - Reference< XInterface > xInt( xFactory->createInstance( + Reference< XInterface > xInt( xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.SlideShow")) ) ); xShow.set( xInt, UNO_QUERY_THROW ); @@ -2618,7 +2618,7 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons if( nSlideCount ) { - SdCustomShow* pCustomShow; + SdCustomShow* pCustomShow; if( !bStartWithActualSlide && mpDoc->GetCustomShowList() && maPresSettings.mbCustomShow ) pCustomShow = (SdCustomShow*) mpDoc->GetCustomShowList()->GetCurObject(); @@ -2626,7 +2626,7 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons pCustomShow = NULL; // create animation slide controller - AnimationSlideController::Mode eMode = + AnimationSlideController::Mode eMode = ( pCustomShow && pCustomShow->Count() ) ? AnimationSlideController::CUSTOM : (bAll ? AnimationSlideController::ALL : AnimationSlideController::FROM); @@ -2810,7 +2810,7 @@ void SlideshowImpl::resize( const Size& rSize ) // to the (preview) window; the ToTop() seems not to be necessary at // least for the preview). // if( !aOldSize.Width() && !aOldSize.Height() ) -// mpShowWindow->ToTop(); +// mpShowWindow->ToTop(); } if( mxView.is() ) try @@ -2854,7 +2854,7 @@ void SlideshowImpl::setActiveXToolbarsVisible( sal_Bool bVisible ) >>= xLayoutManager ) && xLayoutManager.is() ) { - xLayoutManager->setVisible( bVisible ); + xLayoutManager->setVisible( bVisible ); } } catch( uno::Exception& ) @@ -2953,7 +2953,7 @@ sal_Bool SAL_CALL SlideshowImpl::isActive() throw (RuntimeException) void SlideshowImpl::receiveRequest(SfxRequest& rReq) { - const SfxItemSet* pArgs = rReq.GetArgs(); + const SfxItemSet* pArgs = rReq.GetArgs(); switch ( rReq.GetSlot() ) { @@ -2963,14 +2963,14 @@ void SlideshowImpl::receiveRequest(SfxRequest& rReq) case SID_NAVIGATOR_PAGE: { - PageJump eJump = (PageJump)((SfxAllEnumItem&) pArgs->Get(SID_NAVIGATOR_PAGE)).GetValue(); + PageJump eJump = (PageJump)((SfxAllEnumItem&) pArgs->Get(SID_NAVIGATOR_PAGE)).GetValue(); switch( eJump ) { - case PAGE_FIRST: gotoFirstSlide(); break; - case PAGE_LAST: gotoLastSlide(); break; - case PAGE_NEXT: gotoNextSlide(); break; - case PAGE_PREVIOUS: gotoPreviousSlide(); break; - case PAGE_NONE: break; + case PAGE_FIRST: gotoFirstSlide(); break; + case PAGE_LAST: gotoLastSlide(); break; + case PAGE_NEXT: gotoNextSlide(); break; + case PAGE_PREVIOUS: gotoPreviousSlide(); break; + case PAGE_NONE: break; } } break; @@ -2981,7 +2981,7 @@ void SlideshowImpl::receiveRequest(SfxRequest& rReq) // is the bookmark a Slide? BOOL bIsMasterPage; - USHORT nPgNum = mpDoc->GetPageByName( aTarget, bIsMasterPage ); + USHORT nPgNum = mpDoc->GetPageByName( aTarget, bIsMasterPage ); SdrObject* pObj = NULL; if( nPgNum == SDRPAGE_NOTFOUND ) @@ -3017,7 +3017,7 @@ void SlideshowImpl::setAutoSaveState( bool bOn) util::URL aURL; aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/setAutoSaveState"); xParser->parseStrict(aURL); - + Sequence< beans::PropertyValue > aArgs(1); aArgs[0].Name = OUString::createFromAscii("AutoSaveState"); aArgs[0].Value <<= bOn ? sal_True : sal_False; @@ -3088,7 +3088,7 @@ Reference< XDrawPage > SAL_CALL SlideshowImpl::getSlideByIndex(::sal_Int32 Index { if( (mpSlideController.get() == 0 ) || (Index < 0) || (Index >= mpSlideController->getSlideIndexCount() ) ) throw IndexOutOfBoundsException(); - + return mpSlideController->getSlideByNumber( mpSlideController->getSlideNumber( Index ) ); } @@ -3169,11 +3169,11 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc Any aValueWidth; if( maPresSettings.mbMouseAsPen ) aValueWidth <<= mdUserPaintStrokeWidth; - + beans::PropertyValue aPenPropWidth; aPenPropWidth.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "UserPaintStrokeWidth" )); aPenPropWidth.Value = aValueWidth; - + mxShow->setProperty( aPenPropWidth ); // for Pen Mode @@ -3182,7 +3182,7 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc aValueSwitchPenMode <<= mbSwitchPenMode; beans::PropertyValue aPenPropSwitchPenMode; aPenPropSwitchPenMode.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "SwitchPenMode" )); - aPenPropSwitchPenMode.Value = aValueSwitchPenMode; + aPenPropSwitchPenMode.Value = aValueSwitchPenMode; mxShow->setProperty( aPenPropSwitchPenMode ); //for EraseAllInk : @@ -3231,7 +3231,7 @@ void SAL_CALL SlideshowImpl::setUseEraser( sal_Bool bMouseAsPen ) throw (Runtime aValueSwitchEraserMode <<= mbSwitchEraserMode; beans::PropertyValue aPenPropSwitchEraserMode; aPenPropSwitchEraserMode.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "SwitchEraserMode" )); - aPenPropSwitchEraserMode.Value = aValueSwitchEraserMode; + aPenPropSwitchEraserMode.Value = aValueSwitchEraserMode; mxShow->setProperty( aPenPropSwitchEraserMode ); } catch( Exception& e ) @@ -3267,7 +3267,7 @@ void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth ) throw (RuntimeEx } #endif // -------------------------------------------------------------------- - + sal_Int32 SAL_CALL SlideshowImpl::getPenColor() throw (RuntimeException) { ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); @@ -3295,7 +3295,7 @@ void SAL_CALL SlideshowImpl::setPenMode( bool bSwitchPenMode ) throw (RuntimeExc { ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); mbSwitchPenMode = bSwitchPenMode; - + if(mbSwitchPenMode == true){ mbSwitchEraserMode = false; }else{ @@ -3303,13 +3303,13 @@ void SAL_CALL SlideshowImpl::setPenMode( bool bSwitchPenMode ) throw (RuntimeExc } if( maPresSettings.mbMouseAsPen ) setUsePen( sal_True ); // Switch to Pen Mode - + } void SAL_CALL SlideshowImpl::setEraserMode(bool bSwitchEraserMode ) throw (RuntimeException) { ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); - mbSwitchEraserMode = bSwitchEraserMode; + mbSwitchEraserMode = bSwitchEraserMode; if(mbSwitchEraserMode = true){ mbSwitchPenMode = false; }else{ @@ -3318,7 +3318,7 @@ void SAL_CALL SlideshowImpl::setEraserMode(bool bSwitchEraserMode ) throw (Runti if( maPresSettings.mbMouseAsPen ) setUseEraser( sal_True ); // Switch to EraseMode - + } @@ -3334,14 +3334,14 @@ void SAL_CALL SlideshowImpl::setEraseAllInk( bool bEraseAllInk ) throw (RuntimeE setUsePen( sal_True ); // update erase all ink bool } - + void SAL_CALL SlideshowImpl::setEraseInk( sal_Int32 nEraseInkSize ) throw (RuntimeException) { ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); mnEraseInkSize=nEraseInkSize; mbSwitchPenMode = false; mbSwitchEraserMode = true; - if( maPresSettings.mbMouseAsPen ) + if( maPresSettings.mbMouseAsPen ) setUseEraser( sal_True ); // update erase ink size } #endif @@ -3695,7 +3695,7 @@ Reference< XSlideShow > SAL_CALL SlideshowImpl::getSlideShow() throw (RuntimeExc } // -------------------------------------------------------------------- - + PresentationSettingsEx::PresentationSettingsEx( const PresentationSettingsEx& r ) : PresentationSettings( r ) diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index cb33c4a740c7..c80078865cae 100755 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -361,54 +361,54 @@ private: SfxItemSet* mpNewAttr; ::Window* mpParentWindow; - ShowWindow* mpShowWindow; - PushButton* mpTimeButton; + ShowWindow* mpShowWindow; + PushButton* mpTimeButton; boost::shared_ptr< AnimationSlideController > mpSlideController; - long mnRestoreSlide; - Point maSlideOrigin; - Point maPopupMousePos; - Size maSlideSize; - Size maPresSize; + long mnRestoreSlide; + Point maSlideOrigin; + Point maPopupMousePos; + Size maSlideSize; + Size maPresSize; AnimationMode meAnimationMode; - String maCharBuffer; - Pointer maOldPointer; - Pointer maPencil; + String maCharBuffer; + Pointer maOldPointer; + Pointer maPencil; std::vector< ::sd::Window* > maDrawModeWindows; - ::sd::Window* mpOldActiveWindow; - Link maStarBASICGlobalErrorHdl; - unsigned long mnChildMask; - bool mbGridVisible; + ::sd::Window* mpOldActiveWindow; + Link maStarBASICGlobalErrorHdl; + unsigned long mnChildMask; + bool mbGridVisible; bool mbBordVisible; bool mbSlideBorderVisible; bool mbSetOnlineSpelling; - bool mbDisposed; - bool mbMouseIsDrawing; - bool mbAutoSaveWasOn; - bool mbRehearseTimings; - bool mbDesignMode; - bool mbIsPaused; - bool mbWasPaused; // used to cache pause state during context menu - bool mbInputFreeze; - sal_Bool mbActive; + bool mbDisposed; + bool mbMouseIsDrawing; + bool mbAutoSaveWasOn; + bool mbRehearseTimings; + bool mbDesignMode; + bool mbIsPaused; + bool mbWasPaused; // used to cache pause state during context menu + bool mbInputFreeze; + sal_Bool mbActive; PresentationSettings maPresSettings; - sal_Int32 mnUserPaintColor; + sal_Int32 mnUserPaintColor; #ifdef ENABLE_PRESENTER_EXTRA_UI - bool mbSwitchPenMode; - bool mbSwitchEraserMode; - double mdUserPaintStrokeWidth; - bool mbEraseAllInk; -// bool mbEraseInk; - sal_Int32 mnEraseInkSize; + bool mbSwitchPenMode; + bool mbSwitchEraserMode; + double mdUserPaintStrokeWidth; + bool mbEraseAllInk; +// bool mbEraseInk; + sal_Int32 mnEraseInkSize; #endif /// used in updateHdl to prevent recursive calls - sal_Int32 mnEntryCounter; + sal_Int32 mnEntryCounter; - sal_Int32 mnLastSlideNumber; - WrappedShapeEventImplMap maShapeEventMap; + sal_Int32 mnLastSlideNumber; + WrappedShapeEventImplMap maShapeEventMap; ::rtl::OUString msOnClick; ::rtl::OUString msBookmark; @@ -421,8 +421,8 @@ private: ::std::auto_ptr<PaneHider> mpPaneHider; - ULONG mnEndShowEvent; - ULONG mnContextMenuEvent; + ULONG mnEndShowEvent; + ULONG mnContextMenuEvent; sal_Int32 mnUpdateEvent; css::uno::Reference< css::presentation::XPresentation2 > mxPresentation; diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index c92a3913670b..adb0dc80d5bf 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,11 +62,11 @@ namespace sd { /////////////////////////////////////////////////////////////////////// -// SlideShowViewListeners +// SlideShowViewListeners /////////////////////////////////////////////////////////////////////// SlideShowViewListeners::SlideShowViewListeners( ::osl::Mutex& rMutex ) -: mrMutex( rMutex ) +: mrMutex( rMutex ) { } @@ -126,23 +126,23 @@ void SlideShowViewListeners::disposing( const lang::EventObject& _rEventSource ) } /////////////////////////////////////////////////////////////////////// -// SlideShowViewPaintListeners +// SlideShowViewPaintListeners /////////////////////////////////////////////////////////////////////// SlideShowViewPaintListeners::SlideShowViewPaintListeners( ::osl::Mutex& rMutex ) -: SlideShowViewPaintListeners_Base( rMutex ) +: SlideShowViewPaintListeners_Base( rMutex ) { } bool SlideShowViewPaintListeners::implTypedNotify( const Reference< awt::XPaintListener >& rListener, - const awt::PaintEvent& rEvent ) throw( uno::Exception ) + const awt::PaintEvent& rEvent ) throw( uno::Exception ) { rListener->windowPaint( rEvent ); return true; // continue calling listeners } /////////////////////////////////////////////////////////////////////// -// SlideShowViewMouseListeners +// SlideShowViewMouseListeners /////////////////////////////////////////////////////////////////////// SlideShowViewMouseListeners::SlideShowViewMouseListeners( ::osl::Mutex& rMutex ) : @@ -150,8 +150,8 @@ SlideShowViewMouseListeners::SlideShowViewMouseListeners( ::osl::Mutex& rMutex ) { } -bool SlideShowViewMouseListeners::implTypedNotify( const Reference< awt::XMouseListener >& rListener, - const WrappedMouseEvent& rEvent ) throw( uno::Exception ) +bool SlideShowViewMouseListeners::implTypedNotify( const Reference< awt::XMouseListener >& rListener, + const WrappedMouseEvent& rEvent ) throw( uno::Exception ) { switch( rEvent.meType ) { @@ -176,7 +176,7 @@ bool SlideShowViewMouseListeners::implTypedNotify( const Reference< awt::XMouseL } /////////////////////////////////////////////////////////////////////// -// SlideShowViewMouseMotionListeners +// SlideShowViewMouseMotionListeners /////////////////////////////////////////////////////////////////////// SlideShowViewMouseMotionListeners::SlideShowViewMouseMotionListeners( ::osl::Mutex& rMutex ) : @@ -184,15 +184,15 @@ SlideShowViewMouseMotionListeners::SlideShowViewMouseMotionListeners( ::osl::Mut { } -bool SlideShowViewMouseMotionListeners::implTypedNotify( const Reference< awt::XMouseMotionListener >& rListener, - const WrappedMouseMotionEvent& rEvent ) throw( uno::Exception ) +bool SlideShowViewMouseMotionListeners::implTypedNotify( const Reference< awt::XMouseMotionListener >& rListener, + const WrappedMouseMotionEvent& rEvent ) throw( uno::Exception ) { switch( rEvent.meType ) { case WrappedMouseMotionEvent::DRAGGED: rListener->mouseDragged( rEvent.maEvent ); break; - + case WrappedMouseMotionEvent::MOVED: rListener->mouseMoved( rEvent.maEvent ); break; @@ -205,12 +205,12 @@ bool SlideShowViewMouseMotionListeners::implTypedNotify( const Reference< awt::X // SlideShowView /////////////////////////////////////////////////////////////////////// -SlideShowView::SlideShowView( ShowWindow& rOutputWindow, - SdDrawDocument* pDoc, - AnimationMode eAnimationMode, +SlideShowView::SlideShowView( ShowWindow& rOutputWindow, + SdDrawDocument* pDoc, + AnimationMode eAnimationMode, SlideshowImpl* pSlideShow, bool bFullScreen ) -: SlideShowView_Base( m_aMutex ), +: SlideShowView_Base( m_aMutex ), mpCanvas( ::cppcanvas::VCLFactory::getInstance().createSpriteCanvas( rOutputWindow ) ), mxWindow( VCLUnoHelper::GetInterface( &rOutputWindow ), uno::UNO_QUERY_THROW ), mxWindowPeer( mxWindow, uno::UNO_QUERY_THROW ), @@ -330,7 +330,7 @@ void SAL_CALL SlideShowView::clear() throw (::com::sun::star::uno::RuntimeExcept ::basegfx::B2DRectangle(0.0,0.0, aWindowSize.Width(), aWindowSize.Height() ) ) ); - ::cppcanvas::PolyPolygonSharedPtr pPolyPoly( + ::cppcanvas::PolyPolygonSharedPtr pPolyPoly( ::cppcanvas::BaseGfxFactory::getInstance().createPolyPolygon( mpCanvas, aPoly ) ); if( pPolyPoly.get() ) @@ -351,11 +351,11 @@ geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation( ) throw (Ru { return geometry::AffineMatrix2D (1,0,0,0,1,0); } - + // Reduce available width by one, as the slides might actually // render one pixel wider and higher as aPageSize below specifies // (when shapes of page size have visible border lines) - const Size aWindowSize( rTmpSize.Width()-1, + const Size aWindowSize( rTmpSize.Width()-1, rTmpSize.Height()-1 ); Size aOutputSize( aWindowSize ); @@ -672,7 +672,7 @@ void SlideShowView::init() { Reference< beans::XPropertySet > xCanvasProps( getCanvas(), uno::UNO_QUERY_THROW ); - xCanvasProps->setPropertyValue( + xCanvasProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UnsafeScrolling")), uno::makeAny( true ) ); } diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx index 8e22a5d9fd7f..12af70540227 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.hxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,8 +95,8 @@ struct WrappedMouseEvent : public ::com::sun::star::lang::EventObject EXITED }; - EventType meType; - ::com::sun::star::awt::MouseEvent maEvent; + EventType meType; + ::com::sun::star::awt::MouseEvent maEvent; }; struct WrappedMouseMotionEvent : public ::com::sun::star::lang::EventObject @@ -107,8 +107,8 @@ struct WrappedMouseMotionEvent : public ::com::sun::star::lang::EventObject MOVED }; - EventType meType; - ::com::sun::star::awt::MouseEvent maEvent; + EventType meType; + ::com::sun::star::awt::MouseEvent maEvent; }; /////////////////////////////////////////////////////////////////////// @@ -131,14 +131,14 @@ protected: ::osl::Mutex& mrMutex; }; -typedef ::std::auto_ptr< SlideShowViewListeners > SlideShowViewListenersPtr; +typedef ::std::auto_ptr< SlideShowViewListeners > SlideShowViewListenersPtr; /////////////////////////////////////////////////////////////////////// // SlideShowViewPaintListeners /////////////////////////////////////////////////////////////////////// typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XPaintListener, - ::com::sun::star::awt::PaintEvent > SlideShowViewPaintListeners_Base; + ::com::sun::star::awt::PaintEvent > SlideShowViewPaintListeners_Base; class SlideShowViewPaintListeners : public SlideShowViewPaintListeners_Base { @@ -148,7 +148,7 @@ public: protected: virtual bool implTypedNotify( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& rListener, const ::com::sun::star::awt::PaintEvent& rEvent ) throw( ::com::sun::star::uno::Exception ); }; -typedef ::std::auto_ptr< SlideShowViewPaintListeners > SlideShowViewPaintListenersPtr; +typedef ::std::auto_ptr< SlideShowViewPaintListeners > SlideShowViewPaintListenersPtr; /////////////////////////////////////////////////////////////////////// // SlideShowViewMouseListeners @@ -162,11 +162,11 @@ public: SlideShowViewMouseListeners( ::osl::Mutex& rMutex ); protected: - virtual bool implTypedNotify( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& rListener, - const WrappedMouseEvent& rEvent ) throw( ::com::sun::star::uno::Exception ); + virtual bool implTypedNotify( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& rListener, + const WrappedMouseEvent& rEvent ) throw( ::com::sun::star::uno::Exception ); }; -typedef ::std::auto_ptr< SlideShowViewMouseListeners > SlideShowViewMouseListenersPtr; +typedef ::std::auto_ptr< SlideShowViewMouseListeners > SlideShowViewMouseListenersPtr; /////////////////////////////////////////////////////////////////////// @@ -182,10 +182,10 @@ public: SlideShowViewMouseMotionListeners( ::osl::Mutex& rMutex ); protected: - virtual bool implTypedNotify( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& rListener, - const WrappedMouseMotionEvent& rEvent ) throw( ::com::sun::star::uno::Exception ); + virtual bool implTypedNotify( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& rListener, + const WrappedMouseMotionEvent& rEvent ) throw( ::com::sun::star::uno::Exception ); }; -typedef ::std::auto_ptr< SlideShowViewMouseMotionListeners > SlideShowViewMouseMotionListenersPtr; +typedef ::std::auto_ptr< SlideShowViewMouseMotionListeners > SlideShowViewMouseMotionListenersPtr; /////////////////////////////////////////////////////////////////////// @@ -261,23 +261,23 @@ private: void updateimpl( ::osl::ClearableMutexGuard& rGuard, SlideshowImpl* pSlideShow ); - ::cppcanvas::SpriteCanvasSharedPtr mpCanvas; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > mxWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > mxWindowPeer; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPointer > mxPointer; - SlideshowImpl* mpSlideShow; - ShowWindow& mrOutputWindow; - SlideShowViewListenersPtr mpViewListeners; - SlideShowViewPaintListenersPtr mpPaintListeners; - SlideShowViewMouseListenersPtr mpMouseListeners; - SlideShowViewMouseMotionListenersPtr mpMouseMotionListeners; - SdDrawDocument* mpDoc; - bool mbIsMouseMotionListener; - Rectangle maPresentationArea; - AnimationMode meAnimationMode; - bool mbFirstPaint; + ::cppcanvas::SpriteCanvasSharedPtr mpCanvas; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > mxWindow; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > mxWindowPeer; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPointer > mxPointer; + SlideshowImpl* mpSlideShow; + ShowWindow& mrOutputWindow; + SlideShowViewListenersPtr mpViewListeners; + SlideShowViewPaintListenersPtr mpPaintListeners; + SlideShowViewMouseListenersPtr mpMouseListeners; + SlideShowViewMouseMotionListenersPtr mpMouseMotionListeners; + SdDrawDocument* mpDoc; + bool mbIsMouseMotionListener; + Rectangle maPresentationArea; + AnimationMode meAnimationMode; + bool mbFirstPaint; bool mbFullScreen; - bool mbMousePressedEaten; + bool mbMousePressedEaten; }; diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx index 1bbecbef3d66..3040eb1e2bd8 100755 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,8 +93,8 @@ class CacheEntry; class CacheHash { public: - size_t operator()(const BitmapCache::CacheKey& p) const - { return (size_t)p; } + size_t operator()(const BitmapCache::CacheKey& p) const + { return (size_t)p; } }; class BitmapCache::CacheBitmapContainer @@ -295,7 +295,7 @@ void BitmapCache::InvalidateCache (void) void BitmapCache::SetBitmap ( - const CacheKey& rKey, + const CacheKey& rKey, const ::boost::shared_ptr<BitmapEx>& rpPreview, bool bIsPrecious) { @@ -317,7 +317,7 @@ void BitmapCache::SetBitmap ( CacheEntry (rpPreview, mnCurrentAccessTime++, bIsPrecious)) ).first; } - + if (iEntry != mpBitmapContainer->end()) UpdateCacheSize(iEntry->second, ADD); } @@ -427,7 +427,7 @@ void BitmapCache::Recycle (const BitmapCache& rCache) if ( ! bIncludeNoPreview && ! iEntry->second.HasPreview()) continue; - + aSortedContainer.push_back(SortableBitmapContainer::value_type( iEntry->first,iEntry->second)); } @@ -476,7 +476,7 @@ void BitmapCache::UpdateCacheSize (const CacheEntry& rEntry, CacheOperation eOpe if ( ! rEntry.IsPrecious() && mnNormalCacheSize>mnMaximalNormalCacheSize) { mbIsFull = true; -#ifdef VERBOSE +#ifdef VERBOSE OSL_TRACE("cache size is %d > %d", mnNormalCacheSize,mnMaximalNormalCacheSize); #endif mpCacheCompactor->RequestCompaction(); @@ -488,7 +488,7 @@ void BitmapCache::UpdateCacheSize (const CacheEntry& rEntry, CacheOperation eOpe if (mnNormalCacheSize < mnMaximalNormalCacheSize) mbIsFull = false; break; - + default: OSL_ASSERT(false); break; @@ -514,10 +514,10 @@ BitmapCache::CacheEntry::CacheEntry( BitmapCache::CacheEntry::CacheEntry( - const ::boost::shared_ptr<BitmapEx>& rpPreview, + const ::boost::shared_ptr<BitmapEx>& rpPreview, sal_Int32 nLastAccessTime, bool bIsPrecious) - : mpPreview(rpPreview), + : mpPreview(rpPreview), mbIsUpToDate(true), mnLastAccessTime(nLastAccessTime), mbIsPrecious(bIsPrecious) @@ -576,7 +576,7 @@ void BitmapCache::CacheEntry::Compress (const ::boost::shared_ptr<BitmapCompress nNewSize, nRatio); #endif - + mpCompressor = rpCompressor; } diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx index 2c33e042342f..5d08005d50eb 100755 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -116,7 +116,7 @@ public: */ void SetBitmap ( const CacheKey& rKey, - const ::boost::shared_ptr<BitmapEx>& rpPreview, + const ::boost::shared_ptr<BitmapEx>& rpPreview, bool bIsPrecious); /** Mark the specified preview bitmap as precious, i.e. that it must not @@ -129,7 +129,7 @@ public: bitmaps. */ void ReCalculateTotalCacheSize (void); - + /** Use the previews in the given cache to initialize missing previews. */ void Recycle (const BitmapCache& rCache); @@ -195,7 +195,7 @@ private: size to the allowed value. */ bool mbIsFull; - + /** Update mnNormalCacheSize or mnPreciousCacheSize according to the precious flag of the specified preview bitmap and the specified operation. diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx index 86fc72885414..616446c41e89 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -132,7 +132,7 @@ public: Size maOriginalSize; virtual ~ResolutionReducedReplacement(); - + virtual sal_Int32 GetMemorySize (void) const; }; @@ -171,7 +171,7 @@ sal_Int32 ResolutionReduction::ResolutionReducedReplacement::GetMemorySize (void const BitmapReplacement& rBitmapData) const { ::boost::shared_ptr<BitmapEx> pResult; - + const ResolutionReducedReplacement* pData ( dynamic_cast<const ResolutionReducedReplacement*>(&rBitmapData)); @@ -181,7 +181,7 @@ sal_Int32 ResolutionReduction::ResolutionReducedReplacement::GetMemorySize (void if (pData->maOriginalSize.Width() > mnWidth) pResult->Scale(pData->maOriginalSize); } - + return pResult; } diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx index cd564ddddcfd..07216cbf334b 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx index 5ad30ef43c1f..47a6a6fa3337 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx index 87cd1f268f80..b596f6c9ad66 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx index 520ce4ce2cf8..f67eb7963fda 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -108,7 +108,7 @@ namespace sd { namespace slidesorter { namespace cache { static const ::rtl::OUString sErase (RTL_CONSTASCII_USTRINGPARAM("Erase")); static const ::rtl::OUString sResolution (RTL_CONSTASCII_USTRINGPARAM("ResolutionReduction")); static const ::rtl::OUString sPNGCompression (RTL_CONSTASCII_USTRINGPARAM("PNGCompression")); - + ::boost::shared_ptr<BitmapCompressor> pCompressor; ::rtl::OUString sCompressionPolicy(sPNGCompression); Any aCompressionPolicy (CacheConfiguration::Instance()->GetValue( @@ -123,7 +123,7 @@ namespace sd { namespace slidesorter { namespace cache { pCompressor.reset(new ResolutionReduction()); else pCompressor.reset(new PngCompression()); - + ::std::auto_ptr<CacheCompactor> pCompactor (NULL); ::rtl::OUString sCompactionPolicy(sCompress); Any aCompactionPolicy (CacheConfiguration::Instance()->GetValue( @@ -168,14 +168,14 @@ CacheCompactor::CacheCompactor( IMPL_LINK(CacheCompactor, CompactionCallback, Timer*, EMPTYARG) { mbIsCompactionRunning = true; - + try { Run(); } catch(::com::sun::star::uno::RuntimeException e) { } catch(::com::sun::star::uno::Exception e) { } - + mbIsCompactionRunning = false; return 1; } diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx index 84e450dcfbc9..80e9d2aaa9f2 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ class BitmapCache; class BitmapCompressor; /** This is an interface class whose implementations are created via the - Create() factory method. + Create() factory method. */ class CacheCompactor { @@ -69,7 +69,7 @@ public: cache. This calls via a timer the Run() method. */ virtual void RequestCompaction (void); - + protected: BitmapCache& mrCache; sal_Int32 mnMaximalCacheSize; @@ -82,7 +82,7 @@ protected: by the off-screen preview bitmaps. */ virtual void Run (void) = 0; - + private: /** This timer is used to collect calles to RequestCompaction() and eventually call Run(). diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx index 942a3e762acb..589b681dc210 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,7 +87,7 @@ CacheConfiguration::CacheConfiguration (void) const ::rtl::OUString sPathToNode( RTL_CONSTASCII_USTRINGPARAM( "MultiPaneGUI/SlideSorter/PreviewCache")); - + try { do @@ -105,17 +105,17 @@ CacheConfiguration::CacheConfiguration (void) aCreationArguments[0] = makeAny(beans::PropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("nodepath")), - 0, + 0, makeAny(sPathToImpressConfigurationRoot), beans::PropertyState_DIRECT_VALUE)); aCreationArguments[1] = makeAny(beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("depth")), - 0, + 0, makeAny((sal_Int32)-1), beans::PropertyState_DIRECT_VALUE)); aCreationArguments[2] = makeAny(beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("lazywrite")), - 0, + 0, makeAny(true), beans::PropertyState_DIRECT_VALUE)); ::rtl::OUString sAccessService (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( @@ -151,7 +151,7 @@ CacheConfiguration::CacheConfiguration (void) Any CacheConfiguration::GetValue (const ::rtl::OUString& rName) { Any aResult; - + if (mxCacheNode != NULL) { try diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx index 034480298006..d683afae8d6f 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ public: does not exist then an empty Any is returned. */ ::com::sun::star::uno::Any GetValue (const ::rtl::OUString& rName); - + private: static ::boost::shared_ptr<CacheConfiguration> mpInstance; /** When a caller holds a reference after we have released ours we use diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx index 780a429df29e..ae13d582bfad 100755 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -206,7 +206,7 @@ void GenericPageCache::ReleasePreviewBitmap (CacheKey aKey) // Suspend the queue processing temporarily to avoid the reinsertion // of the request that is to be deleted. mpQueueProcessor->Stop(); - + maRequestQueue.RemoveRequest(aKey); mpQueueProcessor->RemoveRequest(aKey); diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx index 89fc657004e8..5b065b60d566 100755 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ public: GenericPageCache ( const Size& rPreviewSize, const SharedCacheContext& rpCacheContext); - + ~GenericPageCache (void); /** Change the size of the preview bitmaps. This may be caused by a @@ -107,7 +107,7 @@ public: /** Call this method when all preview bitmaps have to be generated anew. This is the case when the size of the page objects on the screen has - changed or when the model has changed. + changed or when the model has changed. */ void InvalidateCache (bool bUpdateCache); @@ -129,7 +129,7 @@ private: ::boost::scoped_ptr<QueueProcessor> mpQueueProcessor; SharedCacheContext mpCacheContext; - + /** The current size of preview bitmaps. */ Size maPreviewSize; diff --git a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx index 714e1f008329..acf347cf3027 100755 --- a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx index 3c8a15892e7c..4a3aa88be2a4 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ class CacheDescriptor public: ::sd::slidesorter::cache::PageCacheManager::DocumentKey mpDocument; Size maPreviewSize; - + CacheDescriptor( ::sd::slidesorter::cache::PageCacheManager::DocumentKey pDocument, const Size& rPreviewSize) @@ -119,7 +119,7 @@ public: return (rElement1.first.Width()*rElement1.first.Height() > rElement2.first.Width()*rElement2.first.Height()); } - + private: Size maPreferredSize; }; @@ -181,7 +181,7 @@ public: ::boost::shared_ptr<PageCacheManager> PageCacheManager::Instance (void) { ::boost::shared_ptr<PageCacheManager> pInstance; - + ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); pInstance = mpInstance.lock(); @@ -192,7 +192,7 @@ public: PageCacheManager::Deleter()); mpInstance = pInstance; } - + return pInstance; } @@ -240,7 +240,7 @@ PageCacheManager::~PageCacheManager (void) // contain previews that are not up-to-date. Recycle previews from // other caches to fill in the holes. Recycle(pResult, pDocument,rPreviewSize); - + // Put the new (or old) cache into the container. if (pResult.get() != NULL) mpPageCaches->insert(PageCacheContainer::value_type(aKey, pResult)); @@ -295,13 +295,13 @@ void PageCacheManager::ReleaseCache (const ::boost::shared_ptr<Cache>& rpCache) mpPageCaches->begin(), mpPageCaches->end(), PageCacheContainer::CompareWithCache(rpCache))); - + if (iCache != mpPageCaches->end()) { OSL_ASSERT(iCache->second == rpCache); PutRecentlyUsedCache(iCache->first.mpDocument,iCache->first.maPreviewSize,rpCache); - + mpPageCaches->erase(iCache); } } @@ -315,7 +315,7 @@ void PageCacheManager::ReleaseCache (const ::boost::shared_ptr<Cache>& rpCache) const Size& rNewPreviewSize) { (void)rOldPreviewSize; - + ::boost::shared_ptr<Cache> pResult; if (rpCache.get() != NULL) @@ -399,7 +399,7 @@ void PageCacheManager::InvalidateAllCaches (void) const Size& rPreviewSize) { ::boost::shared_ptr<Cache> pCache; - + // Look for the cache in the list of recently used caches. RecentlyUsedPageCaches::iterator iQueue (mpRecentlyUsedPageCaches->find(pDocument)); if (iQueue != mpRecentlyUsedPageCaches->end()) diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index bec9c7fa369d..6d84e528512c 100755 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ QueueProcessor::QueueProcessor ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeBetweenHighPriorityRequests"))); if (aTimeBetweenReqeusts.has<sal_Int32>()) aTimeBetweenReqeusts >>= mnTimeBetweenHighPriorityRequests; - + aTimeBetweenReqeusts = CacheConfiguration::Instance()->GetValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeBetweenLowPriorityRequests"))); if (aTimeBetweenReqeusts.has<sal_Int32>()) diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx index e42ad092d0e2..6a0f952ca008 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ #include "SlsBitmapCache.hxx" #include "sdpage.hxx" #include "Window.hxx" - + #include <svx/svdpagv.hxx> #include <vcl/svapp.hxx> #include <vcl/timer.hxx> @@ -63,12 +63,12 @@ class RequestQueue; timer is started that eventually calls ProcessRequest(). This is repeated until the queue is empty or Stop() is called. */ -class QueueProcessor +class QueueProcessor { public: typedef ::boost::function<bool()> IdleDetectionCallback; QueueProcessor ( - RequestQueue& rQueue, + RequestQueue& rQueue, const ::boost::shared_ptr<BitmapCache>& rpCache, const Size& rPreviewSize, const SharedCacheContext& rpCacheContext); diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx index 08ca63284ea6..d3a6a7443001 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,17 +40,17 @@ class SlideSorterView; namespace sd { namespace slidesorter { namespace cache { -template <class Queue, - class RequestData, - class BitmapCache, +template <class Queue, + class RequestData, + class BitmapCache, class BitmapFactory> -class QueueProcessorThread +class QueueProcessorThread : public ::osl::Thread { public: QueueProcessorThread ( - view::SlideSorterView& rView, - Queue& rQueue, + view::SlideSorterView& rView, + Queue& rQueue, BitmapCache& rCache); ~QueueProcessorThread (void); @@ -80,19 +80,19 @@ public: void SAL_CALL Terminate (void); protected: - /** This virutal method is called (among others?) from the + /** This virutal method is called (among others?) from the inherited create method and acts as the main function of this thread. */ virtual void SAL_CALL run (void); - /** Called after the thread is terminated via the terminate + /** Called after the thread is terminated via the terminate method. Used to kill the thread by calling delete on this. - */ + */ virtual void SAL_CALL onTerminated (void); private: - /** Flag that indicates wether the onTerminated method has been already + /** Flag that indicates wether the onTerminated method has been already called. If so then a subsequent call to detach deletes the thread. */ volatile bool mbIsTerminated; @@ -168,7 +168,7 @@ void SAL_CALL QueueProcessorThread<Queue, Request, Cache, Factory>::run (void) TimeValue aTimeToWait; aTimeToWait.Seconds = 0; aTimeToWait.Nanosec = 50*1000*1000; - OSL_TRACE("QueueProcessorThread::run(): input pending: waiting %d nanoseconds", + OSL_TRACE("QueueProcessorThread::run(): input pending: waiting %d nanoseconds", aTimeToWait.Nanosec); wait (aTimeToWait); } @@ -193,7 +193,7 @@ void QueueProcessorThread<Queue, Request, Cache, Factory> Request* pRequest = NULL; int nPriorityClass; bool bRequestIsValid = false; - + do { OSL_TRACE ("QueueProcessorThread::ProcessQueueEntry(): testing for mbIsTerminated %p", this); @@ -214,7 +214,7 @@ void QueueProcessorThread<Queue, Request, Cache, Factory> break; OSL_TRACE ("QueueProcessorThread::ProcessQueueEntry(): have mutexes %p", this); - + // Get the requeuest with the highest priority from the queue. nPriorityClass = mrQueue.GetFrontPriorityClass(); pRequest = &mrQueue.GetFront(); @@ -223,7 +223,7 @@ void QueueProcessorThread<Queue, Request, Cache, Factory> OSL_TRACE ("QueueProcessorThread::ProcessQueueEntry():using request %p for creating bitmap", pRequest); - OSL_TRACE ("QueueProcessorThread::ProcessQueueEntry():processing request for page %d with priority class ", + OSL_TRACE ("QueueProcessorThread::ProcessQueueEntry():processing request for page %d with priority class ", pRequest->GetPage()->GetPageNum(), nPriorityClass); try { @@ -252,9 +252,9 @@ void QueueProcessorThread<Queue, Request, Cache, Factory> -template <class Queue, - class RequestData, - class BitmapCache, +template <class Queue, + class RequestData, + class BitmapCache, class BitmapFactory> void QueueProcessorThread< Queue, RequestData, BitmapCache, BitmapFactory @@ -267,9 +267,9 @@ void QueueProcessorThread< -template <class Queue, - class RequestData, - class BitmapCache, +template <class Queue, + class RequestData, + class BitmapCache, class BitmapFactory> void QueueProcessorThread< Queue, RequestData, BitmapCache, BitmapFactory @@ -282,9 +282,9 @@ void QueueProcessorThread< -template <class Queue, - class RequestData, - class BitmapCache, +template <class Queue, + class RequestData, + class BitmapCache, class BitmapFactory> void QueueProcessorThread< Queue, RequestData, BitmapCache, BitmapFactory @@ -298,9 +298,9 @@ void QueueProcessorThread< -template <class Queue, - class RequestData, - class BitmapCache, +template <class Queue, + class RequestData, + class BitmapCache, class BitmapFactory> void QueueProcessorThread< Queue, RequestData, BitmapCache, BitmapFactory @@ -322,9 +322,9 @@ void QueueProcessorThread< /** This callback method is called when the run() method terminates. */ -template <class Queue, - class RequestData, - class BitmapCache, +template <class Queue, + class RequestData, + class BitmapCache, class BitmapFactory> void SAL_CALL QueueProcessorThread< Queue, RequestData, BitmapCache, BitmapFactory diff --git a/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx b/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx index 8030558759f3..f7b9e47265d8 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx b/sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx index d2872c2ad7bf..0e802055e9f7 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx b/sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx index ebf6284a8f8b..cf05e5bb7d79 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,14 +38,14 @@ namespace sd { namespace slidesorter { namespace cache { enum RequestPriorityClass { MIN__CLASS = 0, - + // The slide is visible. A preview does not yet exist. VISIBLE_NO_PREVIEW = MIN__CLASS, // The slide is visible. A preview exists but is not up-to-date anymore. VISIBLE_OUTDATED_PREVIEW, // The slide is not visible. NOT_VISIBLE, - + MAX__CLASS = NOT_VISIBLE }; diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx index ccd590131343..5c37789aeda3 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -213,7 +213,7 @@ CacheKey RequestQueue::GetFront (void) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RequestQueue::GetFront(): queue is empty")), NULL); - + return mpRequestQueue->begin()->maKey; } diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx index f59ec702ac01..e1a618b1cef6 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ public: with lowest priority. */ void AddRequest ( - CacheKey aKey, + CacheKey aKey, RequestPriorityClass eRequestClass, bool bInsertWithHighestPriority = false); diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 69c2a02ddc24..80bd77c3670f 100755 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -161,7 +161,7 @@ SlideSorterController::SlideSorterController (SlideSorter& rSlideSorter) void SlideSorterController::Init (void) { mrView.HandleModelChange(); - + mpCurrentSlideManager.reset(new CurrentSlideManager(mrSlideSorter)); mpPageSelector.reset(new PageSelector(mrSlideSorter)); mpFocusManager.reset(new FocusManager(mrSlideSorter)); @@ -352,7 +352,7 @@ bool SlideSorterController::Command ( bool bEventHasBeenHandled = false; ViewShell* pViewShell = mrSlideSorter.GetViewShell(); - + switch (rEvent.GetCommand()) { case COMMAND_CONTEXTMENU: @@ -494,7 +494,7 @@ void SlideSorterController::PreModelChange (void) if (mbPostModelChangePending) return; mbPreModelChangeDone = true; - + if (mrSlideSorter.GetViewShell() != NULL) mrSlideSorter.GetViewShell()->Broadcast( ViewShellHint(ViewShellHint::HINT_COMPLEX_MODEL_CHANGE_START)); @@ -597,7 +597,7 @@ IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent*, pEvent) if (pActiveWindow != NULL) pActiveWindow->SetDrawMode(nDrawMode); mrView.HandleDrawModeChange(); - + // When the system font has changed a layout has to be done. mrView.Resize(); FontProvider::Instance().Invalidate(); @@ -627,7 +627,7 @@ void SlideSorterController::GetCtrlState (SfxItemSet& rSet) { pSlideViewFrame->GetSlotState (SID_RELOAD, NULL, &rSet); } - else // MI sagt: kein MDIFrame --> disablen + else // MI sagt: kein MDIFrame --> disablen { rSet.DisableItem(SID_RELOAD); } @@ -951,7 +951,7 @@ void SlideSorterController::SetDocumentSlides (const Reference<container::XIndex { ModelChangeLock aLock (*this); PreModelChange(); - + mrModel.SetDocumentSlides(rxSlides); mrView.Layout(); } diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx index 56505d9756e6..7de031731801 100644 --- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx +++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -127,7 +127,7 @@ bool Animator::ServeAnimations (void) void Animator::CleanUpAnimationList (void) { AnimationList aActiveAnimations; - + AnimationList::const_iterator iAnimation; for (iAnimation=maAnimations.begin(); iAnimation!=maAnimations.end(); ++iAnimation) { @@ -173,7 +173,7 @@ Animator::Animation::Animation ( maAnimation(mnValue); mnValue = mnDelta; - + } diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index d226a8c2e294..bb0abb9caeef 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -227,7 +227,7 @@ sal_Int32 Clipboard::GetInsertionPosition (::Window* pWindow) // b) When the focus indicator is visible, then before or after the // focused page, depending on user input to a dialog. // c) When there is a selection but no focus, then after the - // selection. + // selection. // d) After the last page when there is no selection and no focus. view::InsertionIndicatorOverlay& rInsertionIndicatorOverlay ( @@ -268,18 +268,18 @@ sal_Int32 Clipboard::PasteTransferable (sal_Int32 nInsertPosition) { const List& rBookmarkList = pClipTransferable->GetPageBookmarks(); const ::vos::OGuard aGuard (Application::GetSolarMutex()); - + nInsertPageCount = (USHORT) rBookmarkList.Count(); mrSlideSorter.GetModel().GetDocument()->InsertBookmarkAsPage( const_cast<List*>(&rBookmarkList), - NULL, - FALSE, - FALSE, - nInsertIndex, - FALSE, - pClipTransferable->GetPageDocShell(), - TRUE, - bMergeMasterPages, + NULL, + FALSE, + FALSE, + nInsertIndex, + FALSE, + pClipTransferable->GetPageDocShell(), + TRUE, + bMergeMasterPages, FALSE); } else @@ -288,23 +288,23 @@ sal_Int32 Clipboard::PasteTransferable (sal_Int32 nInsertPosition) DrawDocShell* pDataDocSh = (DrawDocShell*)pShell; SdDrawDocument* pDataDoc = pDataDocSh->GetDoc(); - if (pDataDoc!=NULL + if (pDataDoc!=NULL && pDataDoc->GetSdPageCount(PK_STANDARD)) { const ::vos::OGuard aGuard (Application::GetSolarMutex()); - + bMergeMasterPages = (pDataDoc != mrSlideSorter.GetModel().GetDocument()); nInsertPageCount = pDataDoc->GetSdPageCount( PK_STANDARD ); mrSlideSorter.GetModel().GetDocument()->InsertBookmarkAsPage( - NULL, - NULL, - FALSE, - FALSE, + NULL, + NULL, + FALSE, + FALSE, nInsertIndex, - FALSE, - pDataDocSh, - TRUE, - bMergeMasterPages, + FALSE, + pDataDocSh, + TRUE, + bMergeMasterPages, FALSE); } } @@ -342,7 +342,7 @@ void Clipboard::SelectPageRange (sal_Int32 nFirstIndex, sal_Int32 nPageCount) void Clipboard::CreateSlideTransferable ( - ::Window* pWindow, + ::Window* pWindow, bool bDrag) { List aBookmarkList; @@ -394,7 +394,7 @@ void Clipboard::CreateSlideTransferable ( if (pViewShell != NULL) pActionWindow = pViewShell->GetActiveWindow(); } - + pTransferable->SetStartPos (pActionWindow->PixelToLogic( pActionWindow->GetPointerPosPixel())); pTransferable->SetObjectDescriptor (aObjDesc); @@ -454,8 +454,8 @@ void Clipboard::DragFinished (sal_Int8 nDropAction) // in the same document.) rSelector.DeselectAllPages(); PageList::iterator aDraggedPage; - for (aDraggedPage=maPagesToRemove.begin(); - aDraggedPage!=maPagesToRemove.end(); + for (aDraggedPage=maPagesToRemove.begin(); + aDraggedPage!=maPagesToRemove.end(); aDraggedPage++) { rSelector.SelectPage (*aDraggedPage); @@ -486,10 +486,10 @@ void Clipboard::SelectPages (void) sal_Int8 Clipboard::AcceptDrop ( - const AcceptDropEvent& rEvent, - DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, - USHORT nPage, + const AcceptDropEvent& rEvent, + DropTargetHelper& rTargetHelper, + ::sd::Window* pTargetWindow, + USHORT nPage, USHORT nLayer) { sal_Int8 nResult = DND_ACTION_NONE; @@ -514,7 +514,7 @@ sal_Int8 Clipboard::AcceptDrop ( { nResult = DND_ACTION_COPY; } - + // Show the insertion marker and the substitution for a drop. Point aPosition = pTargetWindow->PixelToLogic (rEvent.maPosPixel); view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay()); @@ -548,10 +548,10 @@ sal_Int8 Clipboard::AcceptDrop ( sal_Int8 Clipboard::ExecuteDrop ( - const ExecuteDropEvent& rEvent, + const ExecuteDropEvent& rEvent, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, - USHORT nPage, + ::sd::Window* pTargetWindow, + USHORT nPage, USHORT nLayer) { sal_Int8 nResult = DND_ACTION_NONE; @@ -563,14 +563,14 @@ sal_Int8 Clipboard::ExecuteDrop ( const SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag; const Point aEventModelPosition ( pTargetWindow->PixelToLogic (rEvent.maPosPixel)); - long int nXOffset = labs (pDragTransferable->GetStartPos().X() + long int nXOffset = labs (pDragTransferable->GetStartPos().X() - aEventModelPosition.X()); - long int nYOffset = labs (pDragTransferable->GetStartPos().Y() + long int nYOffset = labs (pDragTransferable->GetStartPos().Y() - aEventModelPosition.Y()); - const bool bContinue = - ( pDragTransferable->GetView() != &mrSlideSorter.GetView() ) + const bool bContinue = + ( pDragTransferable->GetView() != &mrSlideSorter.GetView() ) || ( nXOffset >= 2 && nYOffset >= 2 ); - + // Get insertion position and then turn off the insertion indicator. view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay()); rOverlay.GetInsertionIndicatorOverlay().SetPosition( @@ -579,7 +579,7 @@ sal_Int8 Clipboard::ExecuteDrop ( OSL_TRACE ("Clipboard::AcceptDrop() called for index %d", nIndex); rOverlay.GetInsertionIndicatorOverlay().setVisible(false); - + if (bContinue) { SlideSorterController::ModelChangeLock aModelChangeLock (mrController); @@ -649,7 +649,7 @@ USHORT Clipboard::DetermineInsertPosition (const SdTransferable& ) // This is now converted that to an SdModel index that also starts with 1. if (nInsertionIndex >= 0) nInsertPosition = (USHORT)nInsertionIndex * 2 + 1; - + return nInsertPosition; } @@ -757,7 +757,7 @@ sal_Int8 Clipboard::ExecuteOrAcceptShapeDrop ( nPage, nLayer); break; - + case DC_EXECUTE: nResult = pDrawViewShell->ExecuteDrop( *reinterpret_cast<const ExecuteDropEvent*>(pDropEvent), diff --git a/sd/source/ui/slidesorter/controller/SlsCommand.hxx b/sd/source/ui/slidesorter/controller/SlsCommand.hxx index 26980dc51f11..089263693caf 100644 --- a/sd/source/ui/slidesorter/controller/SlsCommand.hxx +++ b/sd/source/ui/slidesorter/controller/SlsCommand.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index f5864c3307a1..f4820f8222b5 100755 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx index dcda73d38dba..48454ce94303 100755 --- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,7 +84,7 @@ void FocusManager::MoveFocus (FocusMoveDirection eDirection) SetFocusToToolBox(); } break; - + case FMD_RIGHT: mnPageIndex += 1; if (mnPageIndex >= mrSlideSorter.GetModel().GetPageCount()) @@ -107,7 +107,7 @@ void FocusManager::MoveFocus (FocusMoveDirection eDirection) if (nCandidateColumn > nColumn) mnPageIndex = nCandidate - (nCandidateColumn-nColumn); else if (nCandidateColumn < nColumn) - mnPageIndex = nCandidate + mnPageIndex = nCandidate - nColumnCount + (nColumn - nCandidateColumn); else @@ -329,9 +329,9 @@ void FocusManager::NotifyFocusChangeListeners (void) const { // Create a copy of the listener list to be safe when that is modified. ::std::vector<Link> aListeners (maFocusChangeListeners); - + // Tell the slection change listeners that the selection has changed. - ::std::vector<Link>::iterator iListener (aListeners.begin()); + ::std::vector<Link>::iterator iListener (aListeners.begin()); ::std::vector<Link>::iterator iEnd (aListeners.end()); for (; iListener!=iEnd; ++iListener) { diff --git a/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx b/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx index 666d4b017302..3e1b0c081306 100644 --- a/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,7 +84,7 @@ void HideSlideFunction::DoExecute (SfxRequest& rRequest) model::PageEnumeration aSelectedPages ( model::PageEnumerationProvider::CreateSelectedPagesEnumeration(mrSlideSorter.GetModel())); - + ExclusionState eState (UNDEFINED); switch (rRequest.GetSlot()) @@ -143,14 +143,14 @@ HideSlideFunction::ExclusionState HideSlideFunction::GetExclusionState ( break; case EXCLUDED: - // The pages before where all not part of the show, + // The pages before where all not part of the show, // this one is. if ( ! bState) eState = MIXED; break; case INCLUDED: - // The pages before where all part of the show, + // The pages before where all part of the show, // this one is not. if (bState) eState = MIXED; diff --git a/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.hxx b/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.hxx index 8cef9455619f..424376f4bec4 100644 --- a/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.hxx +++ b/sd/source/ui/slidesorter/controller/SlsHideSlideFunction.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,14 +39,14 @@ namespace sd { namespace slidesorter { namespace controller { hidden. When all selected pages have the same state this state is toggled for all of them */ -class HideSlideFunction +class HideSlideFunction : public SlideFunction { public: TYPEINFO(); virtual ~HideSlideFunction (void); - + static FunctionReference Create( SlideSorter& rSlideSorter, SfxRequest& rRequest ); virtual void DoExecute( SfxRequest& rReq ); @@ -58,7 +58,7 @@ public: excluded from the slide show. */ static ExclusionState GetExclusionState (model::PageEnumeration& rPageSet); - + protected: HideSlideFunction ( SlideSorter& rSlideSorter, diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 94b3b4afe717..8f67bd68b36e 100755 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -129,7 +129,7 @@ Listener::Listener ( { StartListening (*pMainViewShell); } - + Link aLink (LINK(this, Listener, EventMultiplexerCallback)); mpBase->GetEventMultiplexer()->AddEventListener( aLink, @@ -212,13 +212,13 @@ void Listener::ReleaseListeners (void) void Listener::ConnectToController (void) { ViewShell* pShell = mrSlideSorter.GetViewShell(); - + // Register at the controller of the main view shell (if we are that not // ourself). if (pShell==NULL || ! pShell->IsMainViewShell()) { Reference<frame::XController> xController (mrSlideSorter.GetXController()); - + // Listen to changes of certain properties. Reference<beans::XPropertySet> xSet (xController, UNO_QUERY); if (xSet.is()) @@ -269,10 +269,10 @@ void Listener::DisconnectFromController (void) if (xSet.is()) { xSet->removePropertyChangeListener ( - String::CreateFromAscii("CurrentPage"), + String::CreateFromAscii("CurrentPage"), this); xSet->removePropertyChangeListener ( - String::CreateFromAscii("IsMasterPageMode"), + String::CreateFromAscii("IsMasterPageMode"), this); } @@ -371,11 +371,11 @@ IMPL_LINK(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent } break; - + case tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED: mbIsMainViewChangePending = true; break; - + case tools::EventMultiplexerEvent::EID_CONFIGURATION_UPDATED: if (mbIsMainViewChangePending && mpBase != NULL) { @@ -397,7 +397,7 @@ IMPL_LINK(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent } break; - + case tools::EventMultiplexerEvent::EID_CONTROLLER_DETACHED: DisconnectFromController(); break; @@ -420,7 +420,7 @@ void SAL_CALL Listener::disposing ( { if ((mbListeningToDocument || mbListeningToUNODocument) && mrSlideSorter.GetModel().GetDocument()!=NULL - && rEventObject.Source + && rEventObject.Source == mrSlideSorter.GetModel().GetDocument()->getUnoModel()) { mbListeningToDocument = false; diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx index 5613452a1b59..2cac7830bd25 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.hxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ class SlideSorter; namespace sd { namespace slidesorter { namespace controller { -typedef cppu::WeakComponentImplHelper4< +typedef cppu::WeakComponentImplHelper4< ::com::sun::star::document::XEventListener, ::com::sun::star::beans::XPropertyChangeListener, ::com::sun::star::accessibility::XAccessibleEventListener, @@ -106,7 +106,7 @@ public: const SfxHint& rHint); //===== lang::XEventListener ============================================ - virtual void SAL_CALL + virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) throw (::com::sun::star::uno::RuntimeException); @@ -118,7 +118,7 @@ public: throw (::com::sun::star::uno::RuntimeException); //===== beans::XPropertySetListener ===================================== - virtual void SAL_CALL + virtual void SAL_CALL propertyChange ( const com::sun::star::beans::PropertyChangeEvent& rEvent) throw (::com::sun::star::uno::RuntimeException); @@ -126,7 +126,7 @@ public: //===== accessibility::XAccessibleEventListener ========================== virtual void SAL_CALL notifyEvent ( - const ::com::sun::star::accessibility::AccessibleEventObject& + const ::com::sun::star::accessibility::AccessibleEventObject& rEvent) throw (::com::sun::star::uno::RuntimeException); @@ -135,7 +135,7 @@ public: frame it is listening to. This usually happens when the view shell in the center pane is replaced by another view shell. */ - virtual void SAL_CALL + virtual void SAL_CALL frameAction (const ::com::sun::star::frame::FrameActionEvent& rEvent) throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/slidesorter/controller/SlsPageObjectFactory.cxx b/sd/source/ui/slidesorter/controller/SlsPageObjectFactory.cxx index 5ac41849a674..f5dc63c80b44 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageObjectFactory.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageObjectFactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,26 +71,26 @@ view::PageObject* PageObjectFactory::CreatePageObject ( -::sdr::contact::ViewContact* +::sdr::contact::ViewContact* PageObjectFactory::CreateViewContact ( view::PageObject* pPageObject, const model::SharedPageDescriptor& rpDescriptor) const { return new view::PageObjectViewContact ( - *pPageObject, + *pPageObject, rpDescriptor); } -::sdr::contact::ViewObjectContact* +::sdr::contact::ViewObjectContact* PageObjectFactory::CreateViewObjectContact ( ::sdr::contact::ObjectContact& rObjectContact, ::sdr::contact::ViewContact& rViewContact) const { return new view::PageObjectViewObjectContact ( - rObjectContact, + rObjectContact, rViewContact, mpPageCache, mpProperties); diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx index 0e8f5e100d1c..ef6f09f44950 100755 --- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,7 +84,7 @@ void PageSelector::DeselectAllPages (void) int nPageCount = mrModel.GetPageCount(); for (int nPageIndex=0; nPageIndex<nPageCount; nPageIndex++) DeselectPage (nPageIndex); - DBG_ASSERT (mnSelectedPageCount==0, + DBG_ASSERT (mnSelectedPageCount==0, "PageSelector::DeselectAllPages: the selected pages counter is not 0"); mnSelectedPageCount = 0; mpMostRecentlySelectedPage.reset(); diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx b/sd/source/ui/slidesorter/controller/SlsProperties.cxx index 7382d769bbe2..f755e1d4efca 100644 --- a/sd/source/ui/slidesorter/controller/SlsProperties.cxx +++ b/sd/source/ui/slidesorter/controller/SlsProperties.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx index 5ee7f6f58b82..1fc2261a7a0d 100755 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -94,13 +94,13 @@ void ScrollBarManager::Connect (void) mpVerticalScrollBar->SetScrollHdl ( LINK( this, - ScrollBarManager, + ScrollBarManager, VerticalScrollBarHandler)); if (mpHorizontalScrollBar != NULL) mpHorizontalScrollBar->SetScrollHdl ( LINK( this, - ScrollBarManager, + ScrollBarManager, HorizontalScrollBarHandler)); } @@ -120,14 +120,14 @@ void ScrollBarManager::Disconnect (void) /** Placing the scroll bars is an iterative process. The visibility of one scroll bar affects the remaining size and thus may lead to the other - scroll bar becoming visible. + scroll bar becoming visible. First we determine the visibility of the horizontal scroll bar. After that we do the same for the vertical scroll bar. To have an initial value for the required size we call the layouter before that. When one of the two scroll bars is made visible then the size of the browser window changes and a second call to the layouter becomes necessary. - That call is made anyway after this method returns. + That call is made anyway after this method returns. */ Rectangle ScrollBarManager::PlaceScrollBars (const Rectangle& rAvailableArea) { @@ -154,11 +154,11 @@ void ScrollBarManager::PlaceHorizontalScrollBar (const Rectangle& aAvailableArea // Place the scroll bar. Size aScrollBarSize (mpHorizontalScrollBar->GetSizePixel()); mpHorizontalScrollBar->SetPosSizePixel ( - Point(aAvailableArea.Left(), + Point(aAvailableArea.Left(), aAvailableArea.Bottom()-aScrollBarSize.Height()+1), - Size (aAvailableArea.GetWidth() - GetVerticalScrollBarWidth(), + Size (aAvailableArea.GetWidth() - GetVerticalScrollBarWidth(), aScrollBarSize.Height())); - + // Restore the relative position. mpHorizontalScrollBar->SetThumbPos( (long)(0.5 + mnHorizontalPosition * mpHorizontalScrollBar->GetRange().Len())); @@ -167,13 +167,13 @@ void ScrollBarManager::PlaceHorizontalScrollBar (const Rectangle& aAvailableArea - + void ScrollBarManager::PlaceVerticalScrollBar (const Rectangle& aArea) { if (mpVerticalScrollBar != NULL && mpVerticalScrollBar->IsVisible()) { - view::Layouter::DoublePoint aLayouterPosition + view::Layouter::DoublePoint aLayouterPosition = mrSlideSorter.GetView().GetLayouter().ConvertModelToLayouterCoordinates ( Point (0, mpVerticalScrollBar->GetThumbPos())); @@ -238,10 +238,10 @@ void ScrollBarManager::UpdateScrollBars (bool bResetThumbPosition, bool bUseScro mnHorizontalPosition = 0; } else - mnHorizontalPosition = + mnHorizontalPosition = double(mpHorizontalScrollBar->GetThumbPos()) / double(mpHorizontalScrollBar->GetRange().Len()); - + mpHorizontalScrollBar->SetVisibleSize (aWindowModelSize.Width()); const long nWidth (mpContentWindow->PixelToLogic( @@ -267,10 +267,10 @@ void ScrollBarManager::UpdateScrollBars (bool bResetThumbPosition, bool bUseScro mnVerticalPosition = 0; } else - mnVerticalPosition = + mnVerticalPosition = double(mpVerticalScrollBar->GetThumbPos()) / double(mpVerticalScrollBar->GetRange().Len()); - + mpVerticalScrollBar->SetVisibleSize (aWindowModelSize.Height()); const long nHeight (mpContentWindow->PixelToLogic( @@ -312,7 +312,7 @@ IMPL_LINK(ScrollBarManager, VerticalScrollBarHandler, ScrollBar*, pScrollBar) / double(pScrollBar->GetRange().Len()); mrSlideSorter.GetView().InvalidatePageObjectVisibilities(); mrSlideSorter.GetView().GetWindow()->SetVisibleXY ( - -1, + -1, nRelativePosition); } return TRUE; @@ -323,7 +323,7 @@ IMPL_LINK(ScrollBarManager, VerticalScrollBarHandler, ScrollBar*, pScrollBar) IMPL_LINK(ScrollBarManager, HorizontalScrollBarHandler, ScrollBar*, pScrollBar) { - if (pScrollBar!=NULL + if (pScrollBar!=NULL && pScrollBar==mpHorizontalScrollBar.get() && pScrollBar->IsVisible() && mrSlideSorter.GetView().GetWindow()!=NULL) @@ -541,15 +541,15 @@ void ScrollBarManager::CalcAutoScrollOffset (const Point& rMouseWindowPosition) if (rMouseWindowPosition.X() < maScrollBorder.Width() && aWindowArea.Left() > aViewPixelArea.Left()) { - nDx = -1 + (int)(mnHorizontalScrollFactor + nDx = -1 + (int)(mnHorizontalScrollFactor * (rMouseWindowPosition.X() - maScrollBorder.Width())); } if (rMouseWindowPosition.X() >= (aWindowSize.Width() - maScrollBorder.Width()) && aWindowArea.Right() < aViewPixelArea.Right()) { - nDx = 1 + (int)(mnHorizontalScrollFactor - * (rMouseWindowPosition.X() - aWindowSize.Width() + nDx = 1 + (int)(mnHorizontalScrollFactor + * (rMouseWindowPosition.X() - aWindowSize.Width() + maScrollBorder.Width())); } } @@ -560,15 +560,15 @@ void ScrollBarManager::CalcAutoScrollOffset (const Point& rMouseWindowPosition) if (rMouseWindowPosition.Y() < maScrollBorder.Height() && aWindowArea.Top() > aViewPixelArea.Top()) { - nDy = -1 + (int)(mnVerticalScrollFactor + nDy = -1 + (int)(mnVerticalScrollFactor * (rMouseWindowPosition.Y() - maScrollBorder.Height())); } if (rMouseWindowPosition.Y() >= (aWindowSize.Height() - maScrollBorder.Height()) && aWindowArea.Bottom() < aViewPixelArea.Bottom()) { - nDy = 1 + (int)(mnVerticalScrollFactor - * (rMouseWindowPosition.Y() - aWindowSize.Height() + nDy = 1 + (int)(mnVerticalScrollFactor + * (rMouseWindowPosition.Y() - aWindowSize.Height() + maScrollBorder.Height())); } } @@ -608,7 +608,7 @@ bool ScrollBarManager::RepeatAutoScroll (void) if (mrSlideSorter.GetViewShell() != NULL) { mrSlideSorter.GetViewShell()->ScrollLines( - maAutoScrollOffset.Width(), + maAutoScrollOffset.Width(), maAutoScrollOffset.Height()); return true; } diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx index 687019954feb..556330413077 100755 --- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,10 +67,10 @@ void SelectionCommand::operator() (void) OSL_ASSERT(mpCurrentSlideManager.get()!=NULL); mrPageSelector.DeselectAllPages(); - + if (mnCurrentPageIndex >= 0) mpCurrentSlideManager->SwitchCurrentSlide(mnCurrentPageIndex); - + PageList::iterator iPage = maPagesToSelect.begin(); PageList::iterator iEnd = maPagesToSelect.end(); for (; iPage!=iEnd; ++iPage) diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx index 7a9d0f27369e..bf692592ebb9 100755 --- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index c1d742ce7158..5b0619faa695 100755 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -146,7 +146,7 @@ public: sal_uInt32 mnEventCode; EventDescriptor ( - sal_uInt32 nEventType, + sal_uInt32 nEventType, const MouseEvent& rEvent, SlideSorter& rSlideSorter); EventDescriptor ( @@ -169,7 +169,7 @@ SelectionFunction::SelectionFunction ( mbProcessingMouseButtonDown(false), mpSubstitutionHandler(new SubstitutionHandler(mrSlideSorter)) { - //af aDelayToScrollTimer.SetTimeout(50); + //af aDelayToScrollTimer.SetTimeout(50); aDragTimer.SetTimeoutHdl( LINK( this, SelectionFunction, DragSlideHdl ) ); } @@ -230,7 +230,7 @@ BOOL SelectionFunction::MouseMove (const MouseEvent& rEvent) else aDragTimer.Stop(); } - + Rectangle aRectangle (Point(0,0),mpWindow->GetOutputSizePixel()); if ( ! aRectangle.IsInside(aMousePosition) && rOverlay.GetSubstitutionOverlay().isVisible()) @@ -238,7 +238,7 @@ BOOL SelectionFunction::MouseMove (const MouseEvent& rEvent) // Mouse left the window with pressed left button. Make it a drag. StartDrag(); } - else + else { // Call ProcessMouseEvent() only when one of the buttons is // pressed. This prevents calling the method on every motion. @@ -264,7 +264,7 @@ BOOL SelectionFunction::MouseButtonUp (const MouseEvent& rEvent) if (aDragTimer.IsActive()) aDragTimer.Stop(); - + ProcessMouseEvent(BUTTON_UP, rEvent); mbProcessingMouseButtonDown = false; @@ -372,7 +372,7 @@ BOOL SelectionFunction::KeyInput (const KeyEvent& rEvent) if (mrController.GetProperties()->IsUIReadOnly()) break; - int nSelectedPagesCount = 0; + int nSelectedPagesCount = 0; // Count the selected pages and look if there any objects on any // of the selected pages so that we can warn the user and @@ -397,7 +397,7 @@ BOOL SelectionFunction::KeyInput (const KeyEvent& rEvent) if (rEvent.GetKeyCode().IsShift()) ProcessKeyEvent(rEvent); break; - + default: break; } @@ -578,7 +578,7 @@ void SelectionFunction::ProcessRectangleSelection (bool bToggleSelection) PageSelector& rSelector (mrController.GetPageSelector()); rOverlay.GetSelectionRectangleOverlay().setVisible(false); - + // Select all pages whose page object lies completly inside the drag // rectangle. const Rectangle& rSelectionRectangle ( @@ -591,7 +591,7 @@ void SelectionFunction::ProcessRectangleSelection (bool bToggleSelection) model::SharedPageDescriptor pDescriptor (aPages.GetNextElement()); Rectangle aPageBox (mrSlideSorter.GetView().GetPageBoundingBox( pDescriptor, - view::SlideSorterView::CS_MODEL, + view::SlideSorterView::CS_MODEL, view::SlideSorterView::BBT_SHAPE)); if (rSelectionRectangle.IsOver(aPageBox)) { @@ -772,7 +772,7 @@ void SelectionFunction::ProcessKeyEvent (const KeyEvent& rEvent) // 1. Compute some frequently used values relating to the event. ::std::auto_ptr<EventDescriptor> pEventDescriptor ( new EventDescriptor(rEvent, mrSlideSorter)); - + // 2. Encode the event. pEventDescriptor->mnEventCode = EncodeKeyEvent(*pEventDescriptor, rEvent); @@ -903,7 +903,7 @@ bool SelectionFunction::EventProcessing (const EventDescriptor& rDescriptor) case BUTTON_UP | LEFT_BUTTON | SINGLE_CLICK | OVER_UNSELECTED_PAGE | CONTROL_MODIFIER: SelectHitPage(pHitDescriptor); PrepareMouseMotion(mpWindow->PixelToLogic(rDescriptor.maMousePosition)); - + break; // Range selection with the shift modifier. @@ -1089,7 +1089,7 @@ void SelectionFunction::SwitchView (const model::SharedPageDescriptor& rpDescrip //===== EventDescriptor ======================================================= SelectionFunction::EventDescriptor::EventDescriptor ( - sal_uInt32 nEventType, + sal_uInt32 nEventType, const MouseEvent& rEvent, SlideSorter& rSlideSorter) : maMousePosition(), diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index f1b4cb6c39be..88a3d7e33508 100755 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx index 7fe090ad5541..d664206f3d58 100755 --- a/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ SlideFunction::SlideFunction ( SfxRequest& rRequest) : FuPoor ( rSlideSorter.GetViewShell(), - rSlideSorter.GetView().GetWindow(), + rSlideSorter.GetView().GetWindow(), &rSlideSorter.GetView(), rSlideSorter.GetModel().GetDocument(), rRequest) diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index e571a765bdad..bc25f5750f6f 100755 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -292,7 +292,7 @@ void SlotManager::FuPermanent (SfxRequest& rRequest) } //! das ist nur bis das ENUM-Slots sind - // Invalidate( SID_OBJECT_SELECT ); + // Invalidate( SID_OBJECT_SELECT ); } void SlotManager::FuSupport (SfxRequest& rRequest) @@ -614,7 +614,7 @@ void SlotManager::GetMenuState ( SfxItemSet& rSet) break; } } - + PageKind ePageKind = mrSlideSorter.GetModel().GetPageType(); if( (eEditMode == EM_MASTERPAGE) && (ePageKind != PK_HANDOUT ) ) { @@ -759,10 +759,10 @@ void SlotManager::GetStatusBarState (SfxItemSet& rSet) if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_STATUS_PAGE ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_STATUS_LAYOUT ) ) */ - SdPage* pPage = NULL; + SdPage* pPage = NULL; SdPage* pFirstPage = NULL; - USHORT nFirstPage; - USHORT nSelectedPages = (USHORT)mrSlideSorter.GetController().GetPageSelector().GetSelectedPageCount(); + USHORT nFirstPage; + USHORT nSelectedPages = (USHORT)mrSlideSorter.GetController().GetPageSelector().GetSelectedPageCount(); String aPageStr; String aLayoutStr; @@ -1024,7 +1024,7 @@ void SlotManager::InsertSlide (SfxRequest& rRequest) = mrSlideSorter.GetController().GetSelectionManager()->GetInsertionPosition() - 1; rSelector.SelectPage(nInsertionIndex); } - + // Select the last page when there is at least one page. else if (rSelector.GetPageCount() > 0) { diff --git a/sd/source/ui/slidesorter/controller/SlsTransferable.cxx b/sd/source/ui/slidesorter/controller/SlsTransferable.cxx index 20ddc937469c..a7ac47e771ab 100644 --- a/sd/source/ui/slidesorter/controller/SlsTransferable.cxx +++ b/sd/source/ui/slidesorter/controller/SlsTransferable.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,8 +36,8 @@ namespace sd { namespace slidesorter { namespace controller { Transferable::Transferable ( - SdDrawDocument* pSrcDoc, - ::sd::View* pWorkView, + SdDrawDocument* pSrcDoc, + ::sd::View* pWorkView, BOOL bInitOnGetData, SlideSorterViewShell* pViewShell) : SdTransferable (pSrcDoc, pWorkView, bInitOnGetData), diff --git a/sd/source/ui/slidesorter/controller/SlsTransferable.hxx b/sd/source/ui/slidesorter/controller/SlsTransferable.hxx index f527fd4768b9..ca0b26227fe7 100644 --- a/sd/source/ui/slidesorter/controller/SlsTransferable.hxx +++ b/sd/source/ui/slidesorter/controller/SlsTransferable.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,10 +31,10 @@ #include "sdxfer.hxx" class SdDrawDocument; -namespace sd +namespace sd { class pWorkView; - namespace slidesorter + namespace slidesorter { class SlideSorterViewShell; } @@ -48,10 +48,10 @@ namespace sd { namespace slidesorter { namespace controller { class Transferable : public SdTransferable { -public: +public: Transferable ( - SdDrawDocument* pSrcDoc, - ::sd::View* pWorkView, + SdDrawDocument* pSrcDoc, + ::sd::View* pWorkView, BOOL bInitOnGetData, SlideSorterViewShell* pViewShell); diff --git a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx index c828e95d1d02..dc3221fc5958 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx index 4a5c2b51ac28..746236bb3edc 100755 --- a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx index 50202a7eed3d..13fd5ab8b0d4 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,7 +91,7 @@ public: /** This is an information to the cache manager that the size of preview bitmaps in the specified cache has changed. - + */ ::boost::shared_ptr<Cache> ChangeSize ( const ::boost::shared_ptr<Cache>& rpCache, @@ -134,7 +134,7 @@ private: slide sorter. */ const sal_uInt32 mnMaximalRecentlyCacheCount; - + PageCacheManager (void); ~PageCacheManager (void); diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index 667aa768ee8f..47ef3606b207 100755 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ public: */ SlideSorterController (SlideSorter& rSlideSorter); - /** Late initialization. Call this method once a new new object has been + /** Late initialization. Call this method once a new new object has been created. */ virtual void Init (void); @@ -138,7 +138,7 @@ public: void FuPermanent (SfxRequest& rRequest); void FuSupport (SfxRequest& rRequest); bool Command ( - const CommandEvent& rEvent, + const CommandEvent& rEvent, ::sd::Window* pWindow); void GetCtrlState (SfxItemSet &rSet); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx index 50c23e3dff4e..782ad4fa9a0c 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx index 0bdbd7cb569f..085c990b0fa2 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,16 +84,16 @@ public: sal_Int8 AcceptDrop ( const AcceptDropEvent& rEvt, - DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, + DropTargetHelper& rTargetHelper, + ::sd::Window* pTargetWindow = NULL, + USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRPAGE_NOTFOUND ); sal_Int8 ExecuteDrop ( - const ExecuteDropEvent& rEvt, + const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, + ::sd::Window* pTargetWindow = NULL, + USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRPAGE_NOTFOUND); protected: @@ -128,7 +128,7 @@ private: bool mbUpdateSelectionPending; void CreateSlideTransferable ( - ::Window* pWindow, + ::Window* pWindow, bool bDrag); /** Select the pages stored in the maPagesToSelect member. The list in diff --git a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx index b0f3a75b540c..474c297d3321 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ public: /** Release all references to model data. */ void PrepareModelChange (void); - + /** Modify inner state in reaction to a change of the SlideSorterModel. */ void HandleModelChange (void); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx index ecc02e8590c1..d1403125762b 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ namespace sd { namespace slidesorter { namespace controller { focused state of the focus page can be toggled with the ToggleFocus() method. */ -class FocusManager +class FocusManager { public: /** Create a new focus manager that operates on the pages of the model @@ -173,7 +173,7 @@ public: typically the tool bar with the close button. */ void SetFocusToToolBox (void); - + /** Create an instance of this class to temporarily hide the focus indicator. It is restored to its former visibility state when the FocusHider is destroyed. @@ -202,7 +202,7 @@ private: bool mbPageIsFocused; ::std::vector<Link> maFocusChangeListeners; - + /** Reset the focus state of the given descriptor and request a repaint so that the focus indicator is hidden. @param pDescriptor diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageObjectFactory.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageObjectFactory.hxx index 59e8f05a3883..3d528e47648b 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageObjectFactory.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsPageObjectFactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ class Properties; /** This class is a factory for the creation of objects that represent page objects (shapes). This includes the contact objects of the drawing layer. - + <p>The factory methods are called by the model::PageDescriptor and the standard implementations of the contact objects.</p> diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx index 57aaf9293301..4be60e82bd59 100755 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,7 +85,7 @@ public: method is a subsitute for SlideSorterModel::GetPageDescriptor(i)->IsSelected() is included here to make this class more self contained. - */ + */ bool IsPageSelected (int nPageIndex); /** Deselect the descriptor that is associated with the given page. @@ -122,7 +122,7 @@ public: works only when the page has not been de-selected in the mean time. This method helps the view when it scrolls the selection into the visible area. - @return + @return When the selection is empty or when the most recently selected page has been deselected already (but other pages are still selected) then NULL is returned, even when a selection did exist @@ -172,7 +172,7 @@ private: /// Anchor for a range selection. model::SharedPageDescriptor mpSelectionAnchor; model::SharedPageDescriptor mpCurrentPage; - + void CountSelectedPages (void); }; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx index 51e353d696b9..ecd3d9e94a32 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx index c93ed7708650..30d4d93cc7ab 100755 --- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ namespace sd { namespace slidesorter { namespace controller { /** Manage the horizontal and vertical scroll bars. Listen for events, set their sizes, place them in the window, determine their visibilities. - + <p>Handle auto scrolling, i.e. the scrolling of the window when the mouse comes near the window border while dragging a selection.</p> @@ -92,7 +92,7 @@ public: into a cache for later reuse. */ void Disconnect (void); - + /** Set up the scroll bar, i.e. thumb size and position. Call this method when the content of the browser window changed, i.e. pages were inserted or deleted, the layout or the zoom factor has @@ -169,7 +169,7 @@ private: objects of this class. It is given to the constructor. */ ::boost::shared_ptr<ScrollBar> mpHorizontalScrollBar; - + /** The vertical scroll bar. Note that is used but not owned by objects of this class. It is given to the constructor. */ diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx index 79b8a1ff5d44..9ce5a5e96468 100755 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,24 +47,24 @@ namespace sd { namespace slidesorter { namespace controller { class SlideSorterController; -class SelectionFunction +class SelectionFunction : public SlideFunction { public: TYPEINFO(); static FunctionReference Create( SlideSorter& rSlideSorter, SfxRequest& rRequest ); - + // Mouse- & Key-Events virtual BOOL KeyInput(const KeyEvent& rKEvt); virtual BOOL MouseMove(const MouseEvent& rMEvt); virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); virtual void Paint(const Rectangle&, ::sd::Window* ); - - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren - + + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren + virtual void ScrollStart(); virtual void ScrollEnd(); @@ -81,7 +81,7 @@ public: This is used when a function gets a KEY_ESCAPE but can also be called directly. - @returns + @returns true if a active function was aborted */ virtual bool cancel(); @@ -109,7 +109,7 @@ private: /// Box of the insert marker in model coordinates. Rectangle maInsertionMarkerBox; - + /** We use this flag to filter out the cases where MouseMotion() is called with a pressed mouse button but without a prior MouseButtonDown() call. This is an indication that the mouse button was pressed over diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx index c0fab6da84c6..046e1b515bf5 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ public: /** Create a new SelectionManger for the given slide sorter. */ SelectionManager (SlideSorter& rSlideSorter); - + ~SelectionManager (void); /** Delete the currently selected slides. When this method returns the @@ -79,7 +79,7 @@ public: moved to the visible area of the slide sorter view. */ bool IsMakeSelectionVisiblePending (void) const; - + enum SelectionHint { SH_FIRST, SH_LAST, SH_RECENT }; /** Try to make all currently selected page objects visible, i.e. set diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx index 5b8c7d9a08b6..2a41e18ba637 100755 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx index 0e58d5d3b411..aab6175033e7 100755 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ class Command; /** This manager takes over the work of handling slot calls from the controller of the slide sorter. */ -class SlotManager +class SlotManager { public: /** Create a new slot manager that handles slot calls for the controller diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index 4ade19087304..8851ca6b863a 100755 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -125,7 +125,7 @@ public: */ sal_Int32 GetIndex ( const ::com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage>& rxSlide) const; - + /** Call this method after the document has changed its structure. This will get the model in sync with the SdDrawDocument. This method tries not to throw away to much information already gathered. This diff --git a/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx index c93641a51204..989e0c46397d 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ public: virtual T GetNextElement (void) = 0; virtual void Rewind (void) = 0; virtual ::std::auto_ptr<Enumeration<T> > Clone (void) = 0; -}; +}; } } } // end of namespace ::sd::slidesorter::model diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index 81877ce7465c..7f53d3e6d75e 100755 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,9 +58,9 @@ class SlideRenderer; namespace css = ::com::sun::star; -/** Each PageDescriptor object represents the preview of one draw page, +/** Each PageDescriptor object represents the preview of one draw page, slide, or master page of a Draw or Impress document as they are displayed - in the slide sorter. This class gives access to some associated + in the slide sorter. This class gives access to some associated information like prerendered preview or position on the screen. <p>Bounding boxes of page objects come in four varieties: @@ -78,7 +78,7 @@ public: @param pPage The page pointer can in some situations not be detected from rxPage, e.g. after undo of page deletion. Therefore supply it - seperately. + seperately. @param nIndex This index is displayed in the view as page number. It is not necessaryily the page index (not even when you add or subtract 1 @@ -108,8 +108,8 @@ public: /** Return <TRUE/> when the page object is fully or parially visible. */ bool IsVisible (void) const; - /** Set the visible state that is returned by the IsVisible() method. - This method is typically called by the view who renders the object + /** Set the visible state that is returned by the IsVisible() method. + This method is typically called by the view who renders the object onto the screen. */ void SetVisible (bool bVisible); @@ -183,9 +183,9 @@ private: /// The factory that is used to create PageObject objects. const controller::PageObjectFactory* mpPageObjectFactory; - + /** The page object will be destroyed by the page into which it has - been inserted. + been inserted. */ view::PageObject* mpPageObject; diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx index 3586eead3532..fa613032bbcb 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -119,7 +119,7 @@ private: PageEnumeration (::std::auto_ptr<Enumeration<SharedPageDescriptor> > pImpl); // Default constructor not implemented. - PageEnumeration (void); + PageEnumeration (void); }; } } } // end of namespace ::sd::slidesorter::model diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageEnumerationProvider.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageEnumerationProvider.hxx index 8aa51174b166..06c1ce38c356 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageEnumerationProvider.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageEnumerationProvider.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,12 +48,12 @@ public: selected slides of the given model. */ static PageEnumeration CreateSelectedPagesEnumeration (const SlideSorterModel& rModel); - + /** The returned enumeration of slides iterates over the slides (partially) inside the visible area. */ static PageEnumeration CreateVisiblePagesEnumeration (const SlideSorterModel& rModel); -}; +}; } } } // end of namespace ::sd::slidesorter::model diff --git a/sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx index 6dba8a848ae1..9837f6ef07f4 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index 2ef520b1df89..f267bc73ceee 100755 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,7 +76,7 @@ public: @param rViewShell This reference is simply passed to the base class and not used by this class. - + */ SlideSorterView (SlideSorter& rSlideSorter); @@ -186,7 +186,7 @@ public: view::ViewOverlay& GetOverlay (void); /** Set the bounding box of the insertion marker in model coordinates. - + It will be painted as a dark rectangle that fills the given box. */ void SetInsertionMarker (const Rectangle& rBBox); @@ -196,7 +196,7 @@ public: void SetInsertionMarkerVisibility (bool bVisible); /** Set the size and position of the selection rectangle. - + It will be painted as a dashed rectangle. */ void SetSelectionRectangle (const Rectangle& rBox); diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx index 2b71c0e50152..9ecc8508549b 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx index 9b1fd996e9c0..25745d867e1c 100755 --- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ class Size; namespace sd { namespace slidesorter { namespace view { -/** Calculate the size and position of page objects displayed by a slide +/** Calculate the size and position of page objects displayed by a slide sorter. The layouter takes into account various input values: 1.) Size of the window in which the slide sorter is displayed. 2.) Desired and minimal and maximal widths of page objects. @@ -54,7 +54,7 @@ namespace sd { namespace slidesorter { namespace view { 2.) The number of columns. 3.) The size of the enclosing page. - <p>Sizes and lengths are all in pixel except where explicitly stated + <p>Sizes and lengths are all in pixel except where explicitly stated otherwise.</p> <p>The GetIndex... methods may return indices that are larger than or @@ -114,7 +114,7 @@ public: @param nMaximalColumnCount The default value is 5. */ - void SetColumnCount (sal_Int32 nMinimalColumnCount, + void SetColumnCount (sal_Int32 nMinimalColumnCount, sal_Int32 nMaximalColumnCount); /** Central method of this class. It takes the input values and @@ -133,12 +133,12 @@ public: used to obtain valid values (<TRUE/>). */ bool RearrangeHorizontal ( - const Size& rWindowSize, + const Size& rWindowSize, const Size& rPageObjectSize, OutputDevice* pDevice, const sal_uInt32 nPageCount); bool RearrangeVertical ( - const Size& rWindowSize, + const Size& rWindowSize, const Size& rPageObjectSize, OutputDevice* pDevice); @@ -186,7 +186,7 @@ public: the right of the page object. */ Rectangle GetInsertionMarkerBox ( - sal_Int32 nIndex, + sal_Int32 nIndex, bool bVertical, bool bLeftOrTop) const; @@ -267,12 +267,12 @@ public: const DoublePoint&rLayouterPoint) const; typedef ::std::vector<Rectangle> BackgroundRectangleList; - + private: - class ScreenAndModelValue {public: + class ScreenAndModelValue {public: sal_Int32 mnScreen,mnModel; explicit ScreenAndModelValue (sal_Int32 nScreen, sal_Int32 nModel = 0) - : mnScreen(nScreen),mnModel(nModel) {} + : mnScreen(nScreen),mnModel(nModel) {} }; ScreenAndModelValue mnRequestedLeftBorder; ScreenAndModelValue mnRequestedRightBorder; @@ -321,7 +321,7 @@ private: row above or below respectively. */ sal_Int32 GetRowAtPosition ( - sal_Int32 nYPosition, + sal_Int32 nYPosition, bool bIncludeBordersAndGaps, GapMembership eGapMembership = GM_NONE) const; @@ -341,13 +341,13 @@ private: gap area with the column to the left or right respectively. */ sal_Int32 GetColumnAtPosition ( - sal_Int32 nXPosition, + sal_Int32 nXPosition, bool bIncludeBordersAndGaps, GapMembership eGapMembership = GM_NONE) const; /** This method is typically called from GetRowAtPosition() and GetColumnAtPosition() to handle a position that lies inside the gap - between two adjacent rows or columns. + between two adjacent rows or columns. @param nDistanceIntoGap Vertical distance from the bottom of the upper row down into the gap or or horizontal distance from the right edge right into the diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx index 0f4ede6216c1..ef14ae81c12a 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ class PageObject { public: PageObject ( - const Rectangle& rRect, + const Rectangle& rRect, SdrPage* pPage, const model::SharedPageDescriptor& rpDescriptor); diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx index 31899d3b3e44..63d53eeb415e 100755 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,16 +52,16 @@ class PageObjectViewContact { public: PageObjectViewContact ( - SdrPageObj& rPageObj, + SdrPageObj& rPageObj, const model::SharedPageDescriptor& rpDescriptor); ~PageObjectViewContact (void); /** Create a ViewObjectContact object that buffers its output in a - bitmap. + bitmap. @return Ownership of the new object passes to the caller. */ - virtual ::sdr::contact::ViewObjectContact& + virtual ::sdr::contact::ViewObjectContact& CreateObjectSpecificViewObjectContact( ::sdr::contact::ObjectContact& rObjectContact); diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx index 7e884fc54797..4310d381e852 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ public: preview is created every time when requested. */ PageObjectViewObjectContact ( - ::sdr::contact::ObjectContact& rObjectContact, + ::sdr::contact::ObjectContact& rObjectContact, ::sdr::contact::ViewContact& rViewContact, const ::boost::shared_ptr<cache::PageCache>& rpCache, const ::boost::shared_ptr<controller::Properties>& rpProperties); @@ -157,7 +157,7 @@ public: enum CoordinateSystem { ModelCoordinateSystem, PixelCoordinateSystem }; /** Return the bounding box of the page object or one of its graphical - parts. + parts. @param rDevice This device is used to translate between model and window coordinates. diff --git a/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx index 4ff076f72560..e147d8f314e2 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -192,7 +192,7 @@ protected: private: sal_Int32 mnInsertionIndex; Rectangle maBoundingBox; - + void SetPositionAndSize (const Rectangle& rBoundingBox); }; @@ -241,7 +241,7 @@ private: The view overlay itself simply gives access to the more specialized classes that handle individual indicators. - + */ class ViewOverlay { diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 0bf9052f5382..260492b8a797 100755 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -185,7 +185,7 @@ SharedPageDescriptor SlideSorterModel::GetPageDescriptor ( sal_Int32 SlideSorterModel::GetIndex (const Reference<drawing::XDrawPage>& rxSlide) const { ::osl::MutexGuard aGuard (maMutex); - + // First try to guess the right index. Reference<beans::XPropertySet> xSet (rxSlide, UNO_QUERY); if (xSet.is()) @@ -215,7 +215,7 @@ sal_Int32 SlideSorterModel::GetIndex (const Reference<drawing::XDrawPage>& rxSli for (sal_Int32 nIndex=0; nIndex<nCount; ++nIndex) { SharedPageDescriptor pDescriptor (maPageDescriptors[nIndex]); - + // Make sure that the descriptor exists. Without it the given slide // can not be found. if (pDescriptor.get() == NULL) @@ -223,7 +223,7 @@ sal_Int32 SlideSorterModel::GetIndex (const Reference<drawing::XDrawPage>& rxSli // Call GetPageDescriptor() to create the missing descriptor. pDescriptor = GetPageDescriptor(nIndex,true); } - + if (pDescriptor->GetXDrawPage() == rxSlide) return nIndex; } @@ -306,7 +306,7 @@ void SlideSorterModel::SetPageObjectFactory( -const controller::PageObjectFactory& +const controller::PageObjectFactory& SlideSorterModel::GetPageObjectFactory (void) const { ::osl::MutexGuard aGuard (maMutex); diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx index ffd93cbf0a13..331b23baae85 100755 --- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -203,7 +203,7 @@ void PageDescriptor::RemoveFocus (void) -view::PageObjectViewObjectContact* +view::PageObjectViewObjectContact* PageDescriptor::GetViewObjectContact (void) const { return mpViewObjectContact; diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx index 0e472c04880e..b7a8f22340b1 100644 --- a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,7 +71,7 @@ private: inline void AdvanceToNextValidElement (void); // Default constructor not implemented. - PageEnumerationImpl (void); + PageEnumerationImpl (void); // Assignment operator not implemented. PageEnumerationImpl& operator= (const PageEnumerationImpl&); }; @@ -91,10 +91,10 @@ PageEnumeration PageEnumeration::Create ( return PageEnumeration(::std::auto_ptr<Enumeration<SharedPageDescriptor> >( new PageEnumerationImpl(rModel, rPredicate))); } - - - - + + + + PageEnumeration::PageEnumeration ( ::std::auto_ptr<Enumeration<SharedPageDescriptor> > pImpl) : mpImpl(pImpl) @@ -198,7 +198,7 @@ PageEnumerationImpl::PageEnumerationImpl ( PageEnumerationImpl::PageEnumerationImpl ( - const SlideSorterModel& rModel, + const SlideSorterModel& rModel, const PageEnumeration::PagePredicate& rPredicate, int nIndex) : mrModel(rModel), diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx index c8c17e21819e..72ab3313e5fd 100644 --- a/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ class SelectedPagesPredicate public: bool operator() (const SharedPageDescriptor& rpDescriptor) { - return rpDescriptor->IsSelected(); + return rpDescriptor->IsSelected(); } }; diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 768dd5f9458a..ef48f9c5d5e3 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -351,18 +351,18 @@ void SlideSorter::SetupListeners (void) pParentWindow->AddEventListener( LINK( mpSlideSorterController.get(), - controller::SlideSorterController, + controller::SlideSorterController, WindowEventHandler)); pWindow->AddEventListener( LINK( mpSlideSorterController.get(), - controller::SlideSorterController, + controller::SlideSorterController, WindowEventHandler)); } Application::AddEventListener( LINK( mpSlideSorterController.get(), - controller::SlideSorterController, + controller::SlideSorterController, WindowEventHandler)); mpSlideSorterController->GetScrollBarManager().Connect(); @@ -381,19 +381,19 @@ void SlideSorter::ReleaseListeners (void) pWindow->RemoveEventListener( LINK(mpSlideSorterController.get(), - controller::SlideSorterController, + controller::SlideSorterController, WindowEventHandler)); ::Window* pParentWindow = pWindow->GetParent(); if (pParentWindow != NULL) pParentWindow->RemoveEventListener( LINK(mpSlideSorterController.get(), - controller::SlideSorterController, + controller::SlideSorterController, WindowEventHandler)); } Application::RemoveEventListener( LINK(mpSlideSorterController.get(), - controller::SlideSorterController, + controller::SlideSorterController, WindowEventHandler)); } @@ -408,7 +408,7 @@ void SlideSorter::CreateModelViewController (void) mpSlideSorterView.reset(CreateView()); DBG_ASSERT (mpSlideSorterView.get()!=NULL, - "Can not create view for slide browser"); + "Can not create view for slide browser"); mpSlideSorterController.reset(CreateController()); DBG_ASSERT (mpSlideSorterController.get()!=NULL, @@ -510,7 +510,7 @@ bool SlideSorter::RelocateToWindow (::Window* pParentWindow) if (mpViewShell != NULL) mpViewShell->ViewShell::RelocateToParentWindow(pParentWindow); - + SetupControls(mpViewShell->GetParentWindow()); SetupListeners(); diff --git a/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx b/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx index 985fb72b38a5..a228bcaf1d1f 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,18 +40,18 @@ namespace sd { namespace slidesorter { SlideSorterChildWindow::SlideSorterChildWindow ( ::Window* pParentWindow, - USHORT nId, - SfxBindings* pBindings, - SfxChildWinInfo* pInfo) + USHORT nId, + SfxBindings* pBindings, + SfxChildWinInfo* pInfo) : SfxChildWindow (pParentWindow, nId) { pWindow = new SlideSorter ( - pBindings, - this, + pBindings, + this, pParentWindow); eChildAlignment = SFX_ALIGN_LEFT; static_cast<SfxDockingWindow*>(pWindow)->Initialize (pInfo); - // SetHideNotDelete (TRUE); + // SetHideNotDelete (TRUE); } diff --git a/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.src b/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.src index 829b18d63a97..490e9dde1c2b 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.src +++ b/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index 787086b4596e..f4b06e9afb18 100755 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -140,7 +140,7 @@ void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments) try { mxViewId = Reference<XResourceId>(rArguments[0], UNO_QUERY_THROW); - + // Get the XController. Reference<frame::XController> xController (rArguments[1], UNO_QUERY_THROW); @@ -294,7 +294,7 @@ Reference<container::XIndexAccess> SAL_CALL SlideSorterService::getDocumentSlide { return mpSlideSorter->GetModel().GetDocumentSlides(); } - + @@ -306,7 +306,7 @@ void SAL_CALL SlideSorterService::setDocumentSlides ( if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid()) mpSlideSorter->GetController().SetDocumentSlides(rxSlides); } - + @@ -420,7 +420,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsSuspendPreviewUpdatesDuringFullScreen return mpSlideSorter->GetController().GetProperties() ->IsSuspendPreviewUpdatesDuringFullScreenPresentation(); } - + @@ -433,7 +433,7 @@ void SAL_CALL SlideSorterService::setIsSuspendPreviewUpdatesDuringFullScreenPres mpSlideSorter->GetController().GetProperties() ->SetSuspendPreviewUpdatesDuringFullScreenPresentation(bValue); } - + @@ -446,7 +446,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsOrientationVertical (void) else return mpSlideSorter->GetView().GetOrientation() == SlideSorterView::VERTICAL; } - + @@ -472,7 +472,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsSmoothScrolling (void) else return mpSlideSorter->GetController().GetProperties()->IsSmoothSelectionScrolling(); } - + diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx index 9af239c64fd1..73ec088af21c 100755 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,7 +71,7 @@ public: // XInitialization - + virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) throw (css::uno::Exception, css::uno::RuntimeException); @@ -86,7 +86,7 @@ public: // XWindowListener - + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException); @@ -116,48 +116,48 @@ public: // Attributes - + virtual css::uno::Reference<css::container::XIndexAccess> SAL_CALL getDocumentSlides (void) throw (css::uno::RuntimeException); - + virtual void SAL_CALL setDocumentSlides ( const css::uno::Reference<css::container::XIndexAccess >& rxSlides) throw (css::uno::RuntimeException); - + virtual sal_Bool SAL_CALL getIsHighlightCurrentSlide (void) throw (css::uno::RuntimeException); - + virtual void SAL_CALL setIsHighlightCurrentSlide (::sal_Bool bIsHighlightCurrentSlide) throw (css::uno::RuntimeException); - + virtual sal_Bool SAL_CALL getIsShowSelection (void) throw (css::uno::RuntimeException); - + virtual void SAL_CALL setIsShowSelection (sal_Bool bIsShowSelection) throw (css::uno::RuntimeException); - + virtual sal_Bool SAL_CALL getIsCenterSelection (void) throw (css::uno::RuntimeException); - + virtual void SAL_CALL setIsCenterSelection (sal_Bool bIsCenterSelection) throw (css::uno::RuntimeException); - + virtual sal_Bool SAL_CALL getIsSuspendPreviewUpdatesDuringFullScreenPresentation (void) throw (css::uno::RuntimeException); - + virtual void SAL_CALL setIsSuspendPreviewUpdatesDuringFullScreenPresentation ( sal_Bool bIsSuspendPreviewUpdatesDuringFullScreenPresentation) throw (css::uno::RuntimeException); - + virtual sal_Bool SAL_CALL getIsOrientationVertical (void) throw (css::uno::RuntimeException); - + virtual void SAL_CALL setIsOrientationVertical (sal_Bool bIsOrientationVertical) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getIsSmoothScrolling (void) throw (css::uno::RuntimeException); - + virtual void SAL_CALL setIsSmoothScrolling (sal_Bool bIsOrientationVertical) throw (css::uno::RuntimeException); @@ -202,7 +202,7 @@ private: css::uno::Reference<css::drawing::framework::XResourceId> mxViewId; css::uno::Reference<css::awt::XWindow> mxParentWindow; ::boost::scoped_ptr<cppu::IPropertyArrayHelper> mpPropertyArrayHelper; - + void Resize (void); /** This method throws a DisposedException when the object has already been diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 86ec4002cd02..07e4ef749061 100755 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ #include <cppuhelper/bootstrap.hxx> #include <comphelper/processfactory.hxx> -using namespace ::sd::slidesorter; +using namespace ::sd::slidesorter; #define SlideSorterViewShell #include "sdslots.hxx" @@ -94,7 +94,7 @@ TYPEINIT1(SlideSorterViewShell, ViewShell); ::boost::shared_ptr<SlideSorterViewShell> SlideSorterViewShell::Create ( - SfxViewFrame* pFrame, + SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameViewArgument) @@ -119,7 +119,7 @@ TYPEINIT1(SlideSorterViewShell, ViewShell); SlideSorterViewShell::SlideSorterViewShell ( - SfxViewFrame* pFrame, + SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameViewArgument) @@ -215,7 +215,7 @@ void SlideSorterViewShell::Init (bool bIsMainViewShell) SlideSorterViewShell* SlideSorterViewShell::GetSlideSorter (ViewShellBase& rBase) { SlideSorterViewShell* pViewShell = NULL; - + // Test the center, left, and then the right pane for showing a slide sorter. ::rtl::OUString aPaneURLs[] = { FrameworkHelper::msCenterPaneURL, @@ -256,7 +256,7 @@ Reference<drawing::XDrawSubController> SlideSorterViewShell::CreateSubController *mpSlideSorter, *GetView())); } - + return xSubController; } @@ -356,10 +356,10 @@ SdPage* SlideSorterViewShell::getCurrentPage(void) const -SdPage* SlideSorterViewShell::GetActualPage (void) +SdPage* SlideSorterViewShell::GetActualPage (void) { SdPage* pCurrentPage = NULL; - + // 1. Try to get the current page from the view shell in the center pane // (if we are that not ourself). if ( ! IsMainViewShell()) @@ -368,7 +368,7 @@ SdPage* SlideSorterViewShell::GetActualPage (void) if (pMainViewShell.get() != NULL) pCurrentPage = pMainViewShell->GetActualPage(); } - + if (pCurrentPage == NULL) { model::SharedPageDescriptor pDescriptor ( @@ -376,7 +376,7 @@ SdPage* SlideSorterViewShell::GetActualPage (void) if (pDescriptor.get() != NULL) pCurrentPage = pDescriptor->GetPage(); } - + return pCurrentPage; } @@ -507,7 +507,7 @@ void SlideSorterViewShell::PrePaint() void SlideSorterViewShell::Paint ( - const Rectangle& rBBox, + const Rectangle& rBBox, ::sd::Window* pWindow) { SetActiveWindow (pWindow); @@ -540,7 +540,7 @@ SvBorder SlideSorterViewShell::GetBorder (bool ) void SlideSorterViewShell::Command ( - const CommandEvent& rEvent, + const CommandEvent& rEvent, ::sd::Window* pWindow) { OSL_ASSERT(mpSlideSorter.get()!=NULL); @@ -570,7 +570,7 @@ void SlideSorterViewShell::ReadFrameViewData (FrameView* pFrameView) else rView.GetLayouter().SetColumnCount(nSlidesPerRow,nSlidesPerRow); mpSlideSorter->GetController().Rearrange(true); - + // DrawMode for 'main' window if (GetActiveWindow()->GetDrawMode() != pFrameView->GetDrawMode() ) GetActiveWindow()->SetDrawMode( pFrameView->GetDrawMode() ); @@ -681,7 +681,7 @@ void SlideSorterViewShell::StartDrag ( { OSL_ASSERT(mpSlideSorter.get()!=NULL); mpSlideSorter->GetController().GetClipboard().StartDrag ( - rDragPt, + rDragPt, pWindow); } @@ -700,14 +700,14 @@ void SlideSorterViewShell::DragFinished ( sal_Int8 SlideSorterViewShell::AcceptDrop ( const AcceptDropEvent& rEvt, - DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, - USHORT nPage, + DropTargetHelper& rTargetHelper, + ::sd::Window* pTargetWindow, + USHORT nPage, USHORT nLayer) { OSL_ASSERT(mpSlideSorter.get()!=NULL); return mpSlideSorter->GetController().GetClipboard().AcceptDrop ( - rEvt, + rEvt, rTargetHelper, pTargetWindow, nPage, @@ -718,15 +718,15 @@ sal_Int8 SlideSorterViewShell::AcceptDrop ( sal_Int8 SlideSorterViewShell::ExecuteDrop ( - const ExecuteDropEvent& rEvt, + const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, - USHORT nPage, + ::sd::Window* pTargetWindow, + USHORT nPage, USHORT nLayer) { OSL_ASSERT(mpSlideSorter.get()!=NULL); return mpSlideSorter->GetController().GetClipboard().ExecuteDrop ( - rEvt, + rEvt, rTargetHelper, pTargetWindow, nPage, diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index d2c2310329a6..f8ee4c72523a 100755 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,8 +84,8 @@ TYPEINIT1(SlideSorterView, ::sd::View); SlideSorterView::SlideSorterView (SlideSorter& rSlideSorter) : ::sd::View ( - rSlideSorter.GetModel().GetDocument(), - NULL, + rSlideSorter.GetModel().GetDocument(), + NULL, rSlideSorter.GetViewShell()), mrSlideSorter(rSlideSorter), mrModel(rSlideSorter.GetModel()), @@ -139,7 +139,7 @@ SlideSorterView::~SlideSorterView (void) } mpPreviewCache.reset(); - // hide the page to avoid problems in the view when deleting + // hide the page to avoid problems in the view when deleting // visualized objects HideSdrPage(); @@ -153,7 +153,7 @@ SlideSorterView::~SlideSorterView (void) sal_Int32 SlideSorterView::GetPageIndexAtPoint (const Point& rPosition) const { sal_Int32 nIndex (-1); - + ::sd::Window* pWindow = GetWindow(); if (pWindow != NULL) { @@ -203,8 +203,8 @@ void SlideSorterView::LocalModelHasChanged(void) // Initialize everything that depends on a page view, now that we have // one. - // SetApplicationDocumentColor( - // Application::GetSettings().GetStyleSettings().GetWindowColor()); + // SetApplicationDocumentColor( + // Application::GetSettings().GetStyleSettings().GetWindowColor()); UpdatePageBorders(); } @@ -283,7 +283,7 @@ void SlideSorterView::HandleDrawModeChange (void) new controller::PageObjectFactory( GetPreviewCache(), mrSlideSorter.GetController().GetProperties()))); - + RequestRepaint(); } @@ -353,13 +353,13 @@ void SlideSorterView::Layout () SdrPageObj* pPageObject = pDescriptor->GetPageObject(); Rectangle aPageObjectBox (mpLayouter->GetPageObjectBox (nIndex)); pPageObject->SetSnapRect(aPageObjectBox); - + nIndex += 1; } // Set the page so that it encloses all page objects. mpPage->SetSize (aViewBox.GetSize()); } - + InvalidatePageObjectVisibilities (); } @@ -387,14 +387,14 @@ void SlideSorterView::DeterminePageObjectVisibilities (void) Point(0,0), pWindow->GetSizePixel()); aViewArea = pWindow->PixelToLogic (aViewArea); - int nFirstIndex = + int nFirstIndex = mpLayouter->GetIndexOfFirstVisiblePageObject (aViewArea); - int nLastIndex = + int nLastIndex = mpLayouter->GetIndexOfLastVisiblePageObject (aViewArea); // For page objects that just dropped off the visible area we // decrease the priority of pending requests for preview bitmaps. - + int nMinIndex = ::std::min (mnFirstVisiblePageIndex, nFirstIndex); int nMaxIndex = ::std::max (mnLastVisiblePageIndex, nLastIndex); if (mnFirstVisiblePageIndex!=nFirstIndex || mnLastVisiblePageIndex!=nLastIndex) @@ -432,7 +432,7 @@ void SlideSorterView::DeterminePageObjectVisibilities (void) // Tell the listeners that the visibility of some objects has changed. ::std::vector<Link> aChangeListeners (maVisibilityChangeListeners); - for (::std::vector<Link>::const_iterator + for (::std::vector<Link>::const_iterator iListener=aChangeListeners.begin(), iEnd=aChangeListeners.end(); iListener!=iEnd; @@ -441,7 +441,7 @@ void SlideSorterView::DeterminePageObjectVisibilities (void) iListener->Call(NULL); } } - } + } } @@ -456,7 +456,7 @@ void SlideSorterView::UpdatePreciousFlags (void) model::SharedPageDescriptor pDescriptor; ::boost::shared_ptr<cache::PageCache> pCache = GetPreviewCache(); sal_Int32 nPageCount (mrModel.GetPageCount()); - + for (int nIndex=0; nIndex<=nPageCount; ++nIndex) { pDescriptor = mrModel.GetPageDescriptor(nIndex); @@ -598,7 +598,7 @@ void SlideSorterView::CompleteRedraw(OutputDevice* pDevice, const Region& rPaint void SlideSorterView::InvalidateOneWin (::Window& rWindow) { - // if ( IsInvalidateAllowed() ) + // if ( IsInvalidateAllowed() ) View::InvalidateOneWin (rWindow); } @@ -606,10 +606,10 @@ void SlideSorterView::InvalidateOneWin (::Window& rWindow) void SlideSorterView::InvalidateOneWin ( - ::Window& rWindow, + ::Window& rWindow, const Rectangle& rPaintArea) { - // if( IsInvalidateAllowed() ) + // if( IsInvalidateAllowed() ) View::InvalidateOneWin (rWindow, rPaintArea); } @@ -641,7 +641,7 @@ void SlideSorterView::AdaptBoundingBox ( { // The relevant offsets are given in pixel values. Therefore // transform the box first into screen coordinates. - rModelPageObjectBoundingBox + rModelPageObjectBoundingBox = pWindow->LogicToPixel (rModelPageObjectBoundingBox); aCurrentCoordinateSystem = CS_SCREEN; } @@ -656,10 +656,10 @@ void SlideSorterView::AdaptBoundingBox ( if (eCoordinateSystem != aCurrentCoordinateSystem) { if (eCoordinateSystem == CS_MODEL) - rModelPageObjectBoundingBox + rModelPageObjectBoundingBox = pWindow->PixelToLogic (rModelPageObjectBoundingBox); else - rModelPageObjectBoundingBox + rModelPageObjectBoundingBox = pWindow->LogicToPixel (rModelPageObjectBoundingBox); } } @@ -720,7 +720,7 @@ void SlideSorterView::Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint void SlideSorterView::UpdatePageBorders (void) -{ +{ maPagePixelBorder = SvBorder(); ::sd::Window* pWindow = GetWindow(); if (mrModel.GetPageCount()>0 && pWindow!=NULL) @@ -745,7 +745,7 @@ void SlideSorterView::UpdatePageBorders (void) maModelBorder.Top() += aBorderSize.Height(); maModelBorder.Bottom() += aBorderSize.Height(); } - + // Set the border at all page descriptors so that the contact // objects have access to them. model::PageEnumeration aPageEnumeration ( diff --git a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx index 9d2e224aefdf..ec7f8aac01aa 100644 --- a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx +++ b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -113,11 +113,11 @@ FontProvider::SharedFontPointer FontProvider::GetFont (const OutputDevice& rDevi maFont.reset(new Font (Application::GetSettings().GetStyleSettings().GetAppFont())); maFont->SetTransparent(TRUE); maFont->SetWeight(WEIGHT_NORMAL); - + // Transform the point size to pixel size. MapMode aFontMapMode (MAP_POINT); Size aFontSize (rDevice.LogicToPixel(maFont->GetSize(), aFontMapMode)); - + // Transform the font size to the logical coordinates of the device. maFont->SetSize (rDevice.PixelToLogic(aFontSize)); @@ -125,7 +125,7 @@ FontProvider::SharedFontPointer FontProvider::GetFont (const OutputDevice& rDevi // devices or modified zoom scales on future calls. maMapMode = rDevice.GetMapMode(); } - + return maFont; } diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index 3767a655c48b..cd5bf9b47db8 100755 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,9 +72,9 @@ Layouter::~Layouter (void) void Layouter::SetBorders ( - sal_Int32 nLeftBorder, + sal_Int32 nLeftBorder, sal_Int32 nRightBorder, - sal_Int32 nTopBorder, + sal_Int32 nTopBorder, sal_Int32 nBottomBorder) { if (nLeftBorder >= 0) @@ -91,9 +91,9 @@ void Layouter::SetBorders ( void Layouter::SetPageBorders ( - sal_Int32 nLeftBorder, + sal_Int32 nLeftBorder, sal_Int32 nRightBorder, - sal_Int32 nTopBorder, + sal_Int32 nTopBorder, sal_Int32 nBottomBorder) { if (nLeftBorder >= 0) @@ -110,7 +110,7 @@ void Layouter::SetPageBorders ( void Layouter::SetColumnCount ( - sal_Int32 nMinimalColumnCount, + sal_Int32 nMinimalColumnCount, sal_Int32 nMaximalColumnCount) { if (nMinimalColumnCount <= nMaximalColumnCount) @@ -170,11 +170,11 @@ bool Layouter::RearrangeHorizontal ( sal_uInt32 nTargetHeight = 0; sal_uInt32 nRowCount = 1; if (mnColumnCount > 0) - nTargetHeight = (rWindowSize.Height() + nTargetHeight = (rWindowSize.Height() - mnTopBorder.mnScreen - mnBottomBorder.mnScreen - - nRowCount * (mnTopPageBorder.mnScreen - + mnBottomPageBorder.mnScreen) + - nRowCount * (mnTopPageBorder.mnScreen + + mnBottomPageBorder.mnScreen) - (nRowCount-1) * mnTotalVerticalGap.mnScreen ) / nRowCount; @@ -196,7 +196,7 @@ bool Layouter::RearrangeHorizontal ( pDevice->SetMapMode (aMapMode); // Calculate the resulting scale factor and the page object size in - // pixels. + // pixels. maPageObjectModelSize = rPageObjectSize; int nPagePixelHeight (pDevice->LogicToPixel(maPageObjectModelSize).Height()); @@ -231,7 +231,7 @@ bool Layouter::RearrangeVertical ( + mnTopPageBorder.mnScreen + mnBottomPageBorder.mnScreen; // Calculate the column count. - mnColumnCount = (rWindowSize.Width() + mnColumnCount = (rWindowSize.Width() - mnRequestedLeftBorder.mnScreen - mnRequestedRightBorder.mnScreen) / (mnPreferredWidth + mnTotalHorizontalGap.mnScreen); if (mnColumnCount < mnMinimalColumnCount) @@ -266,11 +266,11 @@ bool Layouter::RearrangeVertical ( // Calculate the width of each page object. sal_Int32 nTargetWidth = 0; if (mnColumnCount > 0) - nTargetWidth = (rWindowSize.Width() + nTargetWidth = (rWindowSize.Width() - mnLeftBorder.mnScreen - mnRightBorder.mnScreen - - mnColumnCount * (mnRightPageBorder.mnScreen - + mnLeftPageBorder.mnScreen) + - mnColumnCount * (mnRightPageBorder.mnScreen + + mnLeftPageBorder.mnScreen) - (mnColumnCount-1) * mnTotalHorizontalGap.mnScreen ) / mnColumnCount; @@ -288,7 +288,7 @@ bool Layouter::RearrangeVertical ( pDevice->SetMapMode (aMapMode); // Calculate the resulting scale factor and the page object size in - // pixels. + // pixels. maPageObjectModelSize = rPageObjectSize; int nPagePixelWidth (pDevice->LogicToPixel (maPageObjectModelSize).Width()); @@ -353,7 +353,7 @@ void Layouter::SetZoom (Fraction nZoomFactor, OutputDevice* pDevice) mnRightPageBorder.mnModel = aBottomRightPageBorder.Width(); mnBottomPageBorder.mnModel = aBottomRightPageBorder.Height(); - mnInsertionMarkerThickness.mnModel = pDevice->PixelToLogic ( + mnInsertionMarkerThickness.mnModel = pDevice->PixelToLogic ( Size(mnInsertionMarkerThickness.mnScreen,0)).Width(); } @@ -381,7 +381,7 @@ Rectangle Layouter::GetPageObjectBox (sal_Int32 nIndex) const int nColumn = nIndex % mnColumnCount; int nRow = nIndex / mnColumnCount; return Rectangle ( - Point (mnLeftBorder.mnModel + Point (mnLeftBorder.mnModel + nColumn * maPageObjectModelSize.Width() + mnLeftPageBorder.mnModel + (nColumn>0 ? nColumn : 0) * mnTotalHorizontalGap.mnModel, @@ -402,20 +402,20 @@ Rectangle Layouter::GetPageBox (sal_Int32 nObjectCount) const if (mnColumnCount > 0) { sal_Int32 nRowCount = (nObjectCount+mnColumnCount-1) / mnColumnCount; - nHorizontalSize = + nHorizontalSize = mnLeftBorder.mnModel + mnRightBorder.mnModel + mnColumnCount * maPageObjectModelSize.Width() + mnLeftPageBorder.mnModel + mnRightPageBorder.mnModel; if (mnColumnCount > 1) - nHorizontalSize + nHorizontalSize += (mnColumnCount-1) * mnTotalHorizontalGap.mnModel; - nVerticalSize = + nVerticalSize = mnTopBorder.mnModel + mnBottomBorder.mnModel + nRowCount * maPageObjectModelSize.Height() + mnTopPageBorder.mnModel + mnBottomPageBorder.mnModel; - if (nRowCount > 1) + if (nRowCount > 1) nVerticalSize += (nRowCount-1) * mnTotalVerticalGap.mnModel; } @@ -429,7 +429,7 @@ Rectangle Layouter::GetPageBox (sal_Int32 nObjectCount) const Rectangle Layouter::GetInsertionMarkerBox ( - sal_Int32 nIndex, + sal_Int32 nIndex, bool bVertical, bool bLeftOrTop) const { @@ -442,14 +442,14 @@ Rectangle Layouter::GetInsertionMarkerBox ( if (bLeftOrTop) { // Left. - aBox.Left() -= mnLeftPageBorder.mnModel + aBox.Left() -= mnLeftPageBorder.mnModel + mnHorizontalGap.mnModel - nHorizontalInsertionMarkerOffset; } else { // Right. - aBox.Left() = aBox.Right() + aBox.Left() = aBox.Right() + mnRightPageBorder.mnModel + nHorizontalInsertionMarkerOffset; } @@ -469,8 +469,8 @@ Rectangle Layouter::GetInsertionMarkerBox ( else { // Below. - aBox.Top() = aBox.Bottom() - + mnBottomPageBorder.mnModel + aBox.Top() = aBox.Bottom() + + mnBottomPageBorder.mnModel + nVerticalInsertionMarkerOffset; } aBox.Bottom() = aBox.Top() + mnInsertionMarkerThickness.mnModel; @@ -495,7 +495,7 @@ sal_Int32 Layouter::GetIndexOfFirstVisiblePageObject ( sal_Int32 Layouter::GetIndexOfLastVisiblePageObject ( const Rectangle& aVisibleArea) const { - sal_Int32 nRow = GetRowAtPosition (aVisibleArea.Bottom(), + sal_Int32 nRow = GetRowAtPosition (aVisibleArea.Bottom(), true, GM_BOTH); return (nRow+1) * mnColumnCount - 1; } @@ -507,13 +507,13 @@ sal_Int32 Layouter::GetIndexAtPoint ( const Point& rPosition, bool bIncludePageBorders) const { - sal_Int32 nRow = GetRowAtPosition (rPosition.Y(), + sal_Int32 nRow = GetRowAtPosition (rPosition.Y(), bIncludePageBorders, bIncludePageBorders ? GM_PAGE_BORDER : GM_NONE); - sal_Int32 nColumn = GetColumnAtPosition (rPosition.X(), + sal_Int32 nColumn = GetColumnAtPosition (rPosition.X(), bIncludePageBorders, bIncludePageBorders ? GM_PAGE_BORDER : GM_NONE); - + if (nRow >= 0 && nColumn >= 0) return nRow * mnColumnCount + nColumn; else @@ -531,7 +531,7 @@ sal_Int32 Layouter::GetIndexAtPoint ( will yield valid return values. The horizontal positions between the center of page objects in column i and the center of page objects in column i+1 will return column i+1 as insertion index. - + When there is only one column and bAllowVerticalPosition is true than take the vertical areas between rows into account as well. */ @@ -541,34 +541,34 @@ sal_Int32 Layouter::GetInsertionIndex ( { sal_Int32 nIndex = -1; - sal_Int32 nRow = GetRowAtPosition (rPosition.Y(), true, + sal_Int32 nRow = GetRowAtPosition (rPosition.Y(), true, (mnColumnCount==1 && bAllowVerticalPosition) ? GM_BOTH : GM_BOTH); sal_Int32 nColumn = GetColumnAtPosition (rPosition.X(), true, GM_BOTH); if (nRow >= 0 && nColumn >= 0) nIndex = nRow * mnColumnCount + nColumn; - + return nIndex; } -Layouter::DoublePoint +Layouter::DoublePoint Layouter::ConvertModelToLayouterCoordinates ( const Point& rModelPoint) const { sal_Int32 nColumn = GetColumnAtPosition (rModelPoint.X(), true, GM_BOTH); - sal_Int32 nColumnWidth + sal_Int32 nColumnWidth = maPageObjectModelSize.Width() + mnTotalHorizontalGap.mnModel; - sal_Int32 nDistanceIntoColumn = + sal_Int32 nDistanceIntoColumn = rModelPoint.X() - mnLeftBorder.mnModel - mnLeftPageBorder.mnModel - nColumn * nColumnWidth; sal_Int32 nRow = GetRowAtPosition (rModelPoint.Y(), true, GM_BOTH); - sal_Int32 nRowHeight + sal_Int32 nRowHeight = maPageObjectModelSize.Height() + mnTotalVerticalGap.mnModel; - sal_Int32 nDistanceIntoRow = + sal_Int32 nDistanceIntoRow = rModelPoint.Y() - mnTopBorder.mnModel - mnTopPageBorder.mnModel - nRow * nRowHeight; @@ -585,18 +585,18 @@ Point Layouter::ConvertLayouterToModelCoordinates ( { sal_Int32 nColumn = (sal_Int32) ::rtl::math::round(rLayouterPoint.first, 0,rtl_math_RoundingMode_Floor); - sal_Int32 nColumnWidth + sal_Int32 nColumnWidth = maPageObjectModelSize.Width() + mnTotalHorizontalGap.mnModel; - sal_Int32 nDistanceIntoColumn + sal_Int32 nDistanceIntoColumn = (sal_Int32)((rLayouterPoint.first - nColumn) * nColumnWidth); sal_Int32 nRow = (sal_Int32) ::rtl::math::round(rLayouterPoint.second, 0,rtl_math_RoundingMode_Floor); - sal_Int32 nRowHeight + sal_Int32 nRowHeight = maPageObjectModelSize.Height() + mnTotalVerticalGap.mnModel; - sal_Int32 nDistanceIntoRow + sal_Int32 nDistanceIntoRow = (sal_Int32)((rLayouterPoint.second - nRow) * nRowHeight); - + return Point ( mnLeftBorder.mnModel + mnLeftPageBorder.mnModel + nColumn * nColumnWidth + nDistanceIntoColumn, @@ -608,13 +608,13 @@ Point Layouter::ConvertLayouterToModelCoordinates ( sal_Int32 Layouter::GetRowAtPosition ( - sal_Int32 nYPosition, + sal_Int32 nYPosition, bool bIncludeBordersAndGaps, GapMembership eGapMembership) const { sal_Int32 nRow = -1; - const sal_Int32 nY = nYPosition + const sal_Int32 nY = nYPosition - mnTopBorder.mnModel - mnTopPageBorder.mnModel; if (nY >= 0) { @@ -651,13 +651,13 @@ sal_Int32 Layouter::GetRowAtPosition ( sal_Int32 Layouter::GetColumnAtPosition ( - sal_Int32 nXPosition, + sal_Int32 nXPosition, bool bIncludeBordersAndGaps, GapMembership eGapMembership) const { sal_Int32 nColumn = -1; - sal_Int32 nX = nXPosition + sal_Int32 nX = nXPosition - mnLeftBorder.mnModel - mnLeftPageBorder.mnModel; if (nX >= 0) { @@ -719,11 +719,11 @@ sal_Int32 Layouter::ResolvePositionInGap ( nIndex ++; break; } - + case GM_PREVIOUS: // Row or column already at correct value. break; - + case GM_NEXT: // The complete gap belongs to the next row or column. nIndex ++; @@ -744,7 +744,7 @@ sal_Int32 Layouter::ResolvePositionInGap ( } } break; - + default: nIndex = -1; } diff --git a/sd/source/ui/slidesorter/view/SlsPageObject.cxx b/sd/source/ui/slidesorter/view/SlsPageObject.cxx index 28c572de9594..3b03beaaad7c 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObject.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObject.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx index 303e78eeff61..a398900d2943 100755 --- a/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,15 +60,15 @@ PageObjectViewContact::~PageObjectViewContact (void) -ViewObjectContact& +ViewObjectContact& PageObjectViewContact::CreateObjectSpecificViewObjectContact( ObjectContact& rObjectContact) { OSL_ASSERT(mpDescriptor.get()!=NULL); - - ViewObjectContact* pResult + + ViewObjectContact* pResult = mpDescriptor->GetPageObjectFactory().CreateViewObjectContact ( - rObjectContact, + rObjectContact, *this); DBG_ASSERT (pResult!=NULL, "PageObjectViewContact::CreateObjectSpecificViewObjectContact() was not able to create object."); diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx index b1e4e80fdf1f..ec006c0dc7d7 100755 --- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,7 +82,7 @@ const sal_Int32 PageObjectViewObjectContact::mnMouseOverEffectOffset = 3; const sal_Int32 PageObjectViewObjectContact::mnMouseOverEffectThickness = 1; PageObjectViewObjectContact::PageObjectViewObjectContact ( - ObjectContact& rObjectContact, + ObjectContact& rObjectContact, ViewContact& rViewContact, const ::boost::shared_ptr<cache::PageCache>& rpCache, const ::boost::shared_ptr<controller::Properties>& rpProperties) @@ -200,7 +200,7 @@ Rectangle PageObjectViewObjectContact::GetBoundingBox ( case NameBoundingBox: break; - + case FadeEffectIndicatorBoundingBox: Size aModelOffset = rDevice.PixelToLogic(Size (0, mnFadeEffectIndicatorOffset)); // Flush left just outside the selection rectangle. @@ -258,7 +258,7 @@ class SdPageObjectBasePrimitive : public drawinglayer::primitive2d::BufferedDeco { private: // the inner range of the SdPageObject visualisation - basegfx::B2DRange maRange; + basegfx::B2DRange maRange; public: // constructor and destructor @@ -273,7 +273,7 @@ public: }; SdPageObjectBasePrimitive::SdPageObjectBasePrimitive(const basegfx::B2DRange& rRange) -: drawinglayer::primitive2d::BufferedDecompositionPrimitive2D(), +: drawinglayer::primitive2d::BufferedDecompositionPrimitive2D(), maRange(rRange) { } @@ -300,7 +300,7 @@ class SdPageObjectPageBitmapPrimitive : public SdPageObjectBasePrimitive { private: // the bitmap containing the PagePreview - BitmapEx maBitmapEx; + BitmapEx maBitmapEx; protected: // method which is to be used to implement the local decomposition of a 2D primitive. @@ -329,7 +329,7 @@ Primitive2DSequence SdPageObjectPageBitmapPrimitive::create2DDecomposition(const // to avoid scaling, use the Bitmap pixel size as primitive size basegfx::B2DHomMatrix aBitmapTransform; const Size aBitmapSize(getBitmapEx().GetSizePixel()); - const basegfx::B2DVector aBitmapSizeLogic(rViewInformation.getInverseObjectToViewTransformation() * + const basegfx::B2DVector aBitmapSizeLogic(rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector(aBitmapSize.getWidth() - 1, aBitmapSize.getHeight() - 1)); // short form for scale and translate transformation @@ -347,7 +347,7 @@ Primitive2DSequence SdPageObjectPageBitmapPrimitive::create2DDecomposition(const SdPageObjectPageBitmapPrimitive::SdPageObjectPageBitmapPrimitive( const basegfx::B2DRange& rRange, const BitmapEx& rBitmapEx) -: SdPageObjectBasePrimitive(rRange), +: SdPageObjectBasePrimitive(rRange), maBitmapEx(rBitmapEx) { } @@ -451,7 +451,7 @@ Primitive2DSequence SdPageObjectSelectPrimitive::create2DDecomposition(const dra } SdPageObjectSelectPrimitive::SdPageObjectSelectPrimitive(const basegfx::B2DRange& rRange) -: SdPageObjectBasePrimitive(rRange) +: SdPageObjectBasePrimitive(rRange) { } @@ -493,14 +493,14 @@ Primitive2DSequence SdPageObjectBorderPrimitive::create2DDecomposition(const dra static bool bTestWithBrightColors(false); const svtools::ColorConfig aColorConfig; const basegfx::BColor aBorderColor(bTestWithBrightColors ? basegfx::BColor(1,0,0) : Color(aColorConfig.GetColorValue(svtools::FONTCOLOR).nColor).getBColor()); - + const Primitive2DReference xReference( new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(basegfx::tools::createPolygonFromRect(aAdaptedInnerRange), aBorderColor)); return Primitive2DSequence(&xReference, 1); } SdPageObjectBorderPrimitive::SdPageObjectBorderPrimitive(const basegfx::B2DRange& rRange) -: SdPageObjectBasePrimitive(rRange) +: SdPageObjectBasePrimitive(rRange) { } @@ -574,7 +574,7 @@ Primitive2DSequence SdPageObjectFocusPrimitive::create2DDecomposition(const draw const drawinglayer::attribute::LineAttribute aLineAttribute(aLineColor.getBColor()); const drawinglayer::attribute::StrokeAttribute aStrokeAttribute( aDotDashArray, 2.0 * nFocusIndicatorWidth * aDiscretePixel.getX()); - + xRetval[1] = Primitive2DReference( new drawinglayer::primitive2d::PolygonStrokePrimitive2D(aIndicatorPolygon, aLineAttribute, aStrokeAttribute)); @@ -583,7 +583,7 @@ Primitive2DSequence SdPageObjectFocusPrimitive::create2DDecomposition(const draw } SdPageObjectFocusPrimitive::SdPageObjectFocusPrimitive(const basegfx::B2DRange& rRange, const bool bContrast) - : SdPageObjectBasePrimitive(rRange), + : SdPageObjectBasePrimitive(rRange), mbContrastToSelected(bContrast) { } @@ -611,14 +611,14 @@ private: /// the indicator bitmaps. Static since it is usable outside this primitive /// for size comparisons - static BitmapEx* mpFadeEffectIconBitmap; - static BitmapEx* mpCommentsIconBitmap; + static BitmapEx* mpFadeEffectIconBitmap; + static BitmapEx* mpCommentsIconBitmap; /// page name, number and needed infos - String maPageName; - sal_uInt32 mnPageNumber; - Font maPageNameFont; - Size maPageNumberAreaModelSize; + String maPageName; + sal_uInt32 mnPageNumber; + Font maPageNameFont; + Size maPageNumberAreaModelSize; // bitfield bool mbShowFadeEffectIcon : 1; @@ -712,7 +712,7 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(c basegfx::B2DVector aTextSizeAttribute; const drawinglayer::attribute::FontAttribute aFontAttribute( drawinglayer::primitive2d::getFontAttributeFromVclFont( - aTextSizeAttribute, + aTextSizeAttribute, getPageNameFont(), false, false)); @@ -726,12 +726,12 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(c if(getShowFadeEffectIcon()) { // prepare fFadeEffect Sizes - const basegfx::B2DVector aFadeEffectBitmapSizeLogic(rViewInformation.getInverseObjectToViewTransformation() * + const basegfx::B2DVector aFadeEffectBitmapSizeLogic(rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector( - getFadeEffectIconBitmap().GetSizePixel().getWidth() - 1, + getFadeEffectIconBitmap().GetSizePixel().getWidth() - 1, getFadeEffectIconBitmap().GetSizePixel().getHeight() - 1)); - // Paint_FadeEffectIndicator replacement. + // Paint_FadeEffectIndicator replacement. // create transformation. To avoid bitmap scaling, use bitmap size as size basegfx::B2DHomMatrix aBitmapTransform; @@ -748,9 +748,9 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(c if(nTextLength) { // prepare fFadeEffect Sizes since it consumes from text size - const basegfx::B2DVector aFadeEffectBitmapSizeLogic(rViewInformation.getInverseObjectToViewTransformation() * + const basegfx::B2DVector aFadeEffectBitmapSizeLogic(rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector( - getFadeEffectIconBitmap().GetSizePixel().getWidth() - 1, + getFadeEffectIconBitmap().GetSizePixel().getWidth() - 1, getFadeEffectIconBitmap().GetSizePixel().getHeight() - 1)); // Paint_PageName replacement. Get text size @@ -762,11 +762,11 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(c // calculate text start position double fStartX( - aAdaptedInnerRange.getMaxX() + aAdaptedInnerRange.getMaxX() - fTextWidth + (aDiscretePixel.getX() * 3.0)); const double fStartY( - aAdaptedInnerRange.getMaxY() + aAdaptedInnerRange.getMaxY() + fTextHeight + fFadeEffectTextGap); const bool bNeedClipping(fStartX < aAdaptedInnerRange.getMinX() + fFadeEffectWidth); @@ -812,13 +812,13 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(c // create Text primitive and add to target xRetval[nInsert++] = Primitive2DReference( new drawinglayer::primitive2d::TextSimplePortionPrimitive2D( - aTextMatrix, - aPageName, - 0, - aPageName.Len(), - aDXArray, - aFontAttribute, - aLocale, + aTextMatrix, + aPageName, + 0, + aPageName.Len(), + aDXArray, + aFontAttribute, + aLocale, aFontColor)); } @@ -826,7 +826,7 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(c // Paint_PageNumber replacement. Get the range where it shall be centered and prepare the string const double fLeft(aAdaptedInnerRange.getMinX() - (mnPageNumberOffset * aDiscretePixel.getX()) - getPageNumberAreaModelSize().Width()); const double fTop(aAdaptedInnerRange.getMinY()); - const basegfx::B2DRange aNumberRange(fLeft, fTop, + const basegfx::B2DRange aNumberRange(fLeft, fTop, fLeft + getPageNumberAreaModelSize().Width(), fTop + getPageNumberAreaModelSize().Height()); const String aPageNumber(String::CreateFromInt32(getPageNumber())); const xub_StrLen nNumberLen(aPageNumber.Len()); @@ -853,13 +853,13 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(c // create Text primitive xRetval[nInsert++] = Primitive2DReference( new drawinglayer::primitive2d::TextSimplePortionPrimitive2D( - aTextMatrix, - aPageNumber, - 0, - nNumberLen, - aDXArray, - aFontAttribute, - aLocale, + aTextMatrix, + aPageNumber, + 0, + nNumberLen, + aDXArray, + aFontAttribute, + aLocale, aFontColor)); if(getExcluded()) @@ -891,7 +891,7 @@ SdPageObjectFadeNameNumberPrimitive::SdPageObjectFadeNameNumberPrimitive( bool bShowFadeEffectIcon, bool bShowCommentsIcon, bool bExcluded) -: SdPageObjectBasePrimitive(rRange), +: SdPageObjectBasePrimitive(rRange), maPageName(rPageName), mnPageNumber(nPageNumber), maPageNameFont(rPageNameFont), @@ -938,8 +938,8 @@ Primitive2DSequence PageObjectViewObjectContact::createPrimitive2DSequence(const // get primitive vector from parent class. Do remember the contents for later use; this // is done to create the page content renderer (see PagePrimitiveExtractor in svx) at the - // original object and to setup the draw hierarchy there so that changes to VCs of displayed - // objects will lead to InvalidatePartOfView-calls which will be forwarded from the helper-OC + // original object and to setup the draw hierarchy there so that changes to VCs of displayed + // objects will lead to InvalidatePartOfView-calls which will be forwarded from the helper-OC // to this VOC in calling a ActionChanged(). // // This already produces the displayable page content as a primitive sequence, complete with @@ -965,7 +965,7 @@ Primitive2DSequence PageObjectViewObjectContact::createPrimitive2DSequence(const // (just hand over the local member to the cache) // // For the moment i will use (1) and disable primitive creation for SdrPageObj contents here - + // const_cast< PageObjectViewObjectContact* >(this)->mxCurrentPageContents = ViewObjectContactOfPageObj::createPrimitive2DSequence(rDisplayInfo); // assert when this call is issued indirectly from the destructor of @@ -984,14 +984,14 @@ Primitive2DSequence PageObjectViewObjectContact::createPrimitive2DSequence(const && !mbInDestructor) { // get inner and outer logic rectangles. Use model data directly for creation. Do NOT use getBoundRect()/ - // getSnapRect() functionality; these will use the sequence of primitives in the long run itself. SdrPageObj + // getSnapRect() functionality; these will use the sequence of primitives in the long run itself. SdrPageObj // is a SdrObject, so use SdrObject::aOutRect as model data. Access using GetLastBoundRect() to not execute anything PageObjectViewContact& rPaObVOC(static_cast< PageObjectViewContact& >(GetViewContact())); const Rectangle aInnerLogic(rPaObVOC.GetPageObject().GetLastBoundRect()); - + // get BitmapEx from cache. Do exactly the same as Paint_Preview() to avoid a repaint loop // caused by slightly different pixel sizes of what the cache sees as pixel size and what is - // calculated here in discrete coordinates. This includes to not use LogicToPiyel on the Rectangle, + // calculated here in discrete coordinates. This includes to not use LogicToPiyel on the Rectangle, // but to do the same as the GetBoundingBox() implementation const Rectangle aInnerPixel(Rectangle(pDevice->LogicToPixel(aInnerLogic.TopLeft()), pDevice->LogicToPixel(aInnerLogic.GetSize()))); BitmapEx aBitmapEx(const_cast< PageObjectViewObjectContact* >(this)->GetPreview(rDisplayInfo, aInnerPixel)); @@ -1011,13 +1011,13 @@ Primitive2DSequence PageObjectViewObjectContact::createPrimitive2DSequence(const if(GetPage()) { const SdPage* pPage = static_cast<const SdPage*>(GetPage()); - + // decide if fade effect indicator will be painted if(pPage->getTransitionType() > 0) { bShowFadeEffectIcon = true; } - + bShowCommentsIcon = !pPage->getAnnotations().empty(); // prepare PageName, PageNumber, font and AreaModelSize @@ -1042,11 +1042,11 @@ Primitive2DSequence PageObjectViewObjectContact::createPrimitive2DSequence(const const bool bCreateSelected(GetPageDescriptor()->IsSelected()); const sal_uInt32 nCount( - (bCreateBitmap ? 1 : 0) + // bitmap itself - 1 + // border around bitmap (always) + (bCreateBitmap ? 1 : 0) + // bitmap itself + 1 + // border around bitmap (always) 1 + // FadeEffect, PageName and PageNumber visualisation (always) - (bCreateFocused ? 1 : 0) + // create focused - (bCreateSelected ? 1 : 0) // create selected + (bCreateFocused ? 1 : 0) + // create focused + (bCreateSelected ? 1 : 0) // create selected ); sal_uInt32 nInsert(0); Primitive2DSequence xRetval(nCount); @@ -1135,7 +1135,7 @@ BitmapEx PageObjectViewObjectContact::GetPreview ( // assert when this call is issued indirectly from the destructor of // this instance. This is not allowed and needs to be looked at OSL_ENSURE(!mbInDestructor, "Higher call inside PageObjectViewObjectContact in destructor (!)"); - + if (!mbInDestructor) { if (mpCache != NULL) @@ -1334,7 +1334,7 @@ SvBorder PageObjectViewObjectContact::CalculatePageModelBorder ( aBottomRightBorders.Width(), aBottomRightBorders.Height()); - + // 2. Add the device dependent values. // Calculate the area of the page number. diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx index 57872105e1cc..c486fa76107a 100644 --- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx +++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx index e29b65068d1d..8ad0c9f8e8f6 100644 --- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx +++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ public: virtual ::boost::shared_ptr<std::vector<cache::CacheKey> > GetEntryList (bool bVisible); virtual sal_Int32 GetPriority (cache::CacheKey aKey); virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel (void); - + private: model::SlideSorterModel& mrModel; SlideSorterView& mrView; diff --git a/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx b/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx index 32576240036c..dbd6640455f4 100644 --- a/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -134,7 +134,7 @@ SlideSorter& ViewOverlay::GetSlideSorter (void) const OverlayManager* ViewOverlay::GetOverlayManager (void) const { OverlayManager* pOverlayManager = NULL; - + SlideSorterView& rView (mrSlideSorter.GetView()); SdrPageView* pPageView = rView.GetSdrPageView(); if (pPageView != NULL && pPageView->PageWindowCount()>0) @@ -220,7 +220,7 @@ void SubstitutionOverlay::Create ( EnsureRegistration(); maPosition = rPosition; - + maShapes.clear(); while (rSelection.HasMoreElements()) { @@ -257,7 +257,7 @@ void SubstitutionOverlay::Move (const Point& rOffset) maShapes.transform(aTranslation); maPosition += rOffset; - + objectChange(); } @@ -430,10 +430,10 @@ void InsertionIndicatorOverlay::SetPosition (const Point& rPoint) { static const bool bAllowHorizontalInsertMarker = true; Layouter& rLayouter (mrViewOverlay.GetSlideSorter().GetView().GetLayouter()); - USHORT nPageCount + USHORT nPageCount = (USHORT)mrViewOverlay.GetSlideSorter().GetModel().GetPageCount(); - sal_Int32 nInsertionIndex = rLayouter.GetInsertionIndex (rPoint, + sal_Int32 nInsertionIndex = rLayouter.GetInsertionIndex (rPoint, bAllowHorizontalInsertMarker); if (nInsertionIndex >= nPageCount) nInsertionIndex = nPageCount-1; @@ -450,13 +450,13 @@ void InsertionIndicatorOverlay::SetPosition (const Point& rPoint) // column. // 2. The vertical (standard) insert marker may be painted left to // the insert page or right of the previous one. When both pages - // are in the same row this makes no difference. Otherwise the + // are in the same row this makes no difference. Otherwise the // posiotions are at the left and right ends of two rows. Point aPageCenter (rLayouter.GetPageObjectBox ( nInsertionIndex).Center()); - if (bAllowHorizontalInsertMarker + if (bAllowHorizontalInsertMarker && rLayouter.GetColumnCount() == 1) { bVertical = false; @@ -479,7 +479,7 @@ void InsertionIndicatorOverlay::SetPosition (const Point& rPoint) Rectangle aBox; if (mnInsertionIndex >= 0) aBox = rLayouter.GetInsertionMarkerBox ( - nDrawIndex, + nDrawIndex, bVertical, bLeftOrTop); SetPositionAndSize (aBox); @@ -554,7 +554,7 @@ void MouseOverIndicatorOverlay::SetSlideUnderMouse ( { } } - + if (pDescriptor != rpDescriptor) { // Switch to the new (possibly empty) descriptor. diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index cdba12e9887e..56ab370801b7 100755 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -142,7 +142,7 @@ TableDesignPane::TableDesignPane( ::Window* pParent, ViewShellBase& rBase, bool try { mxView = Reference< XDrawView >::query(mrBase.GetController()); - addListener(); + addListener(); Reference< XController > xController( mrBase.GetController(), UNO_QUERY_THROW ); Reference< XStyleFamiliesSupplier > xFamiliesSupp( xController->getModel(), UNO_QUERY_THROW ); @@ -240,7 +240,7 @@ void TableDesignPane::ApplyStyle() { SfxRequest aReq( SID_TABLE_STYLE, SFX_CALLMODE_SYNCHRON, SFX_APP()->GetPool() ); aReq.AppendItem( SfxStringItem( SID_TABLE_STYLE, sStyleName ) ); - + rtl::Reference< sdr::SelectionController > xController( pView->getSelectionController() ); if( xController.is() ) xController->Execute( aReq ); @@ -285,14 +285,14 @@ void TableDesignPane::ApplyOptions() { static sal_uInt16 gParamIds[CB_BANDED_COLUMNS-CB_HEADER_ROW+1] = { - ID_VAL_USEFIRSTROWSTYLE, ID_VAL_USELASTROWSTYLE, ID_VAL_USEBANDINGROWSTYLE, + ID_VAL_USEFIRSTROWSTYLE, ID_VAL_USELASTROWSTYLE, ID_VAL_USEBANDINGROWSTYLE, ID_VAL_USEFIRSTCOLUMNSTYLE, ID_VAL_USELASTCOLUMNSTYLE, ID_VAL_USEBANDINGCOLUMNSTYLE }; if( mxSelectedTable.is() ) { SfxRequest aReq( SID_TABLE_STYLE_SETTINGS, SFX_CALLMODE_SYNCHRON, SFX_APP()->GetPool() ); - + for( sal_uInt16 i = 0; i < (CB_BANDED_COLUMNS-CB_HEADER_ROW+1); ++i ) { aReq.AppendItem( SfxBoolItem( gParamIds[i], static_cast< CheckBox* >( mxControls[CB_HEADER_ROW+i].get() )->IsChecked() ) ); @@ -343,7 +343,7 @@ void TableDesignPane::onSelectionChanged() } Reference< XShapeDescriptor > xDesc( aSel, UNO_QUERY ); - if( xDesc.is() && + if( xDesc.is() && ( xDesc->getShapeType().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.TableShape" ) ) || xDesc->getShapeType().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.TableShape" ) ) ) ) { @@ -406,7 +406,7 @@ void TableDesignPane::updateLayout() Size aItemSize = pValueSet->CalcItemSizePixel(aImage.GetSizePixel()); pValueSet->SetItemWidth( aItemSize.Width() ); pValueSet->SetItemHeight( aItemSize.Height() ); - + aItemSize.Width() += 10; aItemSize.Height() += 10; int nColumnCount = (aValueSetSize.Width() - pValueSet->GetScrollWidth()) / aItemSize.Width(); @@ -423,7 +423,7 @@ void TableDesignPane::updateLayout() pValueSet->SetColCount ((USHORT)nColumnCount); pValueSet->SetLineCount ((USHORT)nRowCount); - + if( !mbModal ) { WinBits nStyle = pValueSet->GetStyle() & ~(WB_VSCROLL); @@ -699,7 +699,7 @@ static void FillCellInfoMatrix( const CellInfoVector& rStyle, const TableStyleSe } } } - + if( !xCellInfo.get() ) { if( rSettings.mbUseColumnBanding ) @@ -736,7 +736,7 @@ const Bitmap CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle, CellInfoMatrix aMatrix; FillCellInfoMatrix( aCellInfoVector, rSettings, aMatrix ); -// bbbbbbbbbbbb w = 12 pixel +// bbbbbbbbbbbb w = 12 pixel // bccccccccccb h = 7 pixel // bccccccccccb b = border color // bcttttttttcb c = cell color diff --git a/sd/source/ui/table/TableDesignPane.hrc b/sd/source/ui/table/TableDesignPane.hrc index 64160db61eb1..31d95fe908e5 100644 --- a/sd/source/ui/table/TableDesignPane.hrc +++ b/sd/source/ui/table/TableDesignPane.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,16 +28,16 @@ #ifndef _SD_TABLEDESIGNPANE_HRC #define _SD_TABLEDESIGNPANE_HRC -#define FL_STYLE_OPTIONS 0 -#define CB_HEADER_ROW 1 -#define CB_TOTAL_ROW 2 -#define CB_BANDED_ROWS 3 -#define CB_FIRST_COLUMN 4 -#define CB_LAST_COLUMN 5 -#define CB_BANDED_COLUMNS 6 +#define FL_STYLE_OPTIONS 0 +#define CB_HEADER_ROW 1 +#define CB_TOTAL_ROW 2 +#define CB_BANDED_ROWS 3 +#define CB_FIRST_COLUMN 4 +#define CB_LAST_COLUMN 5 +#define CB_BANDED_COLUMNS 6 -#define FL_TABLE_STYLES 7 -#define CT_TABLE_STYLES 8 +#define FL_TABLE_STYLES 7 +#define CT_TABLE_STYLES 8 #define DESIGNPANE_CONTROL_COUNT 9 diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx index f587cdeb1b19..a5fad040a298 100644 --- a/sd/source/ui/table/TableDesignPane.hxx +++ b/sd/source/ui/table/TableDesignPane.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -114,11 +114,11 @@ private: ViewShellBase& mrBase; boost::scoped_ptr< TableDesignPane > mpDesignPane; - boost::scoped_ptr< FixedLine > mxFlSep1; - boost::scoped_ptr< FixedLine > mxFlSep2; - boost::scoped_ptr< HelpButton > mxHelpButton; - boost::scoped_ptr< OKButton > mxOkButton; - boost::scoped_ptr< CancelButton > mxCancelButton; + boost::scoped_ptr< FixedLine > mxFlSep1; + boost::scoped_ptr< FixedLine > mxFlSep2; + boost::scoped_ptr< HelpButton > mxHelpButton; + boost::scoped_ptr< OKButton > mxOkButton; + boost::scoped_ptr< CancelButton > mxCancelButton; }; } diff --git a/sd/source/ui/table/TableDesignPane.src b/sd/source/ui/table/TableDesignPane.src index 9ce9470ffa2b..4ab8d78876d6 100644 --- a/sd/source/ui/table/TableDesignPane.src +++ b/sd/source/ui/table/TableDesignPane.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,37 +36,37 @@ Control DLG_TABLEDESIGNPANE Size = MAP_APPFONT( 264, 160 ); Text [ en-US ] = "Table Design"; - + FixedLine FL_STYLE_OPTIONS+1 { Pos = MAP_APPFONT ( 143, 3 ) ; Size = MAP_APPFONT ( 120, 10 ) ; - OutputSize = TRUE; + OutputSize = TRUE; Text [ en-US ] = "Show"; }; - + CheckBox CB_HEADER_ROW+1 { Pos = MAP_APPFONT ( 146, 16 ) ; Size = MAP_APPFONT ( 120 , 10 ) ; TabStop = TRUE ; - Text [ en-US ] = "Header Row" ; + Text [ en-US ] = "Header Row" ; }; - + CheckBox CB_TOTAL_ROW+1 { Pos = MAP_APPFONT ( 146, 29 ) ; Size = MAP_APPFONT ( 120 , 10 ) ; TabStop = TRUE ; - Text [ en-US ] = "Total Row" ; + Text [ en-US ] = "Total Row" ; }; - + CheckBox CB_BANDED_ROWS+1 { Pos = MAP_APPFONT ( 146, 42 ) ; Size = MAP_APPFONT ( 120 , 10 ) ; TabStop = TRUE ; - Text [ en-US ] = "Banded Rows" ; + Text [ en-US ] = "Banded Rows" ; }; CheckBox CB_FIRST_COLUMN+1 @@ -74,7 +74,7 @@ Control DLG_TABLEDESIGNPANE Pos = MAP_APPFONT ( 146, 55 ) ; Size = MAP_APPFONT ( 120 , 10 ) ; TabStop = TRUE ; - Text [ en-US ] = "First Column" ; + Text [ en-US ] = "First Column" ; }; CheckBox CB_LAST_COLUMN+1 @@ -82,7 +82,7 @@ Control DLG_TABLEDESIGNPANE Pos = MAP_APPFONT ( 146, 68 ) ; Size = MAP_APPFONT ( 120 , 10 ) ; TabStop = TRUE ; - Text [ en-US ] = "Last Column" ; + Text [ en-US ] = "Last Column" ; }; CheckBox CB_BANDED_COLUMNS+1 @@ -90,7 +90,7 @@ Control DLG_TABLEDESIGNPANE Pos = MAP_APPFONT ( 146, 82 ) ; Size = MAP_APPFONT ( 120 , 10 ) ; TabStop = TRUE ; - Text [ en-US ] = "Banded Columns" ; + Text [ en-US ] = "Banded Columns" ; }; FixedLine FL_TABLE_STYLES+1 @@ -100,13 +100,13 @@ Control DLG_TABLEDESIGNPANE OutputSize = TRUE; Text [ en-US ] = "Styles"; }; - + Control CT_TABLE_STYLES+1 { Pos = MAP_APPFONT ( 6, 14 ) ; Size = MAP_APPFONT( 120, 143 ); Border = TRUE ; - TabStop = TRUE ; + TabStop = TRUE ; }; }; @@ -137,7 +137,7 @@ ModalDialog DLG_TABLEDESIGNPANE Pos = MAP_APPFONT ( 6 , 176 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; - }; + }; OKButton BTN_OK { Pos = MAP_APPFONT ( 158 , 176 ) ; diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index b30e259e049a..3485f094a530 100755 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -233,7 +233,7 @@ void DrawViewShell::GetTableMenuState( SfxItemSet &rSet ) if( bIsUIActive || ( aActiveLayer.Len() != 0 && pPV && ( pPV->IsLayerLocked(aActiveLayer) || - !pPV->IsLayerVisible(aActiveLayer) ) ) || + !pPV->IsLayerVisible(aActiveLayer) ) ) || SD_MOD()->GetWaterCan() ) { rSet.DisableItem( SID_INSERT_TABLE ); diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx index b46090f1e7eb..f31f4f3da228 100644 --- a/sd/source/ui/table/tableobjectbar.cxx +++ b/sd/source/ui/table/tableobjectbar.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,9 +95,9 @@ SFX_IMPL_INTERFACE( TableObjectBar, SfxShell, SdResId( STR_TABLEOBJECTBARSHELL ) // ----------------------------------------------------------------------------- TableObjectBar::TableObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView ) -: SfxShell( pSdViewShell->GetViewShell() ) -, mpView( pSdView ) -, mpViewSh( pSdViewShell ) +: SfxShell( pSdViewShell->GetViewShell() ) +, mpView( pSdView ) +, mpViewSh( pSdViewShell ) { DrawDocShell* pDocShell = mpViewSh->GetDocSh(); if( pDocShell ) @@ -177,7 +177,7 @@ void TableObjectBar::Execute( SfxRequest& rReq ) rReq.AppendItem( SfxInt16Item( (USHORT)nSlotId, (sal_uInt16)pDlg->getInsertCount() ) ); rReq.AppendItem( SfxBoolItem( SID_TABLE_PARAM_INSERT_AFTER, !pDlg->isInsertBefore() ) ); - + rReq.SetSlot( (USHORT)nSlotId ); } } diff --git a/sd/source/ui/table/tableobjectbar.hxx b/sd/source/ui/table/tableobjectbar.hxx index e1f7b7aed371..1711ed26aa7d 100644 --- a/sd/source/ui/table/tableobjectbar.hxx +++ b/sd/source/ui/table/tableobjectbar.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,9 +50,9 @@ public: TableObjectBar( ::sd::ViewShell* pSdViewShell, ::sd::View* pSdView); virtual ~TableObjectBar (void); - void GetState( SfxItemSet& rSet ); - void GetAttrState( SfxItemSet& rSet ); - void Execute( SfxRequest& rReq ); + void GetState( SfxItemSet& rSet ); + void GetAttrState( SfxItemSet& rSet ); + void Execute( SfxRequest& rReq ); protected: ::sd::View* mpView; diff --git a/sd/source/ui/toolpanel/ConstrainedIterator.cxx b/sd/source/ui/toolpanel/ConstrainedIterator.cxx index 261017ee3e1d..3eaa9ba76741 100644 --- a/sd/source/ui/toolpanel/ConstrainedIterator.cxx +++ b/sd/source/ui/toolpanel/ConstrainedIterator.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace sd { namespace toolpanel { template <class Container> -ConstrainedIterator<Container>::value_type& +ConstrainedIterator<Container>::value_type& ConstrainedIterator<Container>::operator* (void) { return *maIterator; @@ -49,7 +49,7 @@ ConstrainedIterator<Container>::value_type& template <class Container> -const ConstrainedIterator<Container>::value_type& +const ConstrainedIterator<Container>::value_type& ConstrainedIterator<Container>::operator* (void) const { @@ -60,7 +60,7 @@ const ConstrainedIterator<Container>::value_type& template <class Container> -ConstrainedIterator<Container>::value_type& +ConstrainedIterator<Container>::value_type& ConstrainedIterator<Container>::operator-> (void) { return *maIterator; @@ -70,7 +70,7 @@ ConstrainedIterator<Container>::value_type& template <class Container> -const ConstrainedIterator<Container>::value_type& +const ConstrainedIterator<Container>::value_type& ConstrainedIterator<Container>::operator-> (void) const { diff --git a/sd/source/ui/toolpanel/ConstrainedIterator.hxx b/sd/source/ui/toolpanel/ConstrainedIterator.hxx index 8f81ba89ebe7..90b615006c53 100644 --- a/sd/source/ui/toolpanel/ConstrainedIterator.hxx +++ b/sd/source/ui/toolpanel/ConstrainedIterator.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ class Constraint { public: virtual bool operator() ( - const Container& rContainer, + const Container& rContainer, const Container::iterator& rIterator) const = 0; }; @@ -61,10 +61,10 @@ public: ConstrainedIterator (void); ConstrainedIterator ( - const Container& rContainer, + const Container& rContainer, const Container::iterator& rIterator); ConstrainedIterator ( - const Container& rContainer, + const Container& rContainer, const Container::iterator& rIterator, const Constraint<Container>& pConstraint); ConstrainedIterator ( diff --git a/sd/source/ui/toolpanel/ControlContainer.cxx b/sd/source/ui/toolpanel/ControlContainer.cxx index cb8b6c41f5c3..e86660bdc3f0 100644 --- a/sd/source/ui/toolpanel/ControlContainer.cxx +++ b/sd/source/ui/toolpanel/ControlContainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,7 +102,7 @@ void ControlContainer::SetExpansionState ( ExpansionState aState) { ::osl::MutexGuard aGuard (maMutex); - + bool bResizeNecessary (false); if (mbMultiSelection) @@ -252,7 +252,7 @@ sal_uInt32 ControlContainer::GetVisibleControlCount (void) const if (maControlList[nIndex]->GetWindow()->IsVisible()) nCount += 1; } - + return nCount; } @@ -316,7 +316,7 @@ sal_uInt32 ControlContainer::GetPreviousIndex ( // The candidate does not meet our constraints so do one more loop. } - + return nCandidate; } @@ -368,7 +368,7 @@ sal_uInt32 ControlContainer::GetNextIndex ( // The candidate does not meet our constraints so do one more loop. } - + return nCandidate; } diff --git a/sd/source/ui/toolpanel/ControlContainerDescriptor.hxx b/sd/source/ui/toolpanel/ControlContainerDescriptor.hxx index 3557200880d2..3375381a65b7 100644 --- a/sd/source/ui/toolpanel/ControlContainerDescriptor.hxx +++ b/sd/source/ui/toolpanel/ControlContainerDescriptor.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,12 +66,12 @@ public: @param eType Type of the title bar. This specifies how the title bar will be formated. For more information see TitleBar. - + */ ControlContainerDescriptor ( ControlContainer& rContainer, ::Window* pParent, - ::std::auto_ptr<ILayoutableWindow> pControl, + ::std::auto_ptr<ILayoutableWindow> pControl, const String& rTitle, TitleBar::TitleBarType eType); diff --git a/sd/source/ui/toolpanel/ControlList.hxx b/sd/source/ui/toolpanel/ControlList.hxx index 623a9567215f..97f746e6b37a 100644 --- a/sd/source/ui/toolpanel/ControlList.hxx +++ b/sd/source/ui/toolpanel/ControlList.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index ec4eb1e43d4d..926ae1b9bb8e 100755 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -111,7 +111,7 @@ private: }; -SFX_IMPL_INTERFACE(LayoutMenu, SfxShell, +SFX_IMPL_INTERFACE(LayoutMenu, SfxShell, SdResId(STR_TASKPANELAYOUTMENU)) { SFX_POPUPMENU_REGISTRATION(SdResId(RID_TASKPANE_LAYOUTMENU_POPUP)); @@ -156,15 +156,15 @@ static snewfoil_value_info standard[] = { {BMP_LAYOUT_EMPTY, BMP_LAYOUT_EMPTY_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE}, {BMP_LAYOUT_HEAD03, BMP_LAYOUT_HEAD03_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE}, - {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM}, + {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM}, {BMP_LAYOUT_HEAD02A, BMP_LAYOUT_HEAD02A_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT}, - {BMP_LAYOUT_HEAD01, BMP_LAYOUT_HEAD01_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE}, + {BMP_LAYOUT_HEAD01, BMP_LAYOUT_HEAD01_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE}, {BMP_LAYOUT_TEXTONLY, BMP_LAYOUT_TEXTONLY_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT}, {BMP_LAYOUT_HEAD03B, BMP_LAYOUT_HEAD03B_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT}, {BMP_LAYOUT_HEAD03C, BMP_LAYOUT_HEAD03C_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ}, - {BMP_LAYOUT_HEAD03A, BMP_LAYOUT_HEAD03A_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT}, + {BMP_LAYOUT_HEAD03A, BMP_LAYOUT_HEAD03A_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT}, {BMP_LAYOUT_HEAD02B, BMP_LAYOUT_HEAD02B_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT}, - {BMP_LAYOUT_HEAD04, BMP_LAYOUT_HEAD04_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ}, + {BMP_LAYOUT_HEAD04, BMP_LAYOUT_HEAD04_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ}, {BMP_LAYOUT_HEAD06, BMP_LAYOUT_HEAD06_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART}, // vertical @@ -223,7 +223,7 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell ) SetSmartHelpId(SmartId(HID_SD_TASK_PANE_PREVIEW_LAYOUTS)); SetAccessibleName(SdResId(STR_TASKPANEL_LAYOUT_MENU_TITLE)); - + Link aStateChangeLink (LINK(this,LayoutMenu,StateChangeHandler)); mxListener = new ::sd::tools::SlotStateListener( aStateChangeLink, @@ -241,7 +241,7 @@ LayoutMenu::~LayoutMenu (void) // Tell the shell factory that this object is no longer available. if (GetShellManager() != NULL) GetShellManager()->RemoveSubShell(this); - + Reference<lang::XComponent> xComponent (mxListener, UNO_QUERY); if (xComponent.is()) xComponent->dispose(); @@ -266,7 +266,7 @@ LayoutMenu::~LayoutMenu (void) AutoLayout LayoutMenu::GetSelectedAutoLayout (void) { AutoLayout aResult = AUTOLAYOUT_NONE; - + if ( ! IsNoSelection() && GetSelectItemId()!=0) { AutoLayout* pLayout = static_cast<AutoLayout*>(GetItemData(GetSelectItemId())); @@ -287,7 +287,7 @@ Size LayoutMenu::GetPreferredSize (void) { Size aItemSize = CalcItemSizePixel (Size()); Size aPreferredWindowSize = CalcWindowSizePixel ( - aItemSize, + aItemSize, (USHORT)mnPreferredColumnCount, (USHORT)CalculateRowCount (aItemSize,mnPreferredColumnCount)); return aPreferredWindowSize; @@ -388,7 +388,7 @@ void LayoutMenu::UpdateEnabledState (const MasterMode eMode) // expanded. bIsEnabled = true; break; - + case ViewShell::ST_DRAW: case ViewShell::ST_IMPRESS: { @@ -481,7 +481,7 @@ void LayoutMenu::Resize (void) nColumnCount = 4; int nRowCount = CalculateRowCount (aItemSize, nColumnCount); - + SetColCount ((USHORT)nColumnCount); SetLineCount ((USHORT)nRowCount); } @@ -504,7 +504,7 @@ void LayoutMenu::MouseButtonDown (const MouseEvent& rEvent) if (nIndex > 0) SelectItem(nIndex); } - + ValueSet::MouseButtonDown (rEvent); } @@ -697,7 +697,7 @@ void LayoutMenu::AssignLayoutToSelectedSlides (AutoLayout aLayout) pPageSelection.reset(new ::sd::slidesorter::SlideSorterViewShell::PageSelection()); pPageSelection->push_back(pMainViewShell->GetActualPage()); } - + if (pPageSelection->empty()) break; @@ -742,7 +742,7 @@ SfxRequest LayoutMenu::CreateRequest ( break; SetOfByte aVisibleLayers (pPage->TRG_GetMasterPageVisibleLayers()); - + aRequest.AppendItem( SfxStringItem (ID_VAL_PAGENAME, String()));//pPage->GetName())); aRequest.AppendItem(SfxUInt32Item (ID_VAL_WHATLAYOUT, aLayout)); @@ -767,7 +767,7 @@ void LayoutMenu::Fill (void) SvtLanguageOptions aLanguageOptions; sal_Bool bVertical = aLanguageOptions.IsVerticalTextEnabled(); SdDrawDocument* pDocument = mrBase.GetDocument(); - sal_Bool bRightToLeft = (pDocument!=NULL + sal_Bool bRightToLeft = (pDocument!=NULL && pDocument->GetDefaultWritingMode() == WritingMode_RL_TB); // Get URL of the view in the center pane. @@ -785,7 +785,7 @@ void LayoutMenu::Fill (void) } catch (RuntimeException&) {} - + snewfoil_value_info* pInfo = NULL; if (sCenterPaneViewName.equals(framework::FrameworkHelper::msNotesViewURL)) { @@ -811,10 +811,10 @@ void LayoutMenu::Fill (void) { if ((WritingMode_TB_RL != pInfo->meWritingMode) || bVertical) { - BitmapEx aBmp (SdResId (bHighContrast - ? pInfo->mnHCBmpResId + BitmapEx aBmp (SdResId (bHighContrast + ? pInfo->mnHCBmpResId : pInfo->mnBmpResId)); - + if (bRightToLeft && (WritingMode_TB_RL != pInfo->meWritingMode)) aBmp.Mirror (BMP_MIRROR_HORZ); @@ -925,7 +925,7 @@ void LayoutMenu::UpdateSelection (void) ViewShell* pViewShell = mrBase.GetMainViewShell().get(); if (pViewShell == NULL) break; - + SdPage* pCurrentPage = pViewShell->getCurrentPage(); if (pCurrentPage == NULL) break; diff --git a/sd/source/ui/toolpanel/LayoutMenu.hxx b/sd/source/ui/toolpanel/LayoutMenu.hxx index 627a363fb576..b9b1658c18c9 100755 --- a/sd/source/ui/toolpanel/LayoutMenu.hxx +++ b/sd/source/ui/toolpanel/LayoutMenu.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ class LayoutMenu : public ValueSet, public TreeNode, public SfxShell, - public DragSourceHelper, + public DragSourceHelper, public DropTargetHelper { public: diff --git a/sd/source/ui/toolpanel/MethodGuard.hxx b/sd/source/ui/toolpanel/MethodGuard.hxx index 45b81367c8de..a8f6d673e605 100644 --- a/sd/source/ui/toolpanel/MethodGuard.hxx +++ b/sd/source/ui/toolpanel/MethodGuard.hxx @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx index 6b10ed889424..1d827874a1ee 100755 --- a/sd/source/ui/toolpanel/ScrollPanel.cxx +++ b/sd/source/ui/toolpanel/ScrollPanel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -135,7 +135,7 @@ ScrollPanel::~ScrollPanel (void) TitledControl* ScrollPanel::AddControl ( - ::std::auto_ptr<TreeNode> pControl, + ::std::auto_ptr<TreeNode> pControl, const String& rTitle, ULONG nHelpId) { @@ -143,14 +143,14 @@ TitledControl* ScrollPanel::AddControl ( // managed by the content object. TitledControl* pTitledControl = new TitledControl( this, - pControl, + pControl, rTitle, TitledControlStandardClickHandler(GetControlContainer(), ControlContainer::ES_TOGGLE), TitleBar::TBT_SUB_CONTROL_HEADLINE); pTitledControl->GetTitleBar()->SetHelpId(nHelpId); AddControl(::std::auto_ptr<TreeNode>(pTitledControl)); - + return pTitledControl; } @@ -169,7 +169,7 @@ void ScrollPanel::AddControl (::std::auto_ptr<TreeNode> pControl) const Link aWindowListener(LINK(this,ScrollPanel,WindowEventListener)); OSL_ASSERT(pControl->GetWindow()!=NULL); pControl->GetWindow()->AddEventListener(aWindowListener); - + TitledControl* pTitledControl = dynamic_cast<TitledControl*>(pControl.get()); if (pTitledControl != NULL) { @@ -192,8 +192,8 @@ void ScrollPanel::AddControl (::std::auto_ptr<TreeNode> pControl) rFocusManager.RegisterLink(pFirst,pControl->GetWindow(), KEY_UP); rFocusManager.RegisterLink(pControl->GetWindow(),pFirst, KEY_DOWN); } - - + + // Add a down link only for the first control so that when entering // the sub tool panel the focus is set to the first control. if (nControlCount == 0) @@ -230,7 +230,7 @@ void ScrollPanel::Paint (const Rectangle& rRect) Size aSize (maScrollWindow.GetOutputSizePixel()); // Paint left and right vertical border. Rectangle aVerticalArea ( - Point(0,0), + Point(0,0), Size(mnHorizontalBorder,aSize.Height())); maScrollWindow.DrawRect (aVerticalArea); aVerticalArea.Right() += mnHorizontalBorder + mnChildrenWidth - 1; @@ -252,7 +252,7 @@ void ScrollPanel::Paint (const Rectangle& rRect) break; maScrollWindow.DrawRect (aStripeArea); } - + maScrollWindow.SetLineColor (aOriginalLineColor); maScrollWindow.SetFillColor (aOriginalFillColor); } @@ -397,7 +397,7 @@ void ScrollPanel::Rearrange (void) mnChildrenWidth += aRequiredSize.Width(); else mnChildrenWidth += aAvailableSize.Width(); - + sal_Int32 nChildrenHeight (LayoutChildren()); maVerticalScrollBar.SetRangeMax ( nChildrenHeight + mnVerticalBorder); @@ -413,7 +413,7 @@ Size ScrollPanel::GetRequiredSize (void) { // First determine the width of the children. This is the maximum of // the current window width and the individual minimum widths of the - // children. + // children. int nChildrenWidth (GetSizePixel().Width()); unsigned int nCount = mpControlContainer->GetControlCount(); unsigned int nIndex; @@ -428,7 +428,7 @@ Size ScrollPanel::GetRequiredSize (void) // Determine the accumulated width of all children when scaled to the // minimum width. nChildrenWidth -= 2*mnHorizontalBorder; - Size aTotalSize (nChildrenWidth, + Size aTotalSize (nChildrenWidth, 2*mnVerticalBorder + (nCount-1) * mnVerticalGap); for (nIndex=0; nIndex<nCount; nIndex++) { @@ -528,7 +528,7 @@ Size ScrollPanel::SetupScrollBars (const Size& rRequiredSize) if (GetMinimumWidth() + aScrollBarSize.Width() > aWindowSize.Width()) bShowHorizontal = true; } - + // Setup the scroll bars. aRemainingSize.Width() = SetupVerticalScrollBar (bShowVertical, rRequiredSize.Height()); @@ -585,7 +585,7 @@ sal_Int32 ScrollPanel::SetupVerticalScrollBar (bool bShow, sal_Int32 nRange) long nMinPos = maVerticalScrollBar.GetRangeMin(); if (maVerticalScrollBar.GetThumbPos() < nMinPos) maVerticalScrollBar.SetThumbPos(nMinPos); - long nMaxPos = maVerticalScrollBar.GetRangeMax() + long nMaxPos = maVerticalScrollBar.GetRangeMax() - maVerticalScrollBar.GetVisibleSize(); if (maVerticalScrollBar.GetThumbPos() >= nMaxPos) maVerticalScrollBar.SetThumbPos(nMaxPos); @@ -638,7 +638,7 @@ sal_Int32 ScrollPanel::SetupHorizontalScrollBar (bool bShow, sal_Int32 nRange) long nMinPos = maHorizontalScrollBar.GetRangeMin(); if (maHorizontalScrollBar.GetThumbPos() < nMinPos) maHorizontalScrollBar.SetThumbPos(nMinPos); - long nMaxPos = maHorizontalScrollBar.GetRangeMax() + long nMaxPos = maHorizontalScrollBar.GetRangeMax() - maHorizontalScrollBar.GetVisibleSize(); if (maHorizontalScrollBar.GetThumbPos() >= nMaxPos) maHorizontalScrollBar.SetThumbPos(nMaxPos); @@ -731,7 +731,7 @@ void ScrollPanel::MakeRectangleVisible ( aRectangle.Move( -maScrollOffset.X() + aRelativeBox.Left(), -maScrollOffset.Y() + aRelativeBox.Top()); - + const int nVisibleHeight (maVerticalScrollBar.GetVisibleSize()); const int nVisibleTop (maVerticalScrollBar.GetThumbPos()); if (aRectangle.Bottom() >= nVisibleTop+nVisibleHeight) @@ -764,12 +764,12 @@ IMPL_LINK(ScrollPanel,WindowEventListener,VclSimpleEvent*,pEvent) Rectangle aBox (pControl->GetItemRect(pControl->GetSelectItemId())); aBox.Top()-=4; aBox.Bottom()+=4; - + MakeRectangleVisible(aBox, pControl); } } break; - + case VCLEVENT_WINDOW_MOUSEBUTTONDOWN: { // Make the item under the mouse visible. We need this case @@ -790,13 +790,13 @@ IMPL_LINK(ScrollPanel,WindowEventListener,VclSimpleEvent*,pEvent) Rectangle aBox (pControl->GetItemRect(pControl->GetItemId(aPosition))); aBox.Top()-=4; aBox.Bottom()+=4; - + MakeRectangleVisible(aBox, pControl); } } } break; - + case VCLEVENT_WINDOW_GETFOCUS: { @@ -814,7 +814,7 @@ IMPL_LINK(ScrollPanel,WindowEventListener,VclSimpleEvent*,pEvent) } } break; - + case VCLEVENT_WINDOW_SHOW: case VCLEVENT_WINDOW_HIDE: case VCLEVENT_WINDOW_ACTIVATE: diff --git a/sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx b/sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx index a032b6ef02f0..78301f8d82b9 100755 --- a/sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx +++ b/sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ public: virtual void Paint (const Rectangle& rBoundingBox) { mpDisplay->Paint(rBoundingBox); ::Window::Paint(rBoundingBox); } virtual void Resize (void) { mpDisplay->Resize(); ::Window::Resize(); } - + private: ::sd::toolpanel::SlideSorterCacheDisplay* mpDisplay; }; @@ -177,7 +177,7 @@ void SlideSorterCacheDisplay::Resize (void) ++nC; } double nAspect2 = double(nC) / double(nR); - + mnRowCount = nR; mnColumnCount = nC; mnHorizontalGap = 2; @@ -206,10 +206,10 @@ SlideSorterCacheDisplay* SlideSorterCacheDisplay::Instance (const SdDrawDocument { pDisplay = new SlideSorterCacheDisplay(pDocument); } - + return pDisplay; } - + diff --git a/sd/source/ui/toolpanel/SubToolPanel.cxx b/sd/source/ui/toolpanel/SubToolPanel.cxx index 73783b0f0a41..2dd496106e24 100755 --- a/sd/source/ui/toolpanel/SubToolPanel.cxx +++ b/sd/source/ui/toolpanel/SubToolPanel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -133,7 +133,7 @@ void SubToolPanel::Paint (const Rectangle& rRect) Size aSize (GetOutputSizePixel()); // Paint left and right vertical border. Rectangle aVerticalArea ( - Point(0,0), + Point(0,0), Size(mnHorizontalBorder,aSize.Height())); DrawRect (aVerticalArea); aVerticalArea.Right() += mnHorizontalBorder + mnChildrenWidth - 1; @@ -155,7 +155,7 @@ void SubToolPanel::Paint (const Rectangle& rRect) break; DrawRect (aStripeArea); } - + SetLineColor (aOriginalLineColor); SetFillColor (aOriginalFillColor); } @@ -262,7 +262,7 @@ void SubToolPanel::Rearrange (void) aRequiredSize.Width() = aAvailableSize.Width(); mnChildrenWidth = -2*mnHorizontalBorder; mnChildrenWidth += aAvailableSize.Width(); - + LayoutChildren(); mbIsRearrangePending = false; @@ -276,7 +276,7 @@ Size SubToolPanel::GetRequiredSize (void) { // First determine the width of the children. This is the maximum of // the current window width and the individual minimum widths of the - // children. + // children. int nChildrenWidth (GetSizePixel().Width()); unsigned int nCount = mpControlContainer->GetControlCount(); unsigned int nIndex; @@ -291,7 +291,7 @@ Size SubToolPanel::GetRequiredSize (void) // Determine the accumulated width of all children when scaled to the // minimum width. nChildrenWidth -= 2*mnHorizontalBorder; - Size aTotalSize (nChildrenWidth, + Size aTotalSize (nChildrenWidth, 2*mnVerticalBorder + (nCount-1) * mnVerticalGap); for (nIndex=0; nIndex<nCount; nIndex++) { diff --git a/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx b/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx index 4ad610df7f7f..c85d2a0f7df3 100755 --- a/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx +++ b/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx index 48882d0f2f9e..cf9e9bfd2a2c 100644 --- a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx +++ b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace { class WindowHash { public: - size_t operator()(const ::Window* argument) const + size_t operator()(const ::Window* argument) const { return reinterpret_cast<unsigned long>(argument); } }; @@ -176,7 +176,7 @@ void FocusManager::RemoveLinks ( Clear(); return; } - + ::std::pair<LinkMap::iterator,LinkMap::iterator> aCandidates; LinkMap::iterator iCandidate; bool bLoop (mpLinks->size() > 0); @@ -226,7 +226,7 @@ void FocusManager::RemoveLinks (::Window* pWindow) // Make sure that we are not called back for the window. pWindow->RemoveEventListener (LINK (this, FocusManager, WindowEventListener)); - + // Remove the links from the given window. ::std::pair<LinkMap::iterator,LinkMap::iterator> aCandidates(mpLinks->equal_range(pWindow)); mpLinks->erase(aCandidates.first, aCandidates.second); @@ -257,7 +257,7 @@ void FocusManager::RemoveLinks (::Window* pWindow) void FocusManager::RemoveUnusedEventListener (::Window* pWindow) { OSL_ASSERT(pWindow!=NULL); - + if (pWindow == NULL) return; diff --git a/sd/source/ui/toolpanel/TaskPaneFocusManager.hxx b/sd/source/ui/toolpanel/TaskPaneFocusManager.hxx index b9b28154dc5b..3111b2fe1102 100644 --- a/sd/source/ui/toolpanel/TaskPaneFocusManager.hxx +++ b/sd/source/ui/toolpanel/TaskPaneFocusManager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,7 +106,7 @@ private: static FocusManager* spInstance; class LinkMap; ::std::auto_ptr<LinkMap> mpLinks; - + FocusManager (void); ~FocusManager (void); @@ -114,7 +114,7 @@ private: listeners. */ void Clear (void); - + /** Remove all links from or to the given window. */ void RemoveLinks (::Window* pWindow); diff --git a/sd/source/ui/toolpanel/TaskPaneShellManager.cxx b/sd/source/ui/toolpanel/TaskPaneShellManager.cxx index 0a9667dd2431..eb49ca4d4477 100755 --- a/sd/source/ui/toolpanel/TaskPaneShellManager.cxx +++ b/sd/source/ui/toolpanel/TaskPaneShellManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/toolpanel/TaskPaneShellManager.hxx b/sd/source/ui/toolpanel/TaskPaneShellManager.hxx index 92e7b6b83b8d..10862070d50b 100755 --- a/sd/source/ui/toolpanel/TaskPaneShellManager.hxx +++ b/sd/source/ui/toolpanel/TaskPaneShellManager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ public: ShellId nId, ::Window* pParentWindow, FrameView* pFrameView = NULL); - + virtual void ReleaseShell (SfxShell* pShell); /** Add a sub shell to the set of sub shells managed by the @@ -86,7 +86,7 @@ public: NULL when this shell is requested. */ void RemoveSubShell (const SfxShell* pShell); - /** removes the shell given by its ID from the set of sub shells managed by the + /** removes the shell given by its ID from the set of sub shells managed by the TaskPaneShellManager. Subsequent calls to CreateShell() will return NULL when this shell is requested. */ diff --git a/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx b/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx index 8c69e12c504d..32ec30de1275 100755 --- a/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx +++ b/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -250,7 +250,7 @@ TaskPaneShellManager* TreeNode::GetShellManager (void) void TreeNode::AddStateChangeListener (const Link& rListener) { if (::std::find ( - maStateChangeListeners.begin(), + maStateChangeListeners.begin(), maStateChangeListeners.end(), rListener) == maStateChangeListeners.end()) { diff --git a/sd/source/ui/toolpanel/TestMenu.cxx b/sd/source/ui/toolpanel/TestMenu.cxx index a8f0b6df7893..81d36ae82c7d 100755 --- a/sd/source/ui/toolpanel/TestMenu.cxx +++ b/sd/source/ui/toolpanel/TestMenu.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,15 +59,15 @@ ColorMenu::ColorMenu (::Window* i_pParent) maSet (this), mnPreferredColumnCount(2) { - WinBits aStyle = - WB_ITEMBORDER - | WB_DOUBLEBORDER - | WB_NAMEFIELD + WinBits aStyle = + WB_ITEMBORDER + | WB_DOUBLEBORDER + | WB_NAMEFIELD | WB_FLATVALUESET | WB_TABSTOP | WB_VSCROLL; - maSet.SetStyle (maSet.GetStyle() | aStyle); + maSet.SetStyle (maSet.GetStyle() | aStyle); maSet.SetExtraSpacing(2); Fill (); @@ -117,7 +117,7 @@ sal_Int32 ColorMenu::GetPreferredWidth (sal_Int32 nHeight) int nRowCount = nHeight / aItemSize.Height(); if (nRowCount <= 0) nRowCount = 1; - int nColumnCount = (maSet.GetItemCount() + nRowCount-1) + int nColumnCount = (maSet.GetItemCount() + nRowCount-1) / nRowCount; nPreferredWidth = nColumnCount * aItemSize.Width(); } @@ -143,7 +143,7 @@ sal_Int32 ColorMenu::GetPreferredHeight (sal_Int32 nWidth) nColumnCount = 1; else if (nColumnCount > 4) nColumnCount = 4; - int nRowCount = (maSet.GetItemCount() + nColumnCount-1) + int nRowCount = (maSet.GetItemCount() + nColumnCount-1) / nColumnCount; nPreferredHeight = nRowCount * aItemSize.Height(); } @@ -194,7 +194,7 @@ void ColorMenu::Resize (void) nColumnCount = 4; USHORT nRowCount = (USHORT)CalculateRowCount (aItemSize, nColumnCount); - + maSet.SetColCount ((USHORT)nColumnCount); maSet.SetLineCount (nRowCount); } diff --git a/sd/source/ui/toolpanel/TestMenu.hxx b/sd/source/ui/toolpanel/TestMenu.hxx index 0c4b3bfe6530..1670e9531620 100755 --- a/sd/source/ui/toolpanel/TestMenu.hxx +++ b/sd/source/ui/toolpanel/TestMenu.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/toolpanel/TestPanel.cxx b/sd/source/ui/toolpanel/TestPanel.cxx index 044b40dcdb4f..2fa8b4354ac3 100755 --- a/sd/source/ui/toolpanel/TestPanel.cxx +++ b/sd/source/ui/toolpanel/TestPanel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,8 +58,8 @@ class Wrapper { public: Wrapper ( - TreeNode* pParent, - Size aPreferredSize, + TreeNode* pParent, + Size aPreferredSize, ::Window* pWrappedControl, bool bIsResizable) : TreeNode (pParent), @@ -69,7 +69,7 @@ public: { mpWrappedControl->Show(); } - virtual ~Wrapper (void) + virtual ~Wrapper (void) { delete mpWrappedControl; } diff --git a/sd/source/ui/toolpanel/TestPanel.hxx b/sd/source/ui/toolpanel/TestPanel.hxx index 494e5086b179..135e2827bed3 100755 --- a/sd/source/ui/toolpanel/TestPanel.hxx +++ b/sd/source/ui/toolpanel/TestPanel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx index de49b7a6abb5..8ab7b89ae200 100755 --- a/sd/source/ui/toolpanel/TitleBar.cxx +++ b/sd/source/ui/toolpanel/TitleBar.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ namespace sd { namespace toolpanel { const int TitleBar::snIndentationWidth = 16; - + TitleBar::TitleBar ( ::Window* pParent, const String& rsTitle, TitleBarType eType, bool bIsExpandable) : ::Window (pParent, WB_TABSTOP) , TreeNode(this) @@ -286,7 +286,7 @@ void TitleBar::PaintSubPanelHeadLineBar (void) Rectangle aTextBox (CalculateTextBoundingBox (nWidth, true)); Rectangle aTitleBarBox (CalculateTitleBarBox(aTextBox, nWidth)); - int nVerticalOffset = -aTitleBarBox.Top(); + int nVerticalOffset = -aTitleBarBox.Top(); aTitleBarBox.Top() += nVerticalOffset; aTitleBarBox.Bottom() += nVerticalOffset; aTextBox.Top() += nVerticalOffset; @@ -352,7 +352,7 @@ Rectangle TitleBar::PaintExpansionIndicator (const Rectangle& rTextBox) if (meType == TBT_SUB_CONTROL_HEADLINE) aPosition.X() += 3; mpDevice->DrawImage (aPosition, aImage); - + aExpansionIndicatorArea = Rectangle ( aPosition, aImage.GetSizePixel()); } @@ -376,9 +376,9 @@ USHORT TitleBar::GetTextStyle (void) { if(IsEnabled()) { - return TEXT_DRAW_LEFT + return TEXT_DRAW_LEFT | TEXT_DRAW_TOP - | TEXT_DRAW_MULTILINE + | TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK; } else @@ -451,7 +451,7 @@ Rectangle TitleBar::CalculateTextBoundingBox ( Rectangle aTextBox ( Point(0,0), - Size (nAvailableWidth, + Size (nAvailableWidth, GetSettings().GetStyleSettings().GetTitleHeight())); aTextBox.Top() += (aTextBox.GetHeight() - GetTextHeight()) / 2; if (HasExpansionIndicator()) @@ -530,7 +530,7 @@ void TitleBar::DataChanged (const DataChangedEvent& rEvent) mpDevice.reset(new VirtualDevice (*this)); // fall through. - + case DATACHANGED_FONTS: case DATACHANGED_FONTSUBSTITUTION: { @@ -541,7 +541,7 @@ void TitleBar::DataChanged (const DataChangedEvent& rEvent) if (IsControlFont()) aFont.Merge(GetControlFont()); SetZoomedPointFont(aFont); - + // Color. Color aColor; if (IsControlForeground()) diff --git a/sd/source/ui/toolpanel/TitledControl.cxx b/sd/source/ui/toolpanel/TitledControl.cxx index e83e6c47c10a..891ade2ddecd 100755 --- a/sd/source/ui/toolpanel/TitledControl.cxx +++ b/sd/source/ui/toolpanel/TitledControl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,12 +38,12 @@ #include <vcl/svapp.hxx> -namespace sd { namespace toolpanel { +namespace sd { namespace toolpanel { TitledControl::TitledControl ( TreeNode* pParent, - ::std::auto_ptr<TreeNode> pControl, + ::std::auto_ptr<TreeNode> pControl, const String& rTitle, const ClickHandler& rClickHandler, TitleBar::TitleBarType eType) @@ -137,7 +137,7 @@ sal_Int32 TitledControl::GetPreferredHeight (sal_Int32 nWidth) bool TitledControl::IsResizable (void) { - return IsExpanded() + return IsExpanded() && GetControl()->IsResizable(); } @@ -156,7 +156,7 @@ void TitledControl::Resize (void) { Size aWindowSize (GetOutputSizePixel()); - int nTitleBarHeight + int nTitleBarHeight = GetTitleBar()->GetPreferredHeight(aWindowSize.Width()); GetTitleBar()->GetWindow()->SetPosSizePixel ( Point (0,0), @@ -164,7 +164,7 @@ void TitledControl::Resize (void) TreeNode* pControl = GetControl(); - if (pControl != NULL + if (pControl != NULL && pControl->GetWindow() != NULL && pControl->GetWindow()->IsVisible()) { @@ -257,7 +257,7 @@ bool TitledControl::Expand (bool bExpanded) if (bExpansionStateChanged) UpdateStates(); } - + return bExpansionStateChanged; } @@ -287,7 +287,7 @@ bool TitledControl::IsExpanded (void) const return false; } -void TitledControl::SetEnabledState(bool bFlag) +void TitledControl::SetEnabledState(bool bFlag) { if (!bFlag) { @@ -296,13 +296,13 @@ void TitledControl::SetEnabledState(bool bFlag) ControlContainer::ES_COLLAPSE); Disable(); } - else + else { -/* +/* GetParentNode()->GetControlContainer().SetExpansionState ( this, ControlContainer::ES_EXPAND); -*/ +*/ Enable(); } @@ -351,7 +351,7 @@ void TitledControl::UpdateStates (void) -IMPL_LINK(TitledControl, WindowEventListener, +IMPL_LINK(TitledControl, WindowEventListener, VclSimpleEvent*, pEvent) { if (pEvent!=NULL && pEvent->ISA(VclWindowEvent)) diff --git a/sd/source/ui/toolpanel/ToolPanel.cxx b/sd/source/ui/toolpanel/ToolPanel.cxx index 6dbcae52547a..2438ed521267 100755 --- a/sd/source/ui/toolpanel/ToolPanel.cxx +++ b/sd/source/ui/toolpanel/ToolPanel.cxx @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ namespace sd { namespace toolpanel ToolPanelGuard aGuard( *this ); return Reference< XWindow >( m_pControl->GetWindow()->GetComponentInterface(), UNO_QUERY_THROW ); } - + //------------------------------------------------------------------------------------------------------------------ Reference< XAccessible > SAL_CALL ToolPanel::createAccessible( const Reference< XAccessible >& i_rParentAccessible ) throw (RuntimeException) { diff --git a/sd/source/ui/toolpanel/ToolPanel.hxx b/sd/source/ui/toolpanel/ToolPanel.hxx index 2fe4a64c71be..f40873a4161a 100644 --- a/sd/source/ui/toolpanel/ToolPanel.hxx +++ b/sd/source/ui/toolpanel/ToolPanel.hxx @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/toolpanel/ToolPanelDescriptor.hxx b/sd/source/ui/toolpanel/ToolPanelDescriptor.hxx index 4ac31ef53e23..0210246d7ac1 100644 --- a/sd/source/ui/toolpanel/ToolPanelDescriptor.hxx +++ b/sd/source/ui/toolpanel/ToolPanelDescriptor.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ public: /** Create a new descriptor for the given control. @param pControl */ - ToolPanelDescriptor (::std::auto_ptr< ::Window> pControl, + ToolPanelDescriptor (::std::auto_ptr< ::Window> pControl, const String& rTitle); ~ToolPanelDescriptor (void); @@ -71,7 +71,7 @@ public: int GetTotalHeight (void) const; int GetWindowHeight (void) const; - + private: ::std::auto_ptr< ::Window> mpControl; String msTitle; diff --git a/sd/source/ui/toolpanel/ToolPanelFactory.cxx b/sd/source/ui/toolpanel/ToolPanelFactory.cxx index db4602c991d0..767dece4464e 100644 --- a/sd/source/ui/toolpanel/ToolPanelFactory.cxx +++ b/sd/source/ui/toolpanel/ToolPanelFactory.cxx @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/toolpanel/ToolPanelUIElement.cxx b/sd/source/ui/toolpanel/ToolPanelUIElement.cxx index e81f683bcfa7..b9b8081330d1 100644 --- a/sd/source/ui/toolpanel/ToolPanelUIElement.cxx +++ b/sd/source/ui/toolpanel/ToolPanelUIElement.cxx @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,21 +93,21 @@ namespace sd { namespace toolpanel UIElementMethodGuard aGuard( *this ); return m_xFrame; } - + //------------------------------------------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL ToolPanelUIElement::getResourceURL() throw (RuntimeException) { UIElementMethodGuard aGuard( *this ); return m_sResourceURL; } - + //------------------------------------------------------------------------------------------------------------------ ::sal_Int16 SAL_CALL ToolPanelUIElement::getType() throw (RuntimeException) { UIElementMethodGuard aGuard( *this ); return UIElementType::TOOLPANEL; } - + //------------------------------------------------------------------------------------------------------------------ Reference< XInterface > SAL_CALL ToolPanelUIElement::getRealInterface( ) throw (RuntimeException) { diff --git a/sd/source/ui/toolpanel/ToolPanelUIElement.hxx b/sd/source/ui/toolpanel/ToolPanelUIElement.hxx index 0a74b7bd449e..4b0baf02cc52 100644 --- a/sd/source/ui/toolpanel/ToolPanelUIElement.hxx +++ b/sd/source/ui/toolpanel/ToolPanelUIElement.hxx @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index c62faf29ca50..4e7e55eeaa19 100755 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -239,7 +239,7 @@ public: If the panel is not active currently, nothing happens. */ void DeactivatePanelByResource( const ::rtl::OUString& i_rPanelResourceURL ); - + /** provides access to the the VCL window of the panel deck */ ::sfx2::ModuleTaskPane& GetTaskPane() { return *m_pTaskPane; } @@ -512,12 +512,20 @@ ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* pFrame, ViewShellBase& rVi SetName( String( RTL_CONSTASCII_USTRINGPARAM( "ToolPanelViewShell" ) ) ); + // Some recent changes to the toolpanel make it necessary to create the + // accessibility object now. Creating it on demand would lead to a + // pointer cycle in the tree of accessibility objects and would lead + // e.g. the accerciser AT tool into an infinite loop. + // It would be nice to get rid of this workaround in the future. + if (mpContentWindow.get()) + mpContentWindow->SetAccessible(mpImpl->CreateAccessible(*mpContentWindow)); + // For accessibility we have to shortly hide the content window. This // triggers the construction of a new accessibility object for the new // view shell. (One is created earlier while the construtor of the base // class is executed. At that time the correct accessibility object can // not be constructed.) - if ( mpContentWindow.get() ) + if (mpContentWindow.get()) { mpContentWindow->Hide(); mpContentWindow->Show(); @@ -587,13 +595,13 @@ void ToolPanelViewShell::KeyInput( const KeyEvent& i_rKeyEvent ) } // --------------------------------------------------------------------------------------------------------------------- -SdPage* ToolPanelViewShell::GetActualPage() +SdPage* ToolPanelViewShell::GetActualPage() { return NULL; } // --------------------------------------------------------------------------------------------------------------------- -SdPage* ToolPanelViewShell::getCurrentPage() const +SdPage* ToolPanelViewShell::getCurrentPage() const { return NULL; } @@ -633,7 +641,12 @@ DockingWindow* ToolPanelViewShell::GetDockingWindow() Reference< XAccessible > ToolPanelViewShell::CreateAccessibleDocumentView( ::sd::Window* i_pWindow ) { ENSURE_OR_RETURN( i_pWindow, "ToolPanelViewShell::CreateAccessibleDocumentView: illegal window!", NULL ); - return mpImpl->CreateAccessible( *i_pWindow ); + // As said above, we have to create the accessibility object + // (unconditionally) in the constructor, not here on demand, or + // otherwise we would create a cycle in the tree of accessible objects + // which could lead to infinite loops in AT tools. + // return mpImpl->CreateAccessible( *i_pWindow ); + return Reference<XAccessible>(); } // --------------------------------------------------------------------------------------------------------------------- diff --git a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx index 86abd44e3a83..a43812e3ca6f 100644 --- a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -133,7 +133,7 @@ void AllMasterPagesSelector::NotifyContainerChangeEvent ( AddItem(rEvent.maChildToken); MasterPagesSelector::Fill(); break; - + case MasterPageContainerChangeEvent::INDEX_CHANGED: case MasterPageContainerChangeEvent::INDEXES_CHANGED: mpSortedMasterPages->clear(); diff --git a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx index e937958dbbf0..10ed29853b8b 100644 --- a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx +++ b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ class AllMasterPagesSelector { public: AllMasterPagesSelector ( - TreeNode* pParent, + TreeNode* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, DrawViewShell& rViewShell, diff --git a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx index 730fc74795f2..01531d4f250a 100755 --- a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx +++ b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx index dd3388fb0342..1b947de166d5 100755 --- a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx +++ b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx index 7f4149d7e6fd..57b2984528d1 100644 --- a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,7 +92,7 @@ CurrentMasterPagesSelector::~CurrentMasterPagesSelector (void) { OSL_ASSERT(mrDocument.GetDocSh() != NULL); } - + Link aLink (LINK(this,CurrentMasterPagesSelector,EventMultiplexerListener)); mrBase.GetEventMultiplexer()->RemoveEventListener(aLink); } @@ -236,7 +236,7 @@ void CurrentMasterPagesSelector::Execute (SfxRequest& rRequest) } } break; - + default: MasterPagesSelector::Execute(rRequest); break; @@ -305,7 +305,7 @@ IMPL_LINK(CurrentMasterPagesSelector,EventMultiplexerListener, break; } } - + return 0; } diff --git a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.hxx index ee3503d9787d..ca3676957410 100644 --- a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.hxx +++ b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ class CurrentMasterPagesSelector { public: CurrentMasterPagesSelector ( - TreeNode* pParent, + TreeNode* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer); @@ -69,7 +69,7 @@ protected: virtual ResId GetContextMenuResId (void) const; virtual void Execute (SfxRequest& rRequest); virtual void GetState (SfxItemSet& rItemSet); - + private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> mxListener; diff --git a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx index e7edf109cffd..e20f1934cfee 100755 --- a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx +++ b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,11 +37,11 @@ #include "sdresid.hxx" namespace sd -{ - +{ + class ViewShellBase; extern ::Window * createCustomAnimationPanel( ::Window* pParent, ViewShellBase& rBase ); - + namespace toolpanel { namespace controls { diff --git a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx index 864ba637b94d..f4eeca4caa99 100755 --- a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx +++ b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ class CustomAnimationPanel { public: CustomAnimationPanel ( - Window& i_rParentWindow, + Window& i_rParentWindow, ToolPanelViewShell& i_rPanelViewShell); virtual ~CustomAnimationPanel (void); diff --git a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx index b9040e72283f..7267c97220cf 100755 --- a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx +++ b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -117,7 +117,7 @@ SdPage* DocumentHelper::CopyMasterPageToLocalDocument ( } if (bPageExists) break; - + // Create a new slide (and its notes page.) uno::Reference<drawing::XDrawPagesSupplier> xSlideSupplier ( rTargetDocument.getUnoModel(), uno::UNO_QUERY); @@ -142,7 +142,7 @@ SdPage* DocumentHelper::CopyMasterPageToLocalDocument ( pNewMasterPage = AddMasterPage(rTargetDocument, pMasterPage); if (pNewMasterPage==NULL) break; - SdPage* pNewNotesMasterPage + SdPage* pNewNotesMasterPage = AddMasterPage(rTargetDocument, pNotesMasterPage); if (pNewNotesMasterPage==NULL) break; @@ -239,7 +239,7 @@ SdPage* DocumentHelper::AddMasterPage ( // Copy the precious flag. pClonedMasterPage->SetPrecious(pMasterPage->IsPrecious()); - + // Now that the styles are available we can insert the cloned // master page. rTargetDocument.InsertMasterPage (pClonedMasterPage); @@ -283,8 +283,8 @@ void DocumentHelper::ProvideStyles ( static_cast<SdStyleSheetPool*>(rTargetDocument.GetStyleSheetPool()); SdStyleSheetVector aCreatedStyles; pTargetStyleSheetPool->CopyLayoutSheets ( - sLayoutName, - *pSourceStyleSheetPool, + sLayoutName, + *pSourceStyleSheetPool, aCreatedStyles); // Add an undo action for the copied style sheets. @@ -295,8 +295,8 @@ void DocumentHelper::ProvideStyles ( { SdMoveStyleSheetsUndoAction* pMovStyles = new SdMoveStyleSheetsUndoAction ( - &rTargetDocument, - aCreatedStyles, + &rTargetDocument, + aCreatedStyles, TRUE); pUndoManager->AddUndoAction (pMovStyles); } @@ -350,8 +350,8 @@ void DocumentHelper::AssignMasterPageToPageList ( break; // Assign the master pages to the given list of pages. - for (iPage=aCleanedList.begin(); - iPage!=aCleanedList.end(); + for (iPage=aCleanedList.begin(); + iPage!=aCleanedList.end(); ++iPage) { AssignMasterPageToPage ( @@ -383,7 +383,7 @@ SdPage* DocumentHelper::AddMasterPage ( // Copy the precious flag. pClonedMasterPage->SetPrecious(pMasterPage->IsPrecious()); - + // Copy the necessary styles. SdDrawDocument* pSourceDocument = static_cast<SdDrawDocument*>(pMasterPage->GetModel()); @@ -439,7 +439,7 @@ void DocumentHelper::AssignMasterPageToPage ( SdDrawDocument* pDocument = dynamic_cast<SdDrawDocument*>(pPage->GetModel()); if (pDocument == NULL) return; - + if ( ! pPage->IsMasterPage()) { // 1. Remove the background object (so that that, if it exists, does @@ -450,7 +450,7 @@ void DocumentHelper::AssignMasterPageToPage ( *pDocument, *pPage, pPage->getSdrPageProperties().GetItemSet()), TRUE); pPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE)); - + pDocument->SetMasterPage ( (pPage->GetPageNum()-1)/2, rsBaseLayoutName, @@ -513,7 +513,7 @@ SdPage* DocumentHelper::ProvideMasterPage ( { // When the given master page or its associated notes master page do // not already belong to the document we have to create copies of - // them and insert them into the document. + // them and insert them into the document. // Determine the position where the new master pages are inserted. // By default they are inserted at the end. When we assign to a @@ -535,7 +535,7 @@ SdPage* DocumentHelper::ProvideMasterPage ( pMasterPageInDocument = pMasterPage; if (pNotesMasterPage->GetModel() != &rTargetDocument) { - SdPage* pClonedNotesMasterPage + SdPage* pClonedNotesMasterPage = AddMasterPage (rTargetDocument, pNotesMasterPage, nInsertionIndex+1); if( rTargetDocument.IsUndoEnabled() ) rTargetDocument.AddUndo( diff --git a/sd/source/ui/toolpanel/controls/DocumentHelper.hxx b/sd/source/ui/toolpanel/controls/DocumentHelper.hxx index 2ff1c8aa575a..9329c2fef6f8 100644 --- a/sd/source/ui/toolpanel/controls/DocumentHelper.hxx +++ b/sd/source/ui/toolpanel/controls/DocumentHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,7 +89,7 @@ private: SdDrawDocument& rTargetDocument, SdPage* pMasterPage, const ::boost::shared_ptr<std::vector<SdPage*> >& rpPageList); - + /** Assign the given master page to the given page. @param pMasterPage In contrast to AssignMasterPageToPageList() this page is assumed diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx index 80a094ec1a66..0f0d0b67b4ff 100755 --- a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -151,7 +151,7 @@ private: determine the correct size ratio. */ bool mbFirstPageObjectSeen; - + // The widths for the previews contain two pixels for the border that is // painted arround the preview. static const int SMALL_PREVIEW_WIDTH = 72 + 2; @@ -209,7 +209,7 @@ static const MasterPageContainer::Token NIL_TOKEN (-1); MasterPageContainer::Implementation::Instance (void) { ::boost::shared_ptr<MasterPageContainer::Implementation> pInstance; - + if (Implementation::mpInstance.expired()) { ::osl::GetGlobalMutex aMutexFunctor; @@ -702,7 +702,7 @@ void MasterPageContainer::Implementation::UpdatePreviewSizePixel (void) // The default aspect ratio is 4:3 int nWidth (4); int nHeight (3); - + // Search for the first entry with an existing master page. MasterPageContainerType::const_iterator iDescriptor; MasterPageContainerType::const_iterator iContainerEnd(maContainer.end()); @@ -790,7 +790,7 @@ MasterPageContainer::Token MasterPageContainer::Implementation::PutMasterPage ( { if (mbContainerCleaningPending) CleanContainer(); - + aResult = maContainer.size(); rpDescriptor->SetToken(aResult); @@ -807,10 +807,10 @@ MasterPageContainer::Token MasterPageContainer::Implementation::PutMasterPage ( default: break; } - + maContainer.push_back(rpDescriptor); aEntry = maContainer.end()-1; - + FireContainerChange(MasterPageContainerChangeEvent::CHILD_ADDED,aResult); } } @@ -825,7 +825,7 @@ MasterPageContainer::Token MasterPageContainer::Implementation::PutMasterPage ( // One or more aspects of the descriptor have changed. Send // appropriate events to the listeners. UpdateDescriptor(*aEntry,false,false, true); - + std::vector<MasterPageContainerChangeEvent::EventType>::const_iterator iEventType; for (iEventType=pEventTypes->begin(); iEventType!=pEventTypes->end(); ++iEventType) { @@ -902,7 +902,7 @@ Image MasterPageContainer::Implementation::GetPreviewForToken ( PreviewState ePreviewState (GetPreviewState(aToken)); SharedMasterPageDescriptor pDescriptor = GetDescriptor(aToken); - + // When the preview is missing but inexpensively creatable then do that // now. if (pDescriptor.get()!=NULL) @@ -941,7 +941,7 @@ Image MasterPageContainer::Implementation::GetPreviewForToken ( break; } } - + return aPreview; } @@ -1002,7 +1002,7 @@ Reference<frame::XModel> MasterPageContainer::Implementation::GetModel (void) RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")); uno::Reference<frame::XComponentLoader> xDesktop ( ::comphelper::getProcessServiceFactory()->createInstance( - sDesktopServiceName), + sDesktopServiceName), uno::UNO_QUERY); // Create a new model. @@ -1068,7 +1068,7 @@ Image MasterPageContainer::Implementation::GetPreviewSubstitution ( const ::osl::MutexGuard aGuard (maMutex); Image aPreview; - + switch (nId) { case STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION: diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx index 60f760f63e34..b4d2ca4cfde6 100755 --- a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,12 +59,12 @@ class MasterPageDescriptor; master pages. Each MasterPageContainer, however, has its own PreviewSize value and thus can independantly switch between large and small previews. - + The container maintains its own document to store master page objects. - + For each master page container stores its URL, preview bitmap, page name, and, if available, the page object. - + Entries are accessed via a Token, which is mostly a numerical index but whose values do not neccessarily have to be consecutive. */ @@ -109,7 +109,7 @@ public: bool RequestPreview (Token aToken); /** Each entry of the container is either the first page of a template - document or is a master page of an Impress document. + document or is a master page of an Impress document. */ enum Origin { MASTERPAGE, // Master page of a document. @@ -136,8 +136,8 @@ public: /** Determine whether the container has a member for the given token. */ bool HasToken (Token aToken) const; - - /** Return a token for an index in the range + + /** Return a token for an index in the range 0 <= index < GetTokenCount(). */ Token GetTokenForIndex (int nIndex); @@ -153,7 +153,7 @@ public: Origin GetOriginForToken (Token aToken); sal_Int32 GetTemplateIndexForToken (Token aToken); ::boost::shared_ptr<MasterPageDescriptor> GetDescriptorForToken (Token aToken); - + void InvalidatePreview (Token aToken); /** Return a preview for the specified token. When the preview is not diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx index 23663b4822ef..f83e1a6372fe 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,11 +86,11 @@ void MasterPageContainerFiller::RunNextStep (void) case SCAN_TEMPLATE: meState = ScanTemplate(); break; - + case ADD_TEMPLATE: meState = AddTemplate(); break; - + case DONE: case ERROR: default: @@ -124,7 +124,7 @@ bool MasterPageContainerFiller::HasNextStep (void) case DONE: case ERROR: return false; - + default: return true; } diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.hxx index c8ba61fef378..3c15fe6ea757 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerFiller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,10 +57,10 @@ public: */ virtual void FillingDone (void) = 0; }; - + MasterPageContainerFiller (ContainerAdapter& rContainerAdapter); virtual ~MasterPageContainerFiller (void); - + /** Run the next step of the task. After HasNextStep() returns false this method should ignore further calls. */ @@ -85,7 +85,7 @@ private: ::std::auto_ptr<TemplateScanner> mpScannerTask; const TemplateEntry* mpLastAddedEntry; int mnIndex; - + State ScanTemplate (void); State AddTemplate (void); }; diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx index 61483f278a4f..53941ae398f2 100755 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ Image PagePreviewProvider::operator () ( ::sd::PreviewRenderer& rRenderer) { Image aPreview; - + if (pPage != NULL) { // Use the given renderer to create a preview of the given page @@ -116,9 +116,9 @@ Image TemplatePreviewProvider::operator() ( { // Unused parameters. (void)nWidth; - (void)pPage; + (void)pPage; (void)rRenderer; - + // Load the thumbnail from a template document. uno::Reference<io::XInputStream> xIStream; @@ -129,11 +129,11 @@ Image TemplatePreviewProvider::operator() ( try { uno::Reference<lang::XSingleServiceFactory> xStorageFactory( - xServiceManager->createInstance( + xServiceManager->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.embed.StorageFactory")), uno::UNO_QUERY); - + if (xStorageFactory.is()) { uno::Sequence<uno::Any> aArgs (2); @@ -267,9 +267,9 @@ SdPage* TemplatePageObjectProvider::operator() (SdDrawDocument* pContainerDocume { // Unused parameters. (void)pContainerDocument; - + SdPage* pPage = NULL; - + mxDocumentShell = NULL; ::sd::DrawDocShell* pDocumentShell = NULL; try @@ -400,7 +400,7 @@ ExistingPageProvider::ExistingPageProvider (SdPage* pPage) SdPage* ExistingPageProvider::operator() (SdDrawDocument* pDocument) { (void)pDocument; // Unused parameter. - + return mpPage; } diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx index 071b23cdbb16..a561fbf9bbf0 100755 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx index 35b02497575e..32f7f3edbffb 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -145,7 +145,7 @@ bool MasterPageContainerQueue::RequestPreview (const SharedMasterPageDescriptor& && rpDescriptor->maLargePreview.GetSizePixel().Width() == 0) { sal_Int32 nPriority (CalculatePriority(rpDescriptor)); - + // Add a new or replace an existing request. RequestQueue::iterator iRequest (::std::find_if( mpRequestQueue->begin(), @@ -196,7 +196,7 @@ sal_Int32 MasterPageContainerQueue::CalculatePriority ( // Add a term that introduces an order based on the appearance in the // AllMasterPagesSelector. nPriority -= rpDescriptor->maToken / 3; - + // Process requests for the CurrentMasterPagesSelector first. if (rpDescriptor->meOrigin == MasterPageContainer::MASTERPAGE) nPriority += snMasterPagePriorityBoost; @@ -244,7 +244,7 @@ IMPL_LINK(MasterPageContainerQueue, DelayedPreviewCreation, Timer*, pTimer) } mpRequestQueue->erase(mpRequestQueue->begin()); - + if (aRequest.mpDescriptor.get() != NULL) { mnRequestsServedCount += 1; @@ -257,7 +257,7 @@ IMPL_LINK(MasterPageContainerQueue, DelayedPreviewCreation, Timer*, pTimer) } } while (false); - + if (mpRequestQueue->size() > 0 && ! bWaitForMoreRequests) { int nTimeout (snDelayedCreationTimeout); diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.hxx index 3e8d31e67c1b..76a075dc324a 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ public: templates are inserted into the MasterPageContainer. */ void ProcessAllRequests (void); - + private: ::boost::weak_ptr<ContainerAdapter> mpWeakContainer; class PreviewCreationRequest; @@ -93,7 +93,7 @@ private: // There are a couple of values that define various aspects of the // heuristic that defines the order and timing in which requests for // preview creation are processed. - + /** The time to wait (in milliseconds) between the creation of previews. */ static const sal_Int32 snDelayedCreationTimeout; @@ -101,7 +101,7 @@ private: /** The time to wait when the system is not idle. */ static const sal_Int32 snDelayedCreationTimeoutWhenNotIdle; - + /** Requests for previews of master pages in a document have their priority increased by this value. */ @@ -119,7 +119,7 @@ private: present. */ static sal_uInt32 snWaitForMoreRequestsCount; - + MasterPageContainerQueue (const ::boost::weak_ptr<ContainerAdapter>& rpContainer); void LateInit (void); @@ -127,7 +127,7 @@ private: are processed. */ sal_Int32 CalculatePriority (const SharedMasterPageDescriptor& rDescriptor) const; - + DECL_LINK(DelayedPreviewCreation, Timer *); }; diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx index 6871883d65f5..bbdbc09287cf 100755 --- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ MasterPageDescriptor::MasterPageDescriptor ( mnUseCount(0) { } - + @@ -131,31 +131,31 @@ Image MasterPageDescriptor::GetPreview (MasterPageContainer::PreviewSize eSize) meOrigin = rDescriptor.meOrigin; bIndexChanged = true; } - + if (msURL.getLength()==0 && rDescriptor.msURL.getLength()!=0) { msURL = rDescriptor.msURL; bDataChanged = true; } - + if (msPageName.getLength()==0 && rDescriptor.msPageName.getLength()!=0) { msPageName = rDescriptor.msPageName; bDataChanged = true; } - + if (msStyleName.getLength()==0 && rDescriptor.msStyleName.getLength()!=0) { msStyleName = rDescriptor.msStyleName; bDataChanged = true; } - + if (mpPageObjectProvider.get()==NULL && rDescriptor.mpPageObjectProvider.get()!=NULL) { mpPageObjectProvider = rDescriptor.mpPageObjectProvider; bDataChanged = true; } - + if (mpPreviewProvider.get()==NULL && rDescriptor.mpPreviewProvider.get()!=NULL) { mpPreviewProvider = rDescriptor.mpPreviewProvider; @@ -180,7 +180,7 @@ Image MasterPageDescriptor::GetPreview (MasterPageContainer::PreviewSize eSize) if (bPreviewChanged) pResult->push_back(MasterPageContainerChangeEvent::PREVIEW_CHANGED); } - + return pResult; } @@ -192,14 +192,14 @@ bool MasterPageDescriptor::UpdatePageObject ( SdDrawDocument* pDocument) { bool bModified (false); - + // Update the page object when that is not yet known. if (mpMasterPage == NULL && mpPageObjectProvider.get()!=NULL && (nCostThreshold<0 || mpPageObjectProvider->GetCostIndex()<=nCostThreshold)) { // Note that pDocument may be NULL. - + SdPage* pPage = (*mpPageObjectProvider)(pDocument); if (meOrigin == MasterPageContainer::MASTERPAGE) { @@ -249,7 +249,7 @@ bool MasterPageDescriptor::UpdatePreview ( ::sd::PreviewRenderer& rRenderer) { bool bModified (false); - + // Update the preview when that is not yet known. if (maLargePreview.GetSizePixel().Width()==0 && mpPreviewProvider.get()!=NULL @@ -309,7 +309,7 @@ MasterPageDescriptor::URLClassification MasterPageDescriptor::GetURLClassificati meURLClassification = URLCLASS_USER; } } - + return meURLClassification; } @@ -361,7 +361,7 @@ bool MasterPageDescriptor::StyleNameComparator::operator() ( //===== PageObjectComparator ================================================== -MasterPageDescriptor::PageObjectComparator::PageObjectComparator (const SdPage* pPageObject) +MasterPageDescriptor::PageObjectComparator::PageObjectComparator (const SdPage* pPageObject) : mpMasterPage(pPageObject) { } diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx index 0303989e3379..2a31bab48ae2 100755 --- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ public: ::std::auto_ptr<std::vector<MasterPageContainerChangeEvent::EventType> > Update ( const MasterPageDescriptor& rDescriptor); - + /** This convenience method returns either a small or a large preview, depending on the given size specifier. Note that the previews are not created when they are not present. @@ -81,18 +81,18 @@ public: /** Use the PreviewProvider to get access to a preview of the master page. - + Note that this is only done, when either bForce is <TRUE/> or the PreviewProvider::GetCostIndex() returns 0. - + The small preview is created by scaling the large one, not by calling PreviewProvider::operator() a second time. - + It is the responsibility of the caller to call UpdatePageObject() before calling this method when the PreviewProvider can only work when the master page object is present, i.e. its NeedsPageObject() method returns <TRUE/>. - + @param nCostThreshold When this is zero or positive then the preview is created only when the preview provider has a cost equal to or smaller than @@ -115,7 +115,7 @@ public: ::sd::PreviewRenderer& rRenderer); /** Use the PageObjectProvider to get access to the master page object. - + Note that this is only done, when either bForce is <TRUE/> or the PreviewProvider::GetCostIndex() returns 0. @@ -145,7 +145,7 @@ public: }; URLClassification GetURLClassification (void); - + /** The Token under which the MasterPageContainer gives access to the object. */ @@ -154,16 +154,16 @@ public: /** A rough specification of the origin of the master page. */ MasterPageContainer::Origin meOrigin; - + /** The URL is not empty for master pages loaded from a template document. */ ::rtl::OUString msURL; - + /** Taken from the title of the template file. */ ::rtl::OUString msPageName; - + /** Taken from the master page object. */ ::rtl::OUString msStyleName; @@ -173,17 +173,17 @@ public: /** The actual master page. */ SdPage* mpMasterPage; - + /** A slide that uses the master page. */ SdPage* mpSlide; - + /** A small (the default size) preview of the master page. May be empty. When this smaller preview is not empty then the larger one is not empty, too. */ Image maSmallPreview; - + /** A large preview of the master page. May be empty. When this larger preview is not empty then the smaller one is not empty, too. */ @@ -198,7 +198,7 @@ public: the lifetime of a MasterPageDescriptor object. */ ::boost::shared_ptr<PageObjectProvider> mpPageObjectProvider; - + /** This index represents the order in which templates are provided via the TemplateScanner. It defines the order in which the entries in the AllMasterPagesSelector are displayed. The default value is -1. diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx index 2ba0cc678403..a25a1dde9e4a 100755 --- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ public: document. */ void UnregisterDocument (SdDrawDocument& rDocument); - + /** Add a listener that is informed of master pages that are newly assigned to slides or become unassigned. @param rEventListener @@ -89,7 +89,7 @@ private: ::std::vector<Link> maListeners; struct DrawDocHash { - size_t operator()(SdDrawDocument* argument) const + size_t operator()(SdDrawDocument* argument) const { return reinterpret_cast<unsigned long>(argument); } }; typedef ::std::hash_map<SdDrawDocument*, @@ -132,7 +132,7 @@ MasterPageObserver& MasterPageObserver::Instance (void) { OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); } - + DBG_ASSERT(Implementation::mpInstance!=NULL, "MasterPageObserver::Instance(): instance is NULL"); return *Implementation::mpInstance; @@ -156,7 +156,7 @@ void MasterPageObserver::UnregisterDocument (SdDrawDocument& rDocument) - + void MasterPageObserver::AddEventListener (const Link& rEventListener) { @@ -222,7 +222,7 @@ void MasterPageObserver::Implementation::UnregisterDocument ( - + void MasterPageObserver::Implementation::AddEventListener ( const Link& rEventListener) { @@ -232,7 +232,7 @@ void MasterPageObserver::Implementation::AddEventListener ( rEventListener) == maListeners.end()) { maListeners.push_back (rEventListener); - + // Tell the new listener about all the master pages that are // currently in use. typedef ::std::vector<String> StringList; @@ -274,7 +274,7 @@ void MasterPageObserver::Implementation::RemoveEventListener ( -MasterPageObserver::MasterPageNameSet +MasterPageObserver::MasterPageNameSet MasterPageObserver::Implementation::GetMasterPageNames ( SdDrawDocument& rDocument) { @@ -354,8 +354,8 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages ( ::std::set<String>::iterator J; int i=0; - for (J=aOldMasterPagesDescriptor->second.begin(); - J!=aOldMasterPagesDescriptor->second.end(); + for (J=aOldMasterPagesDescriptor->second.begin(); + J!=aOldMasterPagesDescriptor->second.end(); ++J) OSL_TRACE("old used master page %d is %s", i++, @@ -376,8 +376,8 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages ( RTL_TEXTENCODING_UTF8).getStr()); MasterPageObserverEvent aEvent ( - MasterPageObserverEvent::ET_MASTER_PAGE_ADDED, - rDocument, + MasterPageObserverEvent::ET_MASTER_PAGE_ADDED, + rDocument, *I); SendEvent (aEvent); } @@ -397,7 +397,7 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages ( MasterPageObserverEvent aEvent ( MasterPageObserverEvent::ET_MASTER_PAGE_REMOVED, - rDocument, + rDocument, *I); SendEvent (aEvent); } diff --git a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx index 8dab51e93a58..90600ebcec75 100755 --- a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,12 +63,12 @@ void MasterPagesPanel::impl_construct( ViewShellBase& rBase ) TitledControl* pTitledControl; ::boost::shared_ptr<MasterPageContainer> pContainer (new MasterPageContainer()); - + // Create a panel with the master pages that are in use by the currently // edited document. DrawViewShell* pDrawViewShell = dynamic_cast<DrawViewShell*>(rBase.GetMainViewShell().get()); pSelector.reset(new controls::CurrentMasterPagesSelector ( - this, + this, *pDocument, rBase, pContainer)); @@ -82,10 +82,10 @@ void MasterPagesPanel::impl_construct( ViewShellBase& rBase ) ::std::auto_ptr<TreeNode>(pSelector.release()), SdResId(STR_TASKPANEL_CURRENT_MASTER_PAGES_TITLE), HID_SD_CURRENT_MASTERS); - + // Create a panel with the most recently used master pages. pSelector.reset(new controls::RecentMasterPagesSelector ( - this, + this, *pDocument, rBase, pContainer)); @@ -102,7 +102,7 @@ void MasterPagesPanel::impl_construct( ViewShellBase& rBase ) // Create a panel with all available master pages. pSelector.reset(new controls::AllMasterPagesSelector ( - this, + this, *pDocument, rBase, *pDrawViewShell, diff --git a/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx b/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx index 932007802ebf..691cf0ac2bd5 100755 --- a/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ class MasterPagesPanel { public: MasterPagesPanel ( - ::Window& i_rParentWindow, + ::Window& i_rParentWindow, ToolPanelViewShell& i_rPanelViewShell); virtual ~MasterPagesPanel (void); diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx index b321dbf8dd14..057d4c924f5f 100755 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,7 +85,7 @@ using namespace ::com::sun::star::text; namespace sd { namespace toolpanel { namespace controls { -SFX_IMPL_INTERFACE(MasterPagesSelector, SfxShell, +SFX_IMPL_INTERFACE(MasterPagesSelector, SfxShell, SdResId(STR_MASTERPAGESSELECTOR)) { SFX_POPUPMENU_REGISTRATION( SdResId(RID_TASKPANE_MASTERPAGESSELECTOR_POPUP) ); @@ -190,7 +190,7 @@ Size MasterPagesSelector::GetPreferredSize (void) void MasterPagesSelector::UpdateLocks (const ItemList& rItemList) { ItemList aNewLockList; - + // In here we first lock the master pages in the given list and then // release the locks acquired in a previous call to this method. When // this were done the other way round the lock count of some master @@ -220,7 +220,7 @@ void MasterPagesSelector::UpdateLocks (const ItemList& rItemList) void MasterPagesSelector::Fill (void) { ::std::auto_ptr<ItemList> pItemList (new ItemList()); - + Fill(*pItemList); UpdateLocks(*pItemList); @@ -306,7 +306,7 @@ IMPL_LINK(MasterPagesSelector, ContextMenuCallback, CommandEvent*, pEvent) mpPageSet.get(), &aPosition); } - + return 0; } @@ -550,7 +550,7 @@ void MasterPagesSelector::Execute (SfxRequest& rRequest) break; case SID_TP_USE_FOR_NEW_PRESENTATIONS: - DBG_ASSERT (false, + DBG_ASSERT (false, "Using slides as default for new presentations" " is not yet implemented"); break; @@ -657,7 +657,7 @@ void MasterPagesSelector::SetItem ( mpPageSet->RemoveItem(nIndex); } } - + } @@ -721,7 +721,7 @@ void MasterPagesSelector::InvalidatePreview (const SdPage* pPage) void MasterPagesSelector::UpdateAllPreviews (void) { const ::osl::MutexGuard aGuard (maMutex); - + for (USHORT nIndex=1; nIndex<=mpPageSet->GetItemCount(); nIndex++) { UserData* pData = GetUserData(nIndex); @@ -827,13 +827,13 @@ void MasterPagesSelector::UpdateItemList (::std::auto_ptr<ItemList> pNewItemList SetItem(nIndex,*iNewItem); } } - + // Append new items. for ( ; iNewItem!=iNewEnd; ++iNewItem,++nIndex) { SetItem(nIndex,*iNewItem); } - + // Remove trailing items. for ( ; iCurrentItem!=iCurrentEnd; ++iCurrentItem,++nIndex) { @@ -841,7 +841,7 @@ void MasterPagesSelector::UpdateItemList (::std::auto_ptr<ItemList> pNewItemList } maCurrentItemList.swap(*pNewItemList); - + mpPageSet->Rearrange(); if (GetParentNode() != NULL) GetParentNode()->RequestResize(); diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx index a2df51f2bd4b..0ca1207c36b4 100755 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ class SdDrawDocument; class SdPage; class SfxModule; -namespace sd { +namespace sd { class DrawViewShell; class TemplateEntry; class TemplateDir; @@ -149,7 +149,7 @@ protected: sal_uInt16 mnDefaultClickAction; /** Pages with pointers in this queue have their previews updated eventually. Filled by InvalidatePreview() and operated upon by - UpdatePreviews(). + UpdatePreviews(). */ ::std::queue<USHORT> maPreviewUpdateQueue; @@ -218,7 +218,7 @@ private: DECL_LINK(RightClickHandler, MouseEvent*); DECL_LINK(ContextMenuCallback, CommandEvent*); DECL_LINK(ContainerChangeListener, MasterPageContainerChangeEvent*); - + void SetItem ( USHORT nIndex, MasterPageContainer::Token aToken); diff --git a/sd/source/ui/toolpanel/controls/PreviewValueSet.cxx b/sd/source/ui/toolpanel/controls/PreviewValueSet.cxx index a1f29dfee044..f1b4ba8d196b 100644 --- a/sd/source/ui/toolpanel/controls/PreviewValueSet.cxx +++ b/sd/source/ui/toolpanel/controls/PreviewValueSet.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,13 +44,13 @@ PreviewValueSet::PreviewValueSet (TreeNode* pParent) mnMaxColumnCount(-1) { SetStyle ( - GetStyle() + GetStyle() & ~(WB_ITEMBORDER)// | WB_MENUSTYLEVALUESET) // | WB_FLATVALUESET); ); SetColCount(2); - // SetLineCount(1); + // SetLineCount(1); SetExtraSpacing (2); } @@ -129,7 +129,7 @@ void PreviewValueSet::Command (const CommandEvent& rEvent) maContextMenuCallback.Call(&aNonConstEventCopy); } break; - + default: ValueSet::Command(rEvent); break; @@ -216,7 +216,7 @@ sal_Int32 PreviewValueSet::GetPreferredWidth (sal_Int32 nHeight) { int nColumnCount = (GetItemCount()+nRowCount-1) / nRowCount; if (nColumnCount > 0) - nPreferredWidth = (maPreviewSize.Width() + 2*mnBorderWidth) + nPreferredWidth = (maPreviewSize.Width() + 2*mnBorderWidth) * nColumnCount; } @@ -230,7 +230,7 @@ sal_Int32 PreviewValueSet::GetPreferredHeight (sal_Int32 nWidth) { int nRowCount (CalculateRowCount(CalculateColumnCount(nWidth))); int nItemHeight (maPreviewSize.Height()); - + return nRowCount * (nItemHeight + 2*mnBorderHeight); } diff --git a/sd/source/ui/toolpanel/controls/PreviewValueSet.hxx b/sd/source/ui/toolpanel/controls/PreviewValueSet.hxx index 69fa7e272330..b2cb6903e002 100644 --- a/sd/source/ui/toolpanel/controls/PreviewValueSet.hxx +++ b/sd/source/ui/toolpanel/controls/PreviewValueSet.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ public: void SetRightMouseClickHandler (const Link& rLink); virtual void Paint (const Rectangle& rRect); virtual void Resize (void); - + /** When a request for the display of a context menu is made to this method then that request is forwarded via the ContextMenuCallback. This way the owning class can handle the context menu without having @@ -86,7 +86,7 @@ private: const int mnBorderWidth; const int mnBorderHeight; const int mnMaxColumnCount; - + USHORT CalculateColumnCount (int nWidth) const; USHORT CalculateRowCount (USHORT nColumnCount) const; }; diff --git a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx index 2f2789216b8d..1a252baaf31a 100644 --- a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -113,7 +113,7 @@ void RecentMasterPagesSelector::Fill (ItemList& rItemList) if (aToken != MasterPageContainer::NIL_TOKEN) { String sStyleName (mpContainer->GetStyleNameForToken(aToken)); - if (sStyleName.Len()==0 + if (sStyleName.Len()==0 || aCurrentNames.find(sStyleName) == aCurrentNames.end()) { rItemList.push_back(aToken); @@ -130,7 +130,7 @@ void RecentMasterPagesSelector::AssignMasterPageToPageList ( const ::boost::shared_ptr<std::vector<SdPage*> >& rpPageList) { USHORT nSelectedItemId = mpPageSet->GetSelectItemId(); - + MasterPagesSelector::AssignMasterPageToPageList(pMasterPage, rpPageList); // Restore the selection. diff --git a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx index adac66187b71..5bc85209dc15 100644 --- a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx +++ b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ class RecentMasterPagesSelector { public: RecentMasterPagesSelector ( - TreeNode* pParent, + TreeNode* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer); diff --git a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx index 63d7f72e2903..a7e40021435a 100644 --- a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx +++ b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -140,7 +140,7 @@ RecentlyUsedMasterPages& RecentlyUsedMasterPages::Instance (void) else { OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); } - + return *mpInstance; } @@ -162,7 +162,7 @@ RecentlyUsedMasterPages::~RecentlyUsedMasterPages (void) { Link aLink (LINK(this,RecentlyUsedMasterPages,MasterPageContainerChangeListener)); mpContainer->RemoveChangeListener(aLink); - + MasterPageObserver::Instance().RemoveEventListener( LINK(this,RecentlyUsedMasterPages,MasterPageChangeListener)); } @@ -174,7 +174,7 @@ void RecentlyUsedMasterPages::LateInit (void) { Link aLink (LINK(this,RecentlyUsedMasterPages,MasterPageContainerChangeListener)); mpContainer->AddChangeListener(aLink); - + LoadPersistentValues (); MasterPageObserver::Instance().AddEventListener( LINK(this,RecentlyUsedMasterPages,MasterPageChangeListener)); diff --git a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx index 1f16d31b95d5..a786a8513ffc 100644 --- a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx +++ b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ public: void AddEventListener (const Link& rEventListener); void RemoveEventListener (const Link& rEventListener); - + int GetMasterPageCount (void) const; MasterPageContainer::Token GetTokenForIndex (sal_uInt32 nIndex) const; @@ -76,7 +76,7 @@ private: ::std::auto_ptr<MasterPageList> mpMasterPages; unsigned long int mnMaxListSize; ::boost::shared_ptr<MasterPageContainer> mpContainer; - + RecentlyUsedMasterPages (void); virtual ~RecentlyUsedMasterPages (void); diff --git a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx index 4ad67b876983..7a58923b43b2 100755 --- a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx +++ b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx index f62cb918806b..e2135c7da546 100755 --- a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx +++ b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx b/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx index d6507a25c11f..f199429c244e 100755 --- a/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx +++ b/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,11 +37,11 @@ #include "sdresid.hxx" namespace sd -{ - +{ + class ViewShellBase; extern ::Window * createTableDesignPanel( ::Window* pParent, ViewShellBase& rBase ); - + namespace toolpanel { namespace controls { diff --git a/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx b/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx index a3620df2ef68..eef21450db3b 100755 --- a/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx +++ b/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ class TableDesignPanel { public: TableDesignPanel ( - ::Window& i_rParentWindow, + ::Window& i_rParentWindow, ToolPanelViewShell& i_rPanelViewShell); virtual ~TableDesignPanel (void); diff --git a/sd/source/ui/tools/AsynchronousCall.cxx b/sd/source/ui/tools/AsynchronousCall.cxx index 3527b74fbeda..8cb9f0aad9d2 100644 --- a/sd/source/ui/tools/AsynchronousCall.cxx +++ b/sd/source/ui/tools/AsynchronousCall.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx index bf4fbc6e6ebe..ce245066b2df 100755 --- a/sd/source/ui/tools/ConfigurationAccess.cxx +++ b/sd/source/ui/tools/ConfigurationAccess.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,17 +89,17 @@ void ConfigurationAccess::Initialize ( Sequence<Any> aCreationArguments(3); aCreationArguments[0] = makeAny(beans::PropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), - 0, - makeAny(rsRootName), + 0, + makeAny(rsRootName), beans::PropertyState_DIRECT_VALUE)); aCreationArguments[1] = makeAny(beans::PropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("depth")), - 0, + 0, makeAny((sal_Int32)-1), beans::PropertyState_DIRECT_VALUE)); aCreationArguments[2] = makeAny(beans::PropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("lazywrite")), - 0, + 0, makeAny(true), beans::PropertyState_DIRECT_VALUE)); OUString sAccessService; @@ -109,7 +109,7 @@ void ConfigurationAccess::Initialize ( else sAccessService = OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationUpdateAccess")); - + mxRoot = rxProvider->createInstanceWithArguments( sAccessService, aCreationArguments); @@ -154,7 +154,7 @@ Any ConfigurationAccess::GetConfigurationNode ( ::rtl::OUStringToOString(sPathToNode, RTL_TEXTENCODING_UTF8).getStr(), ::rtl::OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); } - + return Any(); } diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index 81678d1af7c0..989587d401d0 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ static const sal_Int32 ConfigurationUpdateEvent = 2; namespace sd { namespace tools { -typedef cppu::WeakComponentImplHelper4< +typedef cppu::WeakComponentImplHelper4< ::com::sun::star::beans::XPropertyChangeListener, ::com::sun::star::frame::XFrameActionListener, ::com::sun::star::view::XSelectionChangeListener, @@ -80,11 +80,11 @@ public: ~Implementation (void); void AddEventListener ( - Link& rCallback, + Link& rCallback, EventMultiplexerEvent::EventId aEventTypes); void RemoveEventListener ( - Link& rCallback, + Link& rCallback, EventMultiplexerEvent::EventId aEventTypes); void CallListeners (EventMultiplexerEvent& rEvent); @@ -92,19 +92,19 @@ public: ViewShellBase& GetViewShellBase() const { return mrBase; } //===== lang::XEventListener ============================================== - virtual void SAL_CALL + virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) throw (::com::sun::star::uno::RuntimeException); //===== beans::XPropertySetListener ======================================= - virtual void SAL_CALL + virtual void SAL_CALL propertyChange ( const com::sun::star::beans::PropertyChangeEvent& rEvent) throw (::com::sun::star::uno::RuntimeException); //===== view::XSelectionChangeListener ==================================== - virtual void SAL_CALL + virtual void SAL_CALL selectionChanged ( const com::sun::star::lang::EventObject& rEvent) throw (::com::sun::star::uno::RuntimeException); @@ -114,12 +114,12 @@ public: frame it is listening to. This usually happens when the view shell in the center pane is replaced by another view shell. */ - virtual void SAL_CALL + virtual void SAL_CALL frameAction (const ::com::sun::star::frame::FrameActionEvent& rEvent) throw (::com::sun::star::uno::RuntimeException); //===== drawing::framework::XConfigurationChangeListener ================== - virtual void SAL_CALL + virtual void SAL_CALL notifyConfigurationChange ( const ::com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) throw (::com::sun::star::uno::RuntimeException); @@ -217,7 +217,7 @@ EventMultiplexer::~EventMultiplexer (void) void EventMultiplexer::AddEventListener ( - Link& rCallback, + Link& rCallback, EventMultiplexerEvent::EventId aEventTypes) { mpImpl->AddEventListener (rCallback, aEventTypes); @@ -241,7 +241,7 @@ void EventMultiplexer::MultiplexEvent( void* pUserData ) { EventMultiplexerEvent aEvent (mpImpl->GetViewShellBase(), eEventId, pUserData); - mpImpl->CallListeners(aEvent); + mpImpl->CallListeners(aEvent); } @@ -366,7 +366,7 @@ void EventMultiplexer::Implementation::ReleaseListeners (void) void EventMultiplexer::Implementation::AddEventListener ( - Link& rCallback, + Link& rCallback, EventMultiplexerEvent::EventId aEventTypes) { ListenerList::iterator iListener (maListeners.begin()); @@ -436,7 +436,7 @@ void EventMultiplexer::Implementation::ConnectToController (void) mbListeningToController = true; } - // Listen to changes of certain properties. + // Listen to changes of certain properties. Reference<beans::XPropertySet> xSet (xController, UNO_QUERY); if (xSet.is()) { @@ -448,7 +448,7 @@ void EventMultiplexer::Implementation::ConnectToController (void) { OSL_TRACE("EventMultiplexer::ConnectToController: CurrentPage unknown"); } - + try { xSet->addPropertyChangeListener(msEditModePropertyName, this); @@ -458,7 +458,7 @@ void EventMultiplexer::Implementation::ConnectToController (void) OSL_TRACE("EventMultiplexer::ConnectToController: IsMasterPageMode unknown"); } } - + // Listen for selection change events. Reference<view::XSelectionSupplier> xSelection (xController, UNO_QUERY); if (xSelection.is()) @@ -505,7 +505,7 @@ void EventMultiplexer::Implementation::DisconnectFromController (void) OSL_TRACE ("DisconnectFromController: IsMasterPageMode unknown"); } } - + // Remove selection change listener. Reference<view::XSelectionSupplier> xSelection (xController, UNO_QUERY); if (xSelection.is()) @@ -600,7 +600,7 @@ void SAL_CALL EventMultiplexer::Implementation::frameAction ( ConnectToController(); CallListeners (EventMultiplexerEvent::EID_CONTROLLER_ATTACHED); break; - + case frame::FrameAction_COMPONENT_ATTACHED: ConnectToController(); CallListeners (EventMultiplexerEvent::EID_CONTROLLER_ATTACHED); @@ -662,7 +662,7 @@ void SAL_CALL EventMultiplexer::Implementation::notifyConfigurationChange ( } } break; - + case ResourceDeactivationEvent: if (rEvent.ResourceId->getResourceURL().match(FrameworkHelper::msViewURLPrefix)) { @@ -695,7 +695,7 @@ void SAL_CALL EventMultiplexer::Implementation::notifyConfigurationChange ( CallListeners (EventMultiplexerEvent::EID_CONFIGURATION_UPDATED); break; } - + } diff --git a/sd/source/ui/tools/IconCache.cxx b/sd/source/ui/tools/IconCache.cxx index 12e7b6b52e95..aad643e19381 100644 --- a/sd/source/ui/tools/IconCache.cxx +++ b/sd/source/ui/tools/IconCache.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ Image IconCache::Implementation::GetIcon (USHORT nResourceId) //===== IconCache ============================================================= -//static +//static IconCache& IconCache::Instance (void) { if (Implementation::mpInstance == NULL) @@ -101,7 +101,7 @@ IconCache& IconCache::Instance (void) OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); } - DBG_ASSERT(Implementation::mpInstance!=NULL, + DBG_ASSERT(Implementation::mpInstance!=NULL, "IconCache::Instance(): instance is NULL"); return *Implementation::mpInstance; } diff --git a/sd/source/ui/tools/IdleDetection.cxx b/sd/source/ui/tools/IdleDetection.cxx index 46ac4174cbe7..9690627d6a49 100644 --- a/sd/source/ui/tools/IdleDetection.cxx +++ b/sd/source/ui/tools/IdleDetection.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ sal_Int32 IdleDetection::CheckInputPending (void) sal_Int32 IdleDetection::CheckSlideShowRunning (void) { sal_Int32 eResult (IDET_IDLE); - + bool bIsSlideShowShowing = false; // Iterate over all view frames. diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index c416e689efcf..be65e3056a9f 100755 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,7 +82,7 @@ PreviewRenderer::~PreviewRenderer (void) Image PreviewRenderer::RenderPage ( - const SdPage* pPage, + const SdPage* pPage, const sal_Int32 nWidth, const String& rSubstitutionText, const bool bObeyHighContrastMode) @@ -105,7 +105,7 @@ Image PreviewRenderer::RenderPage ( Image PreviewRenderer::RenderPage ( - const SdPage* pPage, + const SdPage* pPage, Size aPixelSize, const String& rSubstitutionText, const bool bObeyHighContrastMode) @@ -121,7 +121,7 @@ Image PreviewRenderer::RenderPage ( PaintPage (pPage); PaintSubstitutionText (rSubstitutionText); PaintFrame(); - + Size aSize (mpPreviewDevice->GetOutputSizePixel()); aPreview = mpPreviewDevice->GetBitmap ( mpPreviewDevice->PixelToLogic(Point(0,0)), @@ -156,8 +156,8 @@ Image PreviewRenderer::RenderSubstitution ( // Adjust contrast mode. bool bUseContrast = Application::GetSettings().GetStyleSettings(). GetHighContrastMode(); - mpPreviewDevice->SetDrawMode (bUseContrast - ? ViewShell::OUTPUT_DRAWMODE_CONTRAST + mpPreviewDevice->SetDrawMode (bUseContrast + ? ViewShell::OUTPUT_DRAWMODE_CONTRAST : ViewShell::OUTPUT_DRAWMODE_COLOR); // Set a map mode makes a typical substitution text completely @@ -171,7 +171,7 @@ Image PreviewRenderer::RenderSubstitution ( aMapMode.SetOrigin(mpPreviewDevice->PixelToLogic( Point(nFrameWidth,nFrameWidth),aMapMode)); mpPreviewDevice->SetMapMode (aMapMode); - + // Clear the background. Rectangle aPaintRectangle ( Point(0,0), @@ -186,7 +186,7 @@ Image PreviewRenderer::RenderSubstitution ( // Paint substitution text and a frame around it. PaintSubstitutionText (rSubstitutionText); PaintFrame(); - + Size aSize (mpPreviewDevice->GetOutputSizePixel()); aPreview = mpPreviewDevice->GetBitmap ( mpPreviewDevice->PixelToLogic(Point(0,0)), @@ -220,7 +220,7 @@ bool PreviewRenderer::Initialize ( SetupOutputSize(*pPage, rPixelSize); - SdDrawDocument* pDocument + SdDrawDocument* pDocument = static_cast<SdDrawDocument*>(pPage->GetModel()); DrawDocShell* pDocShell = pDocument->GetDocSh(); @@ -232,8 +232,8 @@ bool PreviewRenderer::Initialize ( // Adjust contrast mode. bool bUseContrast (bObeyHighContrastMode && Application::GetSettings().GetStyleSettings().GetHighContrastMode()); - mpPreviewDevice->SetDrawMode (bUseContrast - ? ViewShell::OUTPUT_DRAWMODE_CONTRAST + mpPreviewDevice->SetDrawMode (bUseContrast + ? ViewShell::OUTPUT_DRAWMODE_CONTRAST : ViewShell::OUTPUT_DRAWMODE_COLOR); mpPreviewDevice->SetSettings(Application::GetSettings()); @@ -296,7 +296,7 @@ void PreviewRenderer::PaintPage (const SdPage* pPage) pOutliner->SetControlWord( (nOriginalControlWord & ~EE_CNTRL_ONLINESPELLING)); } - + try { mpView->CompleteRedraw (mpPreviewDevice.get(), aRegion); @@ -327,13 +327,13 @@ void PreviewRenderer::PaintSubstitutionText (const String& rSubstitutionText) // Paint the substitution text. Rectangle aTextBox ( - Point(0,0), + Point(0,0), mpPreviewDevice->PixelToLogic( mpPreviewDevice->GetOutputSizePixel())); - USHORT nTextStyle = + USHORT nTextStyle = TEXT_DRAW_CENTER | TEXT_DRAW_VCENTER - | TEXT_DRAW_MULTILINE + | TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK; mpPreviewDevice->DrawText (aTextBox, rSubstitutionText, nTextStyle); @@ -365,7 +365,7 @@ void PreviewRenderer::PaintFrame (void) void PreviewRenderer::SetupOutputSize ( - const SdPage& rPage, + const SdPage& rPage, const Size& rFramePixelSize) { // First set the map mode to some arbitrary scale that is numerically @@ -381,7 +381,7 @@ void PreviewRenderer::SetupOutputSize ( const Size aPageModelSize (rPage.GetSize()); const Size aOutputSize = mpPreviewDevice->LogicToPixel(rPage.GetSize(), aMapMode); const sal_Int32 nFrameWidth (mbHasFrame ? snFrameWidth : 0); - const double nFinalScale (nInitialScale * (rFramePixelSize.Width()-2*nFrameWidth) + const double nFinalScale (nInitialScale * (rFramePixelSize.Width()-2*nFrameWidth) / aOutputSize.Width()); aMapMode.SetScaleX (nFinalScale); aMapMode.SetScaleY (nFinalScale); @@ -434,8 +434,8 @@ Image PreviewRenderer::ScaleBitmap ( // Adjust contrast mode. bool bUseContrast = Application::GetSettings().GetStyleSettings(). GetHighContrastMode(); - mpPreviewDevice->SetDrawMode (bUseContrast - ? ViewShell::OUTPUT_DRAWMODE_CONTRAST + mpPreviewDevice->SetDrawMode (bUseContrast + ? ViewShell::OUTPUT_DRAWMODE_CONTRAST : ViewShell::OUTPUT_DRAWMODE_COLOR); // Set output size. @@ -443,7 +443,7 @@ Image PreviewRenderer::ScaleBitmap ( if (aSize.Width() <= 0) break; Size aFrameSize ( - nWidth, + nWidth, (long)((nWidth*1.0 * aSize.Height()) / aSize.Width() + 0.5)); Size aPreviewSize (aFrameSize.Width()-2,aFrameSize.Height()-2); MapMode aMapMode (mpPreviewDevice->GetMapMode()); @@ -463,7 +463,7 @@ Image PreviewRenderer::ScaleBitmap ( BitmapEx aScaledBitmap (rBitmapEx.GetBitmap()); aScaledBitmap.Scale (aPreviewSize, BMP_SCALE_INTERPOLATE); mpPreviewDevice->DrawBitmap ( - Point(1,1), + Point(1,1), aPreviewSize, aScaledBitmap.GetBitmap()); diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx index 9cf24dccd508..45a838202692 100755 --- a/sd/source/ui/tools/PropertySet.cxx +++ b/sd/source/ui/tools/PropertySet.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -212,7 +212,7 @@ void PropertySet::CallListeners ( if (iListener->second.is()) iListener->second->propertyChange(rEvent); } -} +} diff --git a/sd/source/ui/tools/SdGlobalResourceContainer.cxx b/sd/source/ui/tools/SdGlobalResourceContainer.cxx index 4ed95bbf5b99..cb5121ab883b 100755 --- a/sd/source/ui/tools/SdGlobalResourceContainer.cxx +++ b/sd/source/ui/tools/SdGlobalResourceContainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,16 +66,16 @@ private: -// static +// static SdGlobalResourceContainer& SdGlobalResourceContainer::Instance (void) { - DBG_ASSERT(Implementation::mpInstance!=NULL, + DBG_ASSERT(Implementation::mpInstance!=NULL, "SdGlobalResourceContainer::Instance(): instance has been deleted"); // Maybe we should throw an exception when the instance has been deleted. return *Implementation::mpInstance; } -SdGlobalResourceContainer* +SdGlobalResourceContainer* SdGlobalResourceContainer::Implementation::mpInstance = NULL; @@ -87,7 +87,7 @@ void SdGlobalResourceContainer::AddResource ( ::std::auto_ptr<SdGlobalResource> pResource) { ::osl::MutexGuard aGuard (mpImpl->maMutex); - + Implementation::ResourceList::iterator iResource; iResource = ::std::find ( mpImpl->maResources.begin(), @@ -114,7 +114,7 @@ void SdGlobalResourceContainer::AddResource ( ::boost::shared_ptr<SdGlobalResource> pResource) { ::osl::MutexGuard aGuard (mpImpl->maMutex); - + Implementation::SharedResourceList::iterator iResource; iResource = ::std::find ( mpImpl->maSharedResources.begin(), @@ -161,10 +161,10 @@ SdGlobalResourceContainer::SdGlobalResourceContainer (void) -SdGlobalResourceContainer::~SdGlobalResourceContainer (void) +SdGlobalResourceContainer::~SdGlobalResourceContainer (void) { ::osl::MutexGuard aGuard (mpImpl->maMutex); - + // Release the resources in reversed order of their addition to the // container. This is because a resource A added before resource B // may have been created due to a request of B. Thus B depends on A and diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx index b3175b7fdb4a..82564efdc16a 100755 --- a/sd/source/ui/tools/SlotStateListener.cxx +++ b/sd/source/ui/tools/SlotStateListener.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -148,7 +148,7 @@ util::URL SlotStateListener::MakeURL (const OUString& rSlotName) const -uno::Reference<frame::XDispatch> +uno::Reference<frame::XDispatch> SlotStateListener::GetDispatch (const util::URL& rURL) const { uno::Reference<frame::XDispatch> xDispatch; diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx index 87ff4d318132..074ed2664edd 100644 --- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx +++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -171,7 +171,7 @@ IMPL_LINK(TimerBasedTaskExecution,TimerCallback, Timer*,EMPTYARG) else mpSelf.reset(); } - + return 0; } diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 2bc98cd66de3..83a43aaa72f4 100755 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ DrawController::DrawController (ViewShellBase& rBase) throw() : DrawControllerInterfaceBase(&rBase), BroadcastHelperOwner(SfxBaseController::m_aMutex), OPropertySetHelper( static_cast<OBroadcastHelperVar< - OMultiTypeInterfaceContainerHelper, + OMultiTypeInterfaceContainerHelper, OMultiTypeInterfaceContainerHelper::keyType>& >( BroadcastHelperOwner::maBroadcastHelper)), mpBase(&rBase), @@ -113,7 +113,7 @@ void DrawController::SetSubController ( mxSubController = rxSubController; mpPropertyArrayHelper.reset(); maLastVisArea = Rectangle(); - + // Inform listeners about the changed state. FireSelectionChangeListener(); } @@ -124,7 +124,7 @@ void DrawController::SetSubController ( // XInterface IMPLEMENT_FORWARD_XINTERFACE2( - DrawController, + DrawController, DrawControllerInterfaceBase, OPropertySetHelper); @@ -172,8 +172,8 @@ void SAL_CALL DrawController::dispose (void) pViewShell->DeactivateCurrentFunction(); DrawDocShell* pDocShell = pViewShell->GetDocSh(); if ( pDocShell != NULL ) - pDocShell->SetDocShellFunction(0); - } + pDocShell->SetDocShellFunction(0); + } pViewShell.reset(); // When the controller has not been detached from its view @@ -188,7 +188,7 @@ void SAL_CALL DrawController::dispose (void) OPropertySetHelper::disposing(); DisposeFrameworkControllers(); - + SfxBaseController::dispose(); } } @@ -209,7 +209,7 @@ void SAL_CALL DrawController::addEventListener( void SAL_CALL DrawController::removeEventListener ( - const Reference<lang::XEventListener >& aListener) + const Reference<lang::XEventListener >& aListener) throw (RuntimeException) { if(!rBHelper.bDisposed && !rBHelper.bInDispose && !mbDisposing) @@ -298,7 +298,7 @@ Any SAL_CALL DrawController::getSelection() { ThrowIfDisposed(); ::vos::OGuard aGuard (Application::GetSolarMutex()); - + if (mxSubController.is()) return mxSubController->getSelection(); else @@ -322,7 +322,7 @@ void SAL_CALL DrawController::addSelectionChangeListener( void SAL_CALL DrawController::removeSelectionChangeListener( - const Reference< view::XSelectionChangeListener >& xListener ) + const Reference< view::XSelectionChangeListener >& xListener ) throw(RuntimeException) { if (rBHelper.bDisposed) @@ -402,7 +402,7 @@ Reference< drawing::XDrawPage > SAL_CALL DrawController::getCurrentPage (void) ::vos::OGuard aGuard( Application::GetSolarMutex() ); Reference<drawing::XDrawPage> xPage; - // Get current page from sub controller. + // Get current page from sub controller. if (mxSubController.is()) xPage = mxSubController->getCurrentPage(); @@ -422,17 +422,17 @@ void DrawController::FireVisAreaChanged (const Rectangle& rVisArea) throw() if( maLastVisArea != rVisArea ) { Any aNewValue; - aNewValue <<= awt::Rectangle( - rVisArea.Left(), - rVisArea.Top(), - rVisArea.GetWidth(), + aNewValue <<= awt::Rectangle( + rVisArea.Left(), + rVisArea.Top(), + rVisArea.GetWidth(), rVisArea.GetHeight() ); Any aOldValue; - aOldValue <<= awt::Rectangle( - maLastVisArea.Left(), - maLastVisArea.Top(), - maLastVisArea.GetWidth(), + aOldValue <<= awt::Rectangle( + maLastVisArea.Left(), + maLastVisArea.Top(), + maLastVisArea.GetWidth(), maLastVisArea.GetHeight() ); FirePropertyChange (PROPERTY_WORKAREA, aNewValue, aOldValue); @@ -459,7 +459,7 @@ void DrawController::FireSelectionChangeListener() throw() { try { - view::XSelectionChangeListener * pL = + view::XSelectionChangeListener * pL = static_cast<view::XSelectionChangeListener*>(aIt.next()); if (pL != NULL) pL->selectionChanged( aEvent ); @@ -633,7 +633,7 @@ sal_Int64 SAL_CALL DrawController::getSomething (const Sequence<sal_Int8>& rId) throw (RuntimeException) { sal_Int64 nResult = 0; - + if (rId.getLength() == 16 && rtl_compareMemory(getUnoTunnelId().getConstArray(), rId.getConstArray(), 16) == 0) { @@ -652,13 +652,13 @@ void DrawController::FillPropertyTable ( ::std::vector<beans::Property>& rProperties) { rProperties.push_back( - beans::Property( + beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("VisibleArea") ), PROPERTY_WORKAREA, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY)); rProperties.push_back( - beans::Property( + beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("SubController") ), PROPERTY_SUB_CONTROLLER, ::getCppuType((const Reference<drawing::XDrawSubController>*)0), @@ -722,7 +722,7 @@ IPropertyArrayHelper & DrawController::getInfoHelper() aPropertySequence[i] = aProperties[i]; mpPropertyArrayHelper.reset(new OPropertyArrayHelper(aPropertySequence, sal_False)); } - + return *mpPropertyArrayHelper.get(); } @@ -795,9 +795,9 @@ uno::Reference< awt::XControl > SAL_CALL DrawController::getControl( const uno:: sal_Bool DrawController::convertFastPropertyValue ( - Any & rConvertedValue, - Any & rOldValue, - sal_Int32 nHandle, + Any & rConvertedValue, + Any & rOldValue, + sal_Int32 nHandle, const Any& rValue) throw ( com::sun::star::lang::IllegalArgumentException) { @@ -829,7 +829,7 @@ sal_Bool DrawController::convertFastPropertyValue ( void DrawController::setFastPropertyValue_NoBroadcast ( - sal_Int32 nHandle, + sal_Int32 nHandle, const Any& rValue) throw ( com::sun::star::uno::Exception) { @@ -844,7 +844,7 @@ void DrawController::setFastPropertyValue_NoBroadcast ( void DrawController::getFastPropertyValue ( - Any & rRet, + Any & rRet, sal_Int32 nHandle ) const { OGuard aGuard( Application::GetSolarMutex() ); @@ -852,10 +852,10 @@ void DrawController::getFastPropertyValue ( switch( nHandle ) { case PROPERTY_WORKAREA: - rRet <<= awt::Rectangle( - maLastVisArea.Left(), - maLastVisArea.Top(), - maLastVisArea.GetWidth(), + rRet <<= awt::Rectangle( + maLastVisArea.Left(), + maLastVisArea.Top(), + maLastVisArea.GetWidth(), maLastVisArea.GetHeight()); break; diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index 8594d4e0ebf9..d2a719974397 100755 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ SdUnoDrawView::SdUnoDrawView( DrawController& rController, DrawViewShell& rViewShell, View& rView) throw() - : DrawSubControllerInterfaceBase(m_aMutex), + : DrawSubControllerInterfaceBase(m_aMutex), mrController(rController), mrDrawViewShell(rViewShell), mrView(rView) @@ -140,7 +140,7 @@ Reference<drawing::XLayer> SdUnoDrawView::getActiveLayer (void) throw () SdDrawDocument* pSdModel = pModel->GetDoc(); if (pSdModel == NULL) break; - + // From the model get the current SdrLayer object via the layer admin. SdrLayerAdmin& rLayerAdmin = pSdModel->GetLayerAdmin (); SdrLayer* pLayer = rLayerAdmin.GetLayer (mrView.GetActiveLayer(), TRUE); @@ -216,7 +216,7 @@ sal_Bool SAL_CALL SdUnoDrawView::select( const Any& aSelection ) { bOk = false; } - } + } else { Reference< drawing::XShapes > xShapes; @@ -310,18 +310,18 @@ Any SAL_CALL SdUnoDrawView::getSelection() SdrMark *pMark = rMarkList.GetMark(nNum); if(pMark==NULL) continue; - + SdrObject *pObj = pMark->GetMarkedSdrObj(); if(pObj==NULL || pObj->GetPage() == NULL) continue; Reference< drawing::XDrawPage > xPage( pObj->GetPage()->getUnoPage(), UNO_QUERY); - + if(!xPage.is()) continue; SvxDrawPage* pDrawPage = SvxDrawPage::getImplementation( xPage ); - + if(pDrawPage==NULL) continue; @@ -346,7 +346,7 @@ void SAL_CALL SdUnoDrawView::addSelectionChangeListener ( { (void)rxListener; } - + @@ -361,7 +361,7 @@ void SAL_CALL SdUnoDrawView::removeSelectionChangeListener ( void SdUnoDrawView::setFastPropertyValue ( - sal_Int32 nHandle, + sal_Int32 nHandle, const Any& rValue) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -510,7 +510,7 @@ Reference< drawing::XDrawPage > SAL_CALL SdUnoDrawView::getCurrentPage() SdrPageView *pPV = mrView.GetSdrPageView(); SdrPage* pPage = pPV ? pPV->GetPage() : NULL; - + if(pPage) xPage = Reference< drawing::XDrawPage >::query( pPage->getUnoPage() ); @@ -577,12 +577,12 @@ void SdUnoDrawView::SetZoomType ( sal_Int16 nType ) case com::sun::star::view::DocumentZoomType::OPTIMAL: eZoomType = SVX_ZOOM_OPTIMAL; break; - + case com::sun::star::view::DocumentZoomType::PAGE_WIDTH: case com::sun::star::view::DocumentZoomType::PAGE_WIDTH_EXACT: eZoomType = SVX_ZOOM_PAGEWIDTH; break; - + case com::sun::star::view::DocumentZoomType::ENTIRE_PAGE: eZoomType = SVX_ZOOM_WHOLEPAGE; break; @@ -615,7 +615,7 @@ Any SdUnoDrawView::getDrawViewMode() const Any aRet; switch( mrDrawViewShell.GetPageKind() ) { - case PK_NOTES: aRet <<= DrawViewMode_NOTES; break; + case PK_NOTES: aRet <<= DrawViewMode_NOTES; break; case PK_HANDOUT: aRet <<= DrawViewMode_HANDOUT; break; case PK_STANDARD: aRet <<= DrawViewMode_DRAW; break; } diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx index ff3e5dd501fb..5432fa36c854 100755 --- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx +++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ SdUnoOutlineView::SdUnoOutlineView( DrawController& rController, OutlineViewShell& rViewShell, View& rView) throw() - : DrawSubControllerInterfaceBase(m_aMutex), + : DrawSubControllerInterfaceBase(m_aMutex), mrController(rController), mrOutlineViewShell(rViewShell), mrView(rView) @@ -106,7 +106,7 @@ void SAL_CALL SdUnoOutlineView::addSelectionChangeListener ( { (void)rxListener; } - + @@ -154,9 +154,9 @@ Reference< drawing::XDrawPage > SAL_CALL SdUnoOutlineView::getCurrentPage (void) /* // Return sal_True, value change sal_Bool SdUnoOutlineView::convertFastPropertyValue ( - Any & rConvertedValue, - Any & rOldValue, - sal_Int32 nHandle, + Any & rConvertedValue, + Any & rOldValue, + sal_Int32 nHandle, const Any& rValue) throw ( com::sun::star::lang::IllegalArgumentException) { @@ -188,7 +188,7 @@ sal_Bool SdUnoOutlineView::convertFastPropertyValue ( void SdUnoOutlineView::setFastPropertyValue ( - sal_Int32 nHandle, + sal_Int32 nHandle, const Any& rValue) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -205,7 +205,7 @@ void SdUnoOutlineView::setFastPropertyValue ( setCurrentPage( xPage ); } break; - + default: throw beans::UnknownPropertyException(); } @@ -229,7 +229,7 @@ Any SAL_CALL SdUnoOutlineView::getFastPropertyValue ( css::uno::RuntimeException) { Any aValue; - + switch( nHandle ) { case DrawController::PROPERTY_CURRENTPAGE: diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx b/sd/source/ui/unoidl/SdUnoSlideView.cxx index a6502711ee72..bffafb418cfa 100755 --- a/sd/source/ui/unoidl/SdUnoSlideView.cxx +++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -144,7 +144,7 @@ void SAL_CALL SdUnoSlideView::addSelectionChangeListener ( { (void)rxListener; } - + @@ -174,7 +174,7 @@ void SAL_CALL SdUnoSlideView::setCurrentPage ( throw(::com::sun::star::uno::RuntimeException) { return Reference<drawing::XDrawPage>(); -} +} @@ -182,7 +182,7 @@ void SAL_CALL SdUnoSlideView::setCurrentPage ( //----- XFastPropertySet ------------------------------------------------------ void SdUnoSlideView::setFastPropertyValue ( - sal_Int32 nHandle, + sal_Int32 nHandle, const Any& rValue) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -192,7 +192,7 @@ void SdUnoSlideView::setFastPropertyValue ( { (void)nHandle; (void)rValue; - + throw beans::UnknownPropertyException(); } diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index ed47e57b2130..de9bca4286d1 100755 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -129,8 +129,8 @@ namespace sd virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); private: - Reference< XModel > mxModel; - SdXImpressDocument* mpModel; + Reference< XModel > mxModel; + SdXImpressDocument* mpModel; }; Reference< XInterface > SAL_CALL DocumentSettings_createInstance( SdXImpressDocument* pModel ) @@ -161,60 +161,60 @@ enum SdDocumentSettingsPropertyHandles { static PropertyMapEntry aImpressSettingsInfoMap[] = { - { MAP_LEN("IsPrintDrawing"), HANDLE_PRINTDRAWING, &::getBooleanCppuType(), 0, MID_PRINTER }, - { MAP_LEN("IsPrintNotes"), HANDLE_PRINTNOTES, &::getBooleanCppuType(), 0, MID_PRINTER }, - { MAP_LEN("IsPrintHandout"), HANDLE_PRINTHANDOUT, &::getBooleanCppuType(), 0, MID_PRINTER }, - { MAP_LEN("IsPrintOutline"), HANDLE_PRINTOUTLINE, &::getBooleanCppuType(), 0, MID_PRINTER }, - { MAP_LEN("SlidesPerHandout"), HANDLE_SLIDESPERHANDOUT, &::getCppuType((const sal_Int16*)0), 0, MID_PRINTER }, - { MAP_LEN("HandoutsHorizontal"), HANDLE_HANDOUTHORIZONTAL, &::getBooleanCppuType(), 0, MID_PRINTER }, + { MAP_LEN("IsPrintDrawing"), HANDLE_PRINTDRAWING, &::getBooleanCppuType(), 0, MID_PRINTER }, + { MAP_LEN("IsPrintNotes"), HANDLE_PRINTNOTES, &::getBooleanCppuType(), 0, MID_PRINTER }, + { MAP_LEN("IsPrintHandout"), HANDLE_PRINTHANDOUT, &::getBooleanCppuType(), 0, MID_PRINTER }, + { MAP_LEN("IsPrintOutline"), HANDLE_PRINTOUTLINE, &::getBooleanCppuType(), 0, MID_PRINTER }, + { MAP_LEN("SlidesPerHandout"), HANDLE_SLIDESPERHANDOUT, &::getCppuType((const sal_Int16*)0), 0, MID_PRINTER }, + { MAP_LEN("HandoutsHorizontal"), HANDLE_HANDOUTHORIZONTAL, &::getBooleanCppuType(), 0, MID_PRINTER }, { NULL, 0, 0, NULL, 0, 0 } }; static PropertyMapEntry aDrawSettingsInfoMap[] = { - { MAP_LEN("MeasureUnit"), HANDLE_MEASUREUNIT, &::getCppuType((const sal_Int16*)0), 0, 0 }, - { MAP_LEN("ScaleNumerator"), HANDLE_SCALE_NUM, &::getCppuType((const sal_Int32*)0), 0, 0 }, - { MAP_LEN("ScaleDenominator"), HANDLE_SCALE_DOM, &::getCppuType((const sal_Int32*)0), 0, 0 }, + { MAP_LEN("MeasureUnit"), HANDLE_MEASUREUNIT, &::getCppuType((const sal_Int16*)0), 0, 0 }, + { MAP_LEN("ScaleNumerator"), HANDLE_SCALE_NUM, &::getCppuType((const sal_Int32*)0), 0, 0 }, + { MAP_LEN("ScaleDenominator"), HANDLE_SCALE_DOM, &::getCppuType((const sal_Int32*)0), 0, 0 }, { NULL, 0, 0, NULL, 0, 0 } }; static PropertyMapEntry aCommonSettingsInfoMap[] = { - { MAP_LEN("DefaultTabStop"), HANDLE_TABSTOP, &::getCppuType((const sal_Int32*)0), 0, 0 }, - { MAP_LEN("PrinterName"), HANDLE_PRINTERNAME, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_LEN("PrinterSetup"), HANDLE_PRINTERJOB, &::getCppuType((const uno::Sequence < sal_Int8 > *)0), 0, MID_PRINTER }, + { MAP_LEN("DefaultTabStop"), HANDLE_TABSTOP, &::getCppuType((const sal_Int32*)0), 0, 0 }, + { MAP_LEN("PrinterName"), HANDLE_PRINTERNAME, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN("PrinterSetup"), HANDLE_PRINTERJOB, &::getCppuType((const uno::Sequence < sal_Int8 > *)0), 0, MID_PRINTER }, #ifndef SVX_LIGHT - { MAP_LEN("IsPrintPageName"), HANDLE_PRINTPAGENAME, &::getBooleanCppuType(), 0, MID_PRINTER }, - { MAP_LEN("IsPrintDate"), HANDLE_PRINTDATE, &::getBooleanCppuType(), 0, MID_PRINTER }, - { MAP_LEN("IsPrintTime"), HANDLE_PRINTTIME, &::getBooleanCppuType(), 0, MID_PRINTER }, - { MAP_LEN("IsPrintHiddenPages"), HANDLE_PRINTHIDENPAGES, &::getBooleanCppuType(), 0, MID_PRINTER }, - { MAP_LEN("IsPrintFitPage"), HANDLE_PRINTFITPAGE, &::getBooleanCppuType(), 0, MID_PRINTER }, - { MAP_LEN("IsPrintTilePage"), HANDLE_PRINTTILEPAGE, &::getBooleanCppuType(), 0, MID_PRINTER }, - { MAP_LEN("IsPrintBooklet"), HANDLE_PRINTBOOKLET, &::getBooleanCppuType(), 0, MID_PRINTER }, - { MAP_LEN("IsPrintBookletFront"), HANDLE_PRINTBOOKLETFRONT, &::getBooleanCppuType(), 0, MID_PRINTER }, - { MAP_LEN("IsPrintBookletBack"), HANDLE_PRINTBOOKLETBACK, &::getBooleanCppuType(), 0, MID_PRINTER }, - { MAP_LEN("PrintQuality"), HANDLE_PRINTQUALITY, &::getCppuType((const sal_Int32*)0), 0, MID_PRINTER }, + { MAP_LEN("IsPrintPageName"), HANDLE_PRINTPAGENAME, &::getBooleanCppuType(), 0, MID_PRINTER }, + { MAP_LEN("IsPrintDate"), HANDLE_PRINTDATE, &::getBooleanCppuType(), 0, MID_PRINTER }, + { MAP_LEN("IsPrintTime"), HANDLE_PRINTTIME, &::getBooleanCppuType(), 0, MID_PRINTER }, + { MAP_LEN("IsPrintHiddenPages"), HANDLE_PRINTHIDENPAGES, &::getBooleanCppuType(), 0, MID_PRINTER }, + { MAP_LEN("IsPrintFitPage"), HANDLE_PRINTFITPAGE, &::getBooleanCppuType(), 0, MID_PRINTER }, + { MAP_LEN("IsPrintTilePage"), HANDLE_PRINTTILEPAGE, &::getBooleanCppuType(), 0, MID_PRINTER }, + { MAP_LEN("IsPrintBooklet"), HANDLE_PRINTBOOKLET, &::getBooleanCppuType(), 0, MID_PRINTER }, + { MAP_LEN("IsPrintBookletFront"), HANDLE_PRINTBOOKLETFRONT, &::getBooleanCppuType(), 0, MID_PRINTER }, + { MAP_LEN("IsPrintBookletBack"), HANDLE_PRINTBOOKLETBACK, &::getBooleanCppuType(), 0, MID_PRINTER }, + { MAP_LEN("PrintQuality"), HANDLE_PRINTQUALITY, &::getCppuType((const sal_Int32*)0), 0, MID_PRINTER }, #endif - { MAP_LEN("ColorTableURL"), HANDLE_COLORTABLEURL, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_LEN("DashTableURL"), HANDLE_DASHTABLEURL, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_LEN("LineEndTableURL"), HANDLE_LINEENDTABLEURL, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_LEN("HatchTableURL"), HANDLE_HATCHTABLEURL, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_LEN("GradientTableURL"), HANDLE_GRADIENTTABLEURL, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_LEN("BitmapTableURL"), HANDLE_BITMAPTABLEURL, &::getCppuType((const OUString*)0), 0, 0 }, - - { MAP_LEN("ForbiddenCharacters"), HANDLE_FORBIDDENCHARS, &::getCppuType((const Reference< XForbiddenCharacters >*)0), 0, 0 }, - { MAP_LEN("ApplyUserData"), HANDLE_APPLYUSERDATA, &::getBooleanCppuType(), 0, 0 }, - - { MAP_LEN("PageNumberFormat"), HANDLE_PAGENUMFMT, &::getCppuType((const sal_Int32*)0), 0, 0 }, - { MAP_LEN("ParagraphSummation"), HANDLE_PARAGRAPHSUMMATION, &::getBooleanCppuType(), 0, 0 }, - { MAP_LEN("CharacterCompressionType"),HANDLE_CHARCOMPRESS, &::getCppuType((sal_Int16*)0), 0, 0 }, - { MAP_LEN("IsKernAsianPunctuation"),HANDLE_ASIANPUNCT, &::getBooleanCppuType(), 0, 0 }, - { MAP_LEN("UpdateFromTemplate"), HANDLE_UPDATEFROMTEMPLATE, &::getBooleanCppuType(), 0, 0 }, + { MAP_LEN("ColorTableURL"), HANDLE_COLORTABLEURL, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN("DashTableURL"), HANDLE_DASHTABLEURL, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN("LineEndTableURL"), HANDLE_LINEENDTABLEURL, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN("HatchTableURL"), HANDLE_HATCHTABLEURL, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN("GradientTableURL"), HANDLE_GRADIENTTABLEURL, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN("BitmapTableURL"), HANDLE_BITMAPTABLEURL, &::getCppuType((const OUString*)0), 0, 0 }, + + { MAP_LEN("ForbiddenCharacters"), HANDLE_FORBIDDENCHARS, &::getCppuType((const Reference< XForbiddenCharacters >*)0), 0, 0 }, + { MAP_LEN("ApplyUserData"), HANDLE_APPLYUSERDATA, &::getBooleanCppuType(), 0, 0 }, + + { MAP_LEN("PageNumberFormat"), HANDLE_PAGENUMFMT, &::getCppuType((const sal_Int32*)0), 0, 0 }, + { MAP_LEN("ParagraphSummation"), HANDLE_PARAGRAPHSUMMATION, &::getBooleanCppuType(), 0, 0 }, + { MAP_LEN("CharacterCompressionType"),HANDLE_CHARCOMPRESS, &::getCppuType((sal_Int16*)0), 0, 0 }, + { MAP_LEN("IsKernAsianPunctuation"),HANDLE_ASIANPUNCT, &::getBooleanCppuType(), 0, 0 }, + { MAP_LEN("UpdateFromTemplate"), HANDLE_UPDATEFROMTEMPLATE, &::getBooleanCppuType(), 0, 0 }, { MAP_LEN("PrinterIndependentLayout"),HANDLE_PRINTER_INDEPENDENT_LAYOUT,&::getCppuType((const sal_Int16*)0), 0, 0 }, // --> PB 2004-08-23 #i33095# - { MAP_LEN("LoadReadonly"), HANDLE_LOAD_READONLY, &::getBooleanCppuType(), 0, 0 }, - { MAP_LEN("SaveVersionOnClose"), HANDLE_SAVE_VERSION, &::getBooleanCppuType(), 0, 0 }, + { MAP_LEN("LoadReadonly"), HANDLE_LOAD_READONLY, &::getBooleanCppuType(), 0, 0 }, + { MAP_LEN("SaveVersionOnClose"), HANDLE_SAVE_VERSION, &::getBooleanCppuType(), 0, 0 }, // <-- { NULL, 0, 0, NULL, 0, 0 } }; @@ -229,7 +229,7 @@ enum SdDocumentSettingsPropertyHandles using namespace ::sd; DocumentSettings::DocumentSettings( SdXImpressDocument* pModel ) -: PropertySetHelper( createSettingsInfoImpl( !pModel->IsImpressDocument() ) ), +: PropertySetHelper( createSettingsInfoImpl( !pModel->IsImpressDocument() ) ), mxModel( pModel ), mpModel( pModel ) { @@ -704,9 +704,9 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c else { pItemSet = new SfxItemSet(pDoc->GetPool(), - SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, - SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC, - ATTR_OPTIONS_PRINT, ATTR_OPTIONS_PRINT, + SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, + SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC, + ATTR_OPTIONS_PRINT, ATTR_OPTIONS_PRINT, 0 ); } @@ -873,7 +873,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c if( bOptionsChanged ) { - if( !pPrinter ) + if( !pPrinter ) pPrinter = pDocSh->GetPrinter( TRUE ); SfxItemSet aNewOptions( pPrinter->GetOptions() ); aNewOptions.Put( aOptionsPrintItem ); diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.hxx b/sd/source/ui/unoidl/UnoDocumentSettings.hxx index 432b02174e73..6304d6fc91d4 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.hxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/unoidl/detreg.cxx b/sd/source/ui/unoidl/detreg.cxx index a45496d5d5a4..6126019d5d8e 100644 --- a/sd/source/ui/unoidl/detreg.cxx +++ b/sd/source/ui/unoidl/detreg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,8 +49,8 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( } SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void* , - void* pRegistryKey ) + void* , + void* pRegistryKey ) { Reference< ::registry::XRegistryKey > xKey( reinterpret_cast< ::registry::XRegistryKey* >( pRegistryKey ) ) ; @@ -80,9 +80,9 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( // Set default return value for this operation - if it failed. void* pReturn = NULL ; - if ( - ( pImplementationName != NULL ) && - ( pServiceManager != NULL ) + if ( + ( pImplementationName != NULL ) && + ( pServiceManager != NULL ) ) { // Define variables which are used in following macros. diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index 1ac245ad00d4..863f2c19317a 100755 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -456,7 +456,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( SdPresentationDocument_createInstance, SdPresentationDocument_getSupportedServiceNames()); break; - + case SdUnoModuleFactoryId: xFactory = ::cppu::createSingleFactory( xMSF, @@ -493,7 +493,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( sd::framework::ModuleController_getImplementationName(), sd::framework::ModuleController_getSupportedServiceNames()); break; - + case BasicPaneFactoryFactoryId: xComponentFactory = ::cppu::createSingleComponentFactory( sd::framework::BasicPaneFactory_createInstance, @@ -507,7 +507,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( sd::framework::BasicToolBarFactory_getImplementationName(), sd::framework::BasicToolBarFactory_getSupportedServiceNames()); break; - + case BasicViewFactoryFactoryId: xComponentFactory = ::cppu::createSingleComponentFactory( sd::framework::BasicViewFactory_createInstance, diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx index 9a57fd090c7a..38ac609cbe5b 100644 --- a/sd/source/ui/unoidl/randomnode.cxx +++ b/sd/source/ui/unoidl/randomnode.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -193,18 +193,18 @@ OUString RandomNode__getImplementationName() throw( RuntimeException ) Sequence< OUString > SAL_CALL RandomNode_getSupportedServiceNames() throw( RuntimeException ) { -// static const OUString aSN1( OUString::createFromAscii( pSN1 ) ); +// static const OUString aSN1( OUString::createFromAscii( pSN1 ) ); static const OUString aSN2( OUString::createFromAscii( pSN2 ) ); Sequence< OUString > aSeq( &aSN2, 1 ); -// aSeq[0] = aSN1; -/// aSeq[1] = aSN2; +// aSeq[0] = aSN1; +/// aSeq[1] = aSN2; return aSeq; } // -------------------------------------------------------------------- RandomAnimationNode::RandomAnimationNode( const RandomAnimationNode& rNode ) -: RandomAnimationNodeBase(), +: RandomAnimationNodeBase(), mnPresetClass( rNode.mnPresetClass ), maBegin( rNode.maBegin ), maDuration( rNode.maDuration ), @@ -253,7 +253,7 @@ void RandomAnimationNode::init( sal_Int16 nPresetClass ) // XInitialization void SAL_CALL RandomAnimationNode::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException) { - if( aArguments.getLength() != 1 ) + if( aArguments.getLength() != 1 ) throw IllegalArgumentException(); if( aArguments[0].getValueType() == ::getCppuType((const sal_Int16*)0) ) @@ -613,7 +613,7 @@ Reference< XEnumeration > SAL_CALL RandomAnimationNode::createEnumeration() // no presets? give empty node! Reference< XMultiServiceFactory > xServiceFactory( comphelper::getProcessServiceFactory() ); Reference< XEnumerationAccess > aEmptyEnumAccess( - xServiceFactory->createInstance( + xServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.animations.ParallelTimeContainer" ))), UNO_QUERY ); @@ -673,7 +673,7 @@ Reference< XAnimationNode > SAL_CALL RandomAnimationNode::appendChild( const Ref Any aTarget( xAnimate->getTarget() ); if( aTarget.hasValue() ) maTarget = aTarget; - } + } if( !maTarget.hasValue() && !mxFirstNode.is() ) mxFirstNode = xAnimate; diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 9f268dec0cfa..cd7cf238ce1b 100755 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/unoidl/sddetect.hxx b/sd/source/ui/unoidl/sddetect.hxx index 5daa3d0fe23e..f1046f30930f 100644 --- a/sd/source/ui/unoidl/sddetect.hxx +++ b/sd/source/ui/unoidl/sddetect.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx index 1935c424ec03..2fbae2bc5aa5 100755 --- a/sd/source/ui/unoidl/unocpres.cxx +++ b/sd/source/ui/unoidl/unocpres.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,14 +53,14 @@ uno::Reference< uno::XInterface > createUnoCustomShow( SdCustomShow* pShow ) } SdXCustomPresentation::SdXCustomPresentation() throw() -: mpSdCustomShow(NULL), mpModel(NULL), +: mpSdCustomShow(NULL), mpModel(NULL), aDisposeListeners( aDisposeContainerMutex ), bDisposing( sal_False ) { } SdXCustomPresentation::SdXCustomPresentation( SdCustomShow* pShow, SdXImpressDocument* pMyModel) throw() -: mpSdCustomShow(pShow), mpModel(pMyModel), +: mpSdCustomShow(pShow), mpModel(pMyModel), aDisposeListeners( aDisposeContainerMutex ), bDisposing( sal_False ) { @@ -138,7 +138,7 @@ void SAL_CALL SdXCustomPresentation::removeByIndex( sal_Int32 Index ) if(mpSdCustomShow) { - uno::Reference< drawing::XDrawPage > xPage; + uno::Reference< drawing::XDrawPage > xPage; getByIndex( Index ) >>= xPage; if( xPage.is() ) @@ -249,7 +249,7 @@ void SAL_CALL SdXCustomPresentation::dispose() throw(uno::RuntimeException) OGuard aGuard( Application::GetSolarMutex() ); if( bDisposing ) - return; // catched a recursion + return; // catched a recursion bDisposing = sal_True; @@ -280,8 +280,8 @@ void SAL_CALL SdXCustomPresentation::removeEventListener( const uno::Reference< } /*===========================================================================* - * class SdXCustomPresentationAccess : public XCustomPresentationAccess, * - * public UsrObject * + * class SdXCustomPresentationAccess : public XCustomPresentationAccess, * + * public UsrObject * *===========================================================================*/ SdXCustomPresentationAccess::SdXCustomPresentationAccess(SdXImpressDocument& rMyModel) throw() diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx index 615d5ba7007c..fc75fdeb5fa0 100755 --- a/sd/source/ui/unoidl/unocpres.hxx +++ b/sd/source/ui/unoidl/unocpres.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,15 +45,15 @@ class SdView; class SdDrawViewShell; class SdCustomShow; -class SdXCustomPresentation : public ::cppu::WeakImplHelper5< ::com::sun::star::container::XIndexContainer, +class SdXCustomPresentation : public ::cppu::WeakImplHelper5< ::com::sun::star::container::XIndexContainer, ::com::sun::star::container::XNamed, ::com::sun::star::lang::XUnoTunnel, ::com::sun::star::lang::XComponent, ::com::sun::star::lang::XServiceInfo > { private: - SdCustomShow* mpSdCustomShow; - SdXImpressDocument* mpModel; + SdCustomShow* mpSdCustomShow; + SdXImpressDocument* mpModel; // for xComponent ::osl::Mutex aDisposeContainerMutex; @@ -115,7 +115,7 @@ public: class List; -class SdXCustomPresentationAccess : public ::cppu::WeakImplHelper3< ::com::sun::star::container::XNameContainer, +class SdXCustomPresentationAccess : public ::cppu::WeakImplHelper3< ::com::sun::star::container::XNameContainer, ::com::sun::star::lang::XSingleServiceFactory, ::com::sun::star::lang::XServiceInfo > { diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx index a423692caa4f..6603ff507106 100644 --- a/sd/source/ui/unoidl/unodoc.cxx +++ b/sd/source/ui/unoidl/unodoc.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,7 +66,7 @@ uno::Reference< uno::XInterface > SAL_CALL SdDrawingDocument_createInstance( SdDLL::Init(); - SfxObjectShell* pShell = + SfxObjectShell* pShell = new ::sd::GraphicDocShell( _nCreationFlags, FALSE, DOCUMENT_TYPE_DRAW ); return uno::Reference< uno::XInterface >( pShell->GetModel() ); diff --git a/sd/source/ui/unoidl/unohelp.hxx b/sd/source/ui/unoidl/unohelp.hxx index 9f25da2c6089..8a9a1c4b2bde 100644 --- a/sd/source/ui/unoidl/unohelp.hxx +++ b/sd/source/ui/unoidl/unohelp.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/unoidl/unokywds.cxx b/sd/source/ui/unoidl/unokywds.cxx index 2f417a5f4709..45fbd88b1eaa 100644 --- a/sd/source/ui/unoidl/unokywds.cxx +++ b/sd/source/ui/unoidl/unokywds.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index 5ad9fe3fd555..4e9275adc15a 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,23 +73,23 @@ using namespace ::com::sun::star; // class SdLayer //============================================================================= -#define WID_LAYER_LOCKED 1 -#define WID_LAYER_PRINTABLE 2 -#define WID_LAYER_VISIBLE 3 -#define WID_LAYER_NAME 4 -#define WID_LAYER_TITLE 5 -#define WID_LAYER_DESC 6 +#define WID_LAYER_LOCKED 1 +#define WID_LAYER_PRINTABLE 2 +#define WID_LAYER_VISIBLE 3 +#define WID_LAYER_NAME 4 +#define WID_LAYER_TITLE 5 +#define WID_LAYER_DESC 6 const SvxItemPropertySet* ImplGetSdLayerPropertySet() { static const SfxItemPropertyMapEntry aSdLayerPropertyMap_Impl[] = { - { MAP_CHAR_LEN(UNO_NAME_LAYER_LOCKED), WID_LAYER_LOCKED, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN(UNO_NAME_LAYER_PRINTABLE), WID_LAYER_PRINTABLE,&::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN(UNO_NAME_LAYER_VISIBLE), WID_LAYER_VISIBLE, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN(UNO_NAME_LAYER_NAME), WID_LAYER_NAME, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("Title"), WID_LAYER_TITLE, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("Description"), WID_LAYER_DESC, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN(UNO_NAME_LAYER_LOCKED), WID_LAYER_LOCKED, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN(UNO_NAME_LAYER_PRINTABLE), WID_LAYER_PRINTABLE,&::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN(UNO_NAME_LAYER_VISIBLE), WID_LAYER_VISIBLE, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN(UNO_NAME_LAYER_NAME), WID_LAYER_NAME, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("Title"), WID_LAYER_TITLE, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("Description"), WID_LAYER_DESC, &::getCppuType((const OUString*)0), 0, 0 }, { 0,0,0,0,0,0} }; static SvxItemPropertySet aSDLayerPropertySet_Impl( aSdLayerPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); @@ -127,23 +127,23 @@ String SdLayer::convertToInternalName( const OUString& rName ) OUString SdLayer::convertToExternalName( const String& rName ) { const String aCompare( rName ); - if( rName == String( SdResId( STR_LAYER_BCKGRND ) ) ) + if( rName == String( SdResId( STR_LAYER_BCKGRND ) ) ) { return OUString( RTL_CONSTASCII_USTRINGPARAM(sUNO_LayerName_background) ); } - else if( rName == String( SdResId( STR_LAYER_BCKGRNDOBJ ) ) ) + else if( rName == String( SdResId( STR_LAYER_BCKGRNDOBJ ) ) ) { return OUString( RTL_CONSTASCII_USTRINGPARAM(sUNO_LayerName_background_objects) ); } - else if( rName == String( SdResId( STR_LAYER_LAYOUT ) ) ) + else if( rName == String( SdResId( STR_LAYER_LAYOUT ) ) ) { return OUString( RTL_CONSTASCII_USTRINGPARAM(sUNO_LayerName_layout) ); } - else if( rName == String( SdResId( STR_LAYER_CONTROLS ) ) ) + else if( rName == String( SdResId( STR_LAYER_CONTROLS ) ) ) { return OUString( RTL_CONSTASCII_USTRINGPARAM(sUNO_LayerName_controls) ); } - else if( rName == String( SdResId( STR_LAYER_MEASURELINES ) ) ) + else if( rName == String( SdResId( STR_LAYER_MEASURELINES ) ) ) { return OUString( RTL_CONSTASCII_USTRINGPARAM(sUNO_LayerName_measurelines) ); } @@ -240,7 +240,7 @@ void SAL_CALL SdLayer::setPropertyValue( const OUString& aPropertyName, const un OUString aName; if(!(aValue >>= aName)) throw lang::IllegalArgumentException(); - + pLayer->SetName(SdLayer::convertToInternalName( aName ) ); pLayerManager->UpdateLayerView(); break; @@ -251,7 +251,7 @@ void SAL_CALL SdLayer::setPropertyValue( const OUString& aPropertyName, const un OUString sTitle; if(!(aValue >>= sTitle)) throw lang::IllegalArgumentException(); - + pLayer->SetTitle(sTitle); break; } @@ -261,7 +261,7 @@ void SAL_CALL SdLayer::setPropertyValue( const OUString& aPropertyName, const un OUString sDescription; if(!(aValue >>= sDescription)) throw lang::IllegalArgumentException(); - + pLayer->SetDescription(sDescription); break; } @@ -271,8 +271,8 @@ void SAL_CALL SdLayer::setPropertyValue( const OUString& aPropertyName, const un } #ifndef SVX_LIGHT - if( pLayerManager->GetDocShell() ) - pLayerManager->GetDocShell()->SetModified(); + if( pLayerManager->GetDocShell() ) + pLayerManager->GetDocShell()->SetModified(); #endif } @@ -339,9 +339,9 @@ sal_Bool SdLayer::get( LayerAttribute what ) throw() String aLayerName = pLayer->GetName(); switch(what) { - case VISIBLE: return pSdrPageView->IsLayerVisible(aLayerName); - case PRINTABLE: return pSdrPageView->IsLayerPrintable(aLayerName); - case LOCKED: return pSdrPageView->IsLayerLocked(aLayerName); + case VISIBLE: return pSdrPageView->IsLayerVisible(aLayerName); + case PRINTABLE: return pSdrPageView->IsLayerPrintable(aLayerName); + case LOCKED: return pSdrPageView->IsLayerLocked(aLayerName); } } @@ -353,9 +353,9 @@ sal_Bool SdLayer::get( LayerAttribute what ) throw() if(pFrameView) switch(what) { - case VISIBLE: return pFrameView->GetVisibleLayers().IsSet(pLayer->GetID()); - case PRINTABLE: return pFrameView->GetPrintableLayers().IsSet(pLayer->GetID()); - case LOCKED: return pFrameView->GetLockedLayers().IsSet(pLayer->GetID()); + case VISIBLE: return pFrameView->GetVisibleLayers().IsSet(pLayer->GetID()); + case PRINTABLE: return pFrameView->GetPrintableLayers().IsSet(pLayer->GetID()); + case LOCKED: return pFrameView->GetLockedLayers().IsSet(pLayer->GetID()); } } #endif @@ -378,11 +378,11 @@ void SdLayer::set( LayerAttribute what, sal_Bool flag ) throw() String aLayerName(pLayer->GetName()); switch(what) { - case VISIBLE: pSdrPageView->SetLayerVisible(aLayerName,flag); + case VISIBLE: pSdrPageView->SetLayerVisible(aLayerName,flag); break; - case PRINTABLE: pSdrPageView->SetLayerPrintable(aLayerName,flag); + case PRINTABLE: pSdrPageView->SetLayerPrintable(aLayerName,flag); break; - case LOCKED: pSdrPageView->SetLayerLocked(aLayerName,flag); + case LOCKED: pSdrPageView->SetLayerLocked(aLayerName,flag); break; } } @@ -398,11 +398,11 @@ void SdLayer::set( LayerAttribute what, sal_Bool flag ) throw() SetOfByte aNewLayers; switch(what) { - case VISIBLE: aNewLayers = pFrameView->GetVisibleLayers(); + case VISIBLE: aNewLayers = pFrameView->GetVisibleLayers(); break; - case PRINTABLE: aNewLayers = pFrameView->GetPrintableLayers(); + case PRINTABLE: aNewLayers = pFrameView->GetPrintableLayers(); break; - case LOCKED: aNewLayers = pFrameView->GetLockedLayers(); + case LOCKED: aNewLayers = pFrameView->GetLockedLayers(); break; } @@ -410,11 +410,11 @@ void SdLayer::set( LayerAttribute what, sal_Bool flag ) throw() switch(what) { - case VISIBLE: pFrameView->SetVisibleLayers(aNewLayers); + case VISIBLE: pFrameView->SetVisibleLayers(aNewLayers); break; - case PRINTABLE: pFrameView->SetPrintableLayers(aNewLayers); + case PRINTABLE: pFrameView->SetPrintableLayers(aNewLayers); break; - case LOCKED: pFrameView->SetLockedLayers(aNewLayers); + case LOCKED: pFrameView->SetLockedLayers(aNewLayers); break; } return; @@ -430,7 +430,7 @@ void SdLayer::set( LayerAttribute what, sal_Bool flag ) throw() //===== ::com::sun::star::container::XChild ================================= -uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent (void) +uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent (void) throw (::com::sun::star::uno::RuntimeException) { OGuard aGuard( Application::GetSolarMutex() ); @@ -442,8 +442,8 @@ uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent (void) } -void SAL_CALL SdLayer::setParent (const uno::Reference<uno::XInterface >& ) - throw (::com::sun::star::lang::NoSupportException, +void SAL_CALL SdLayer::setParent (const uno::Reference<uno::XInterface >& ) + throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException) { throw lang::NoSupportException (); @@ -720,7 +720,7 @@ uno::Sequence< OUString > SAL_CALL SdLayerManager::getElementNames() sal_Bool SAL_CALL SdLayerManager::hasByName( const OUString& aName ) throw(uno::RuntimeException) { OGuard aGuard( Application::GetSolarMutex() ); - + if( mpModel == 0 ) throw lang::DisposedException(); diff --git a/sd/source/ui/unoidl/unolayer.hxx b/sd/source/ui/unoidl/unolayer.hxx index 76ccc6e22ab1..ba83422ddb3a 100644 --- a/sd/source/ui/unoidl/unolayer.hxx +++ b/sd/source/ui/unoidl/unolayer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,14 +76,14 @@ public: // ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XChild - + /** Returns the layer manager that manages this layer. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException); @@ -99,11 +99,11 @@ public: virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); private: - SdLayerManager* pLayerManager; + SdLayerManager* pLayerManager; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayerManager > mxLayerManager; - SdrLayer* pLayer; - const SvxItemPropertySet* pPropSet; + SdrLayer* pLayer; + const SvxItemPropertySet* pPropSet; sal_Bool get( LayerAttribute what ) throw(); void set( LayerAttribute what, sal_Bool flag ) throw(); @@ -127,7 +127,7 @@ class SdLayerManager : public ::cppu::WeakImplHelper5< ::com::sun::star::drawing { friend class SdLayer; -public: +public: SdLayerManager( SdXImpressDocument& rMyModel ) throw(); virtual ~SdLayerManager() throw(); @@ -179,10 +179,10 @@ public: private: SdXImpressDocument* mpModel; - SvUnoWeakContainer* mpLayers; + SvUnoWeakContainer* mpLayers; ::sd::View* GetView() const throw(); - ::sd::DrawDocShell* GetDocShell() const throw() { return mpModel->mpDocShell; } + ::sd::DrawDocShell* GetDocShell() const throw() { return mpModel->mpDocShell; } void UpdateLayerView( sal_Bool modify = sal_True ) const throw(); }; diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index e11f76a64baa..83c713c1fd6e 100755 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -137,7 +137,7 @@ protected: virtual void onChange(); private: - SdrModel* mpModel; + SdrModel* mpModel; }; SdUnoForbiddenCharsTable::SdUnoForbiddenCharsTable( SdrModel* pModel ) @@ -181,7 +181,7 @@ const sal_Int32 WID_MODEL_VISAREA = 3; const sal_Int32 WID_MODEL_MAPUNIT = 4; const sal_Int32 WID_MODEL_FORBCHARS= 5; const sal_Int32 WID_MODEL_CONTFOCUS = 6; -const sal_Int32 WID_MODEL_DSGNMODE = 7; +const sal_Int32 WID_MODEL_DSGNMODE = 7; const sal_Int32 WID_MODEL_BASICLIBS = 8; const sal_Int32 WID_MODEL_RUNTIMEUID = 9; const sal_Int32 WID_MODEL_BUILDID = 10; @@ -193,15 +193,15 @@ const SvxItemPropertySet* ImplGetDrawModelPropertySet() // Achtung: Der erste Parameter MUSS sortiert vorliegen !!! const static SfxItemPropertyMapEntry aDrawModelPropertyMap_Impl[] = { - { MAP_CHAR_LEN("BuildId"), WID_MODEL_BUILDID, &::getCppuType(static_cast< const rtl::OUString * >(0)), 0, 0}, - { MAP_CHAR_LEN(sUNO_Prop_CharLocale), WID_MODEL_LANGUAGE, &::getCppuType((const lang::Locale*)0), 0, 0}, - { MAP_CHAR_LEN(sUNO_Prop_TabStop), WID_MODEL_TABSTOP, &::getCppuType((const sal_Int32*)0), 0, 0}, - { MAP_CHAR_LEN(sUNO_Prop_VisibleArea), WID_MODEL_VISAREA, &::getCppuType((const awt::Rectangle*)0), 0, 0}, - { MAP_CHAR_LEN(sUNO_Prop_MapUnit), WID_MODEL_MAPUNIT, &::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(sUNO_Prop_ForbiddenCharacters), WID_MODEL_FORBCHARS,&::getCppuType((const uno::Reference< i18n::XForbiddenCharacters > *)0), beans::PropertyAttribute::READONLY, 0 }, - { MAP_CHAR_LEN(sUNO_Prop_AutomContFocus ), WID_MODEL_CONTFOCUS, &::getBooleanCppuType(), 0, 0}, - { MAP_CHAR_LEN(sUNO_Prop_ApplyFrmDsgnMode), WID_MODEL_DSGNMODE, &::getBooleanCppuType(), 0, 0}, - { MAP_CHAR_LEN("BasicLibraries"), WID_MODEL_BASICLIBS,&::getCppuType((const uno::Reference< script::XLibraryContainer > *)0), beans::PropertyAttribute::READONLY, 0 }, + { MAP_CHAR_LEN("BuildId"), WID_MODEL_BUILDID, &::getCppuType(static_cast< const rtl::OUString * >(0)), 0, 0}, + { MAP_CHAR_LEN(sUNO_Prop_CharLocale), WID_MODEL_LANGUAGE, &::getCppuType((const lang::Locale*)0), 0, 0}, + { MAP_CHAR_LEN(sUNO_Prop_TabStop), WID_MODEL_TABSTOP, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(sUNO_Prop_VisibleArea), WID_MODEL_VISAREA, &::getCppuType((const awt::Rectangle*)0), 0, 0}, + { MAP_CHAR_LEN(sUNO_Prop_MapUnit), WID_MODEL_MAPUNIT, &::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(sUNO_Prop_ForbiddenCharacters), WID_MODEL_FORBCHARS,&::getCppuType((const uno::Reference< i18n::XForbiddenCharacters > *)0), beans::PropertyAttribute::READONLY, 0 }, + { MAP_CHAR_LEN(sUNO_Prop_AutomContFocus ), WID_MODEL_CONTFOCUS, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN(sUNO_Prop_ApplyFrmDsgnMode), WID_MODEL_DSGNMODE, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN("BasicLibraries"), WID_MODEL_BASICLIBS,&::getCppuType((const uno::Reference< script::XLibraryContainer > *)0), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN("DialogLibraries"), WID_MODEL_DIALOGLIBS, &::getCppuType((const uno::Reference< script::XLibraryContainer > *)0), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN(sUNO_Prop_RuntimeUID), WID_MODEL_RUNTIMEUID, &::getCppuType(static_cast< const rtl::OUString * >(0)), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN(sUNO_Prop_HasValidSignatures), WID_MODEL_HASVALIDSIGNATURES, &::getCppuType(static_cast< const sal_Bool * >(0)), beans::PropertyAttribute::READONLY, 0 }, @@ -213,7 +213,7 @@ const SvxItemPropertySet* ImplGetDrawModelPropertySet() // this ctor is used from the DocShell SdXImpressDocument::SdXImpressDocument (::sd::DrawDocShell* pShell, bool bClipBoard ) throw() -: SfxBaseModel( pShell ), +: SfxBaseModel( pShell ), mpDocShell( pShell ), mpDoc( pShell ? pShell->GetDoc() : NULL ), mbDisposed(false), @@ -232,7 +232,7 @@ SdXImpressDocument::SdXImpressDocument (::sd::DrawDocShell* pShell, bool bClipBo } SdXImpressDocument::SdXImpressDocument( SdDrawDocument* pDoc, bool bClipBoard ) throw() -: SfxBaseModel( NULL ), +: SfxBaseModel( NULL ), mpDocShell( NULL ), mpDoc( pDoc ), mbDisposed(false), @@ -399,7 +399,7 @@ uno::Sequence< uno::Type > SAL_CALL SdXImpressDocument::getTypes( ) throw(uno:: const sal_Int32 nBaseTypes = aBaseTypes.getLength(); const uno::Type* pBaseTypes = aBaseTypes.getConstArray(); - const sal_Int32 nOwnTypes = mbImpressDoc ? 14 : 11; // !DANGER! Keep this updated! + const sal_Int32 nOwnTypes = mbImpressDoc ? 14 : 11; // !DANGER! Keep this updated! maTypeSequence.realloc( nBaseTypes + nOwnTypes ); uno::Type* pTypes = maTypeSequence.getArray(); @@ -614,7 +614,7 @@ void SdXImpressDocument::SetModified( sal_Bool bModified /* = sal_True */ ) thro } // XModel -void SAL_CALL SdXImpressDocument ::lockControllers( ) +void SAL_CALL SdXImpressDocument ::lockControllers( ) throw(uno::RuntimeException) { OGuard aGuard( Application::GetSolarMutex() ); @@ -1535,9 +1535,9 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SdXImpressDocument::getRenderer( class ImplRenderPaintProc : public ::sdr::contact::ViewObjectContactRedirector { - const SdrLayerAdmin& rLayerAdmin; - SdrPageView* pSdrPageView; - vcl::PDFExtOutDevData* pPDFExtOutDevData; + const SdrLayerAdmin& rLayerAdmin; + SdrPageView* pSdrPageView; + vcl::PDFExtOutDevData* pPDFExtOutDevData; vcl::PDFWriter::StructElement ImplBegStructureTag( SdrObject& rObject ); @@ -1551,15 +1551,15 @@ public: // all default implementations just call the same methods at the original. To do something // different, overload the method and at least do what the method does. virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence( - const sdr::contact::ViewObjectContact& rOriginal, + const sdr::contact::ViewObjectContact& rOriginal, const sdr::contact::DisplayInfo& rDisplayInfo); }; ImplRenderPaintProc::ImplRenderPaintProc( const SdrLayerAdmin& rLA, SdrPageView* pView, vcl::PDFExtOutDevData* pData ) -: ViewObjectContactRedirector(), - rLayerAdmin ( rLA ), - pSdrPageView ( pView ), - pPDFExtOutDevData ( pData ) +: ViewObjectContactRedirector(), + rLayerAdmin ( rLA ), + pSdrPageView ( pView ), + pPDFExtOutDevData ( pData ) { } @@ -1610,7 +1610,7 @@ void ImplPDFExportComments( uno::Reference< drawing::XDrawPage > xPage, vcl::PDF geometry::RealPoint2D aRealPoint2D( xAnnotation->getPosition() ); uno::Reference< text::XText > xText( xAnnotation->getTextRange() ); -// rtl::OUString sInitials( getInitials( sAuthor ) ); +// rtl::OUString sInitials( getInitials( sAuthor ) ); util::DateTime aDateTime( xAnnotation->getDateTime() ); Date aDate( aDateTime.Day, aDateTime.Month, aDateTime.Year ); @@ -1657,13 +1657,13 @@ void ImplPDFExportShapeInteraction( uno::Reference< drawing::XShape > xShape, Sd uno::Reference< beans::XPropertySet > xShapePropSet( xShape, uno::UNO_QUERY ); if( xShapePropSet.is() ) { - Size aPageSize( rDoc.GetSdPage( 0, PK_STANDARD )->GetSize() ); + Size aPageSize( rDoc.GetSdPage( 0, PK_STANDARD )->GetSize() ); Point aPoint( 0, 0 ); - Rectangle aPageRect( aPoint, aPageSize ); + Rectangle aPageRect( aPoint, aPageSize ); - awt::Point aShapePos( xShape->getPosition() ); - awt::Size aShapeSize( xShape->getSize() ); - Rectangle aLinkRect( Point( aShapePos.X, aShapePos.Y ), Size( aShapeSize.Width, aShapeSize.Height ) ); + awt::Point aShapePos( xShape->getPosition() ); + awt::Size aShapeSize( xShape->getSize() ); + Rectangle aLinkRect( Point( aShapePos.X, aShapePos.Y ), Size( aShapeSize.Width, aShapeSize.Height ) ); presentation::ClickAction eCa; uno::Any aAny( xShapePropSet->getPropertyValue( sOnClick ) ); @@ -1760,7 +1760,7 @@ void ImplPDFExportShapeInteraction( uno::Reference< drawing::XShape > xShape, Sd vcl::PDFWriter::StructElement ImplRenderPaintProc::ImplBegStructureTag( SdrObject& rObject ) { vcl::PDFWriter::StructElement eElement(vcl::PDFWriter::NonStructElement); - + if ( pPDFExtOutDevData && pPDFExtOutDevData->GetIsExportTaggedPDF() ) { sal_uInt32 nInventor = rObject.GetObjInventor(); @@ -1784,7 +1784,7 @@ vcl::PDFWriter::StructElement ImplRenderPaintProc::ImplBegStructureTag( SdrObjec } drawinglayer::primitive2d::Primitive2DSequence ImplRenderPaintProc::createRedirectedPrimitive2DSequence( - const sdr::contact::ViewObjectContact& rOriginal, + const sdr::contact::ViewObjectContact& rOriginal, const sdr::contact::DisplayInfo& rDisplayInfo) { SdrObject* pObject = rOriginal.GetViewContact().TryToGetSdrObject(); @@ -1867,9 +1867,9 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r if( mpDocShell && mpDoc ) { uno::Reference< awt::XDevice > xRenderDevice; - const sal_Int32 nPageNumber = nRenderer + 1; - PageKind ePageKind = PK_STANDARD; - sal_Bool bExportNotesPages = sal_False; + const sal_Int32 nPageNumber = nRenderer + 1; + PageKind ePageKind = PK_STANDARD; + sal_Bool bExportNotesPages = sal_False; for( sal_Int32 nProperty = 0, nPropertyCount = rxOptions.getLength(); nProperty < nPropertyCount; ++nProperty ) { @@ -1893,9 +1893,9 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r vcl::PDFExtOutDevData* pPDFExtOutDevData = PTR_CAST( vcl::PDFExtOutDevData, pOut->GetExtOutDevData() ); ::sd::ClientView* pView = new ::sd::ClientView( mpDocShell, pOut, NULL ); - Rectangle aVisArea = Rectangle( Point(), mpDoc->GetSdPage( (USHORT)nPageNumber - 1, ePageKind )->GetSize() ); - Region aRegion( aVisArea ); - Point aOrigin; + Rectangle aVisArea = Rectangle( Point(), mpDoc->GetSdPage( (USHORT)nPageNumber - 1, ePageKind )->GetSize() ); + Region aRegion( aVisArea ); + Point aOrigin; ::sd::ViewShell* pOldViewSh = mpDocShell->GetViewShell(); ::sd::View* pOldSdView = pOldViewSh ? pOldViewSh->GetView() : NULL; @@ -1932,7 +1932,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r } } - ImplRenderPaintProc aImplRenderPaintProc( mpDoc->GetLayerAdmin(), + ImplRenderPaintProc aImplRenderPaintProc( mpDoc->GetLayerAdmin(), pPV, pPDFExtOutDevData ); // background color for outliner :o @@ -1956,7 +1956,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r bScreenDisplay = false; } - // #i75566# Name change GetBackgroundColor -> GetPageBackgroundColor and + // #i75566# Name change GetBackgroundColor -> GetPageBackgroundColor and // hint value if screen display. Only then the AutoColor mechanisms shall be applied rOutl.SetBackgroundColor( pPage->GetPageBackgroundColor( pPV, bScreenDisplay ) ); } @@ -1978,7 +1978,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r // exporting object interactions to pdf // if necessary, the master page interactions will be exported first - sal_Bool bIsBackgroundObjectsVisible = sal_False; // SJ: #i39428# IsBackgroundObjectsVisible not available for Draw + sal_Bool bIsBackgroundObjectsVisible = sal_False; // SJ: #i39428# IsBackgroundObjectsVisible not available for Draw const rtl::OUString sIsBackgroundObjectsVisible( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundObjectsVisible" ) ); if ( mbImpressDoc && ( xPagePropSet->getPropertyValue( sIsBackgroundObjectsVisible ) >>= bIsBackgroundObjectsVisible ) && bIsBackgroundObjectsVisible ) { @@ -2013,7 +2013,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r } // exporting transition effects to pdf - if ( mbImpressDoc && pPDFExtOutDevData->GetIsExportTransitionEffects() ) // SJ: #i39428# TransitionEffects not available for Draw + if ( mbImpressDoc && pPDFExtOutDevData->GetIsExportTransitionEffects() ) // SJ: #i39428# TransitionEffects not available for Draw { const rtl::OUString sEffect( RTL_CONSTASCII_USTRINGPARAM( "Effect" ) ); const rtl::OUString sSpeed ( RTL_CONSTASCII_USTRINGPARAM( "Speed" ) ); @@ -2099,9 +2099,9 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r } } - Size aPageSize( mpDoc->GetSdPage( 0, PK_STANDARD )->GetSize() ); + Size aPageSize( mpDoc->GetSdPage( 0, PK_STANDARD )->GetSize() ); Point aPoint( 0, 0 ); - Rectangle aPageRect( aPoint, aPageSize ); + Rectangle aPageRect( aPoint, aPageSize ); // resolving links found in this page by the method ImpEditEngine::Paint std::vector< vcl::PDFExtOutDevBookmarkEntry >& rBookmarks = pPDFExtOutDevData->GetBookmarks(); @@ -2134,10 +2134,10 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r // Destination Export const sal_Int32 nDestId = pPDFExtOutDevData->CreateDest( aPageRect , nPageNumber - 1 ); - + // Create a new outline item: pPDFExtOutDevData->CreateOutlineItem( -1 , aPageName, nDestId ); - } + } } //<--- i56629, i40318 } @@ -2156,7 +2156,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r { SdrPageView* pPV = NULL; - ImplRenderPaintProc aImplRenderPaintProc( mpDoc->GetLayerAdmin(), + ImplRenderPaintProc aImplRenderPaintProc( mpDoc->GetLayerAdmin(), pOldSdView ? pOldSdView->GetSdrPageView() : NULL, pPDFExtOutDevData ); for( sal_uInt32 i = 0, nCount = xShapes->getCount(); i < nCount; i++ ) @@ -2333,7 +2333,7 @@ void SAL_CALL SdXImpressDocument::dispose() throw (::com::sun::star::uno::Runtim //============================================================================= SdDrawPagesAccess::SdDrawPagesAccess( SdXImpressDocument& rMyModel ) throw() -: mpModel( &rMyModel) +: mpModel( &rMyModel) { } @@ -2493,7 +2493,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdDrawPagesAccess::insertNewByInde /****************************************************************************** * Entfernt die angegebenne SdDrawPage aus dem Model und aus der internen * * Liste. Dies funktioniert nur, wenn mindestens eine *normale* Seite im Model * -* nach dem entfernen dieser Seite vorhanden ist. * +* nach dem entfernen dieser Seite vorhanden ist. * ******************************************************************************/ void SAL_CALL SdDrawPagesAccess::remove( const uno::Reference< drawing::XDrawPage >& xPage ) throw(uno::RuntimeException) @@ -2589,7 +2589,7 @@ void SAL_CALL SdDrawPagesAccess::removeEventListener( const uno::Reference< lang //============================================================================= SdMasterPagesAccess::SdMasterPagesAccess( SdXImpressDocument& rMyModel ) throw() -: mpModel(&rMyModel) +: mpModel(&rMyModel) { } @@ -2735,7 +2735,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn pMPage->SetLayoutName( aLayoutName ); mpDoc->InsertMasterPage(pMPage, (USHORT)nInsertPos); - { + { // ensure default MasterPage fill pMPage->EnsureMasterPageDefaultBackground(); } @@ -2752,7 +2752,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn pRefNotesPage->GetLwrBorder() ); pMNotesPage->SetLayoutName( aLayoutName ); mpDoc->InsertMasterPage(pMNotesPage, (USHORT)nInsertPos + 1); -// pMNotesPage->InsertMasterPage( pMPage->GetPageNum() ); +// pMNotesPage->InsertMasterPage( pMPage->GetPageNum() ); pMNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, sal_True, sal_True); mpModel->SetModified(); } diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx index 7769f7e14dba..e2ff83c45a7d 100644 --- a/sd/source/ui/unoidl/unomodule.cxx +++ b/sd/source/ui/unoidl/unomodule.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/unoidl/unomodule.hxx b/sd/source/ui/unoidl/unomodule.hxx index bce015702ddd..e7dcffc76864 100644 --- a/sd/source/ui/unoidl/unomodule.hxx +++ b/sd/source/ui/unoidl/unomodule.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,16 +56,16 @@ namespace com } } -#define REFERENCE ::com::sun::star::uno::Reference -#define SEQUENCE ::com::sun::star::uno::Sequence -#define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException -#define REFERENCE ::com::sun::star::uno::Reference -#define SEQUENCE ::com::sun::star::uno::Sequence +#define REFERENCE ::com::sun::star::uno::Reference +#define SEQUENCE ::com::sun::star::uno::Sequence +#define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException +#define REFERENCE ::com::sun::star::uno::Reference +#define SEQUENCE ::com::sun::star::uno::Sequence #define XDISPATCH ::com::sun::star::frame::XDispatch #define XNOTIFYINGDISPATCH ::com::sun::star::frame::XNotifyingDispatch -#define OUSTRING ::rtl::OUString -#define UNOURL ::com::sun::star::util::URL -#define DISPATCHDESCRIPTOR ::com::sun::star::frame::DispatchDescriptor +#define OUSTRING ::rtl::OUString +#define UNOURL ::com::sun::star::util::URL +#define DISPATCHDESCRIPTOR ::com::sun::star::frame::DispatchDescriptor class SdUnoModule : public ::cppu::WeakImplHelper3< ::com::sun::star::frame::XDispatchProvider, ::com::sun::star::frame::XNotifyingDispatch, ::com::sun::star::lang::XServiceInfo > { @@ -86,9 +86,9 @@ public: // XDispatchProvider virtual SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL queryDispatches( const SEQUENCE< DISPATCHDESCRIPTOR >& seqDescriptor ) throw( RUNTIMEEXCEPTION ) ; - virtual REFERENCE< XDISPATCH > SAL_CALL queryDispatch( const UNOURL & aURL , - const OUSTRING & sTargetFrameName, - sal_Int32 eSearchFlags ) throw( RUNTIMEEXCEPTION ) ; + virtual REFERENCE< XDISPATCH > SAL_CALL queryDispatch( const UNOURL & aURL , + const OUSTRING & sTargetFrameName, + sal_Int32 eSearchFlags ) throw( RUNTIMEEXCEPTION ) ; // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index f31c960d432d..0146dbd22c06 100755 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -119,66 +119,66 @@ static SdTypesCache gImplTypesCache; /////////////////////////////////////////////////////////////////////// -#define WID_EFFECT 1 -#define WID_SPEED 2 -#define WID_TEXTEFFECT 3 -#define WID_BOOKMARK 4 -#define WID_CLICKACTION 5 -#define WID_PLAYFULL 6 -#define WID_SOUNDFILE 7 -#define WID_SOUNDON 8 -#define WID_BLUESCREEN 9 -#define WID_VERB 10 -#define WID_DIMCOLOR 11 -#define WID_DIMHIDE 12 -#define WID_DIMPREV 13 -#define WID_PRESORDER 14 -#define WID_STYLE 15 -#define WID_ANIMPATH 16 -#define WID_IMAGEMAP 17 -#define WID_ISANIMATION 18 - -#define WID_ISEMPTYPRESOBJ 20 -#define WID_ISPRESOBJ 21 -#define WID_MASTERDEPEND 22 - -#define WID_NAVORDER 23 +#define WID_EFFECT 1 +#define WID_SPEED 2 +#define WID_TEXTEFFECT 3 +#define WID_BOOKMARK 4 +#define WID_CLICKACTION 5 +#define WID_PLAYFULL 6 +#define WID_SOUNDFILE 7 +#define WID_SOUNDON 8 +#define WID_BLUESCREEN 9 +#define WID_VERB 10 +#define WID_DIMCOLOR 11 +#define WID_DIMHIDE 12 +#define WID_DIMPREV 13 +#define WID_PRESORDER 14 +#define WID_STYLE 15 +#define WID_ANIMPATH 16 +#define WID_IMAGEMAP 17 +#define WID_ISANIMATION 18 + +#define WID_ISEMPTYPRESOBJ 20 +#define WID_ISPRESOBJ 21 +#define WID_MASTERDEPEND 22 + +#define WID_NAVORDER 23 #define WID_THAT_NEED_ANIMINFO 19 #define IMPRESS_MAP_ENTRIES \ - { MAP_CHAR_LEN(UNO_NAME_OBJ_ANIMATIONPATH), WID_ANIMPATH, &ITYPE(drawing::XShape), 0, 0},\ - { MAP_CHAR_LEN(UNO_NAME_OBJ_BOOKMARK), WID_BOOKMARK, &::getCppuType((const OUString*)0), 0, 0},\ - { MAP_CHAR_LEN(UNO_NAME_OBJ_DIMCOLOR), WID_DIMCOLOR, &::getCppuType((const sal_Int32*)0), 0, 0},\ - { MAP_CHAR_LEN(UNO_NAME_OBJ_DIMHIDE), WID_DIMHIDE, &::getBooleanCppuType(), 0, 0},\ - { MAP_CHAR_LEN(UNO_NAME_OBJ_DIMPREV), WID_DIMPREV, &::getBooleanCppuType(), 0, 0},\ - { MAP_CHAR_LEN(UNO_NAME_OBJ_EFFECT), WID_EFFECT, &::getCppuType((const presentation::AnimationEffect*)0), 0, 0},\ - { MAP_CHAR_LEN(UNO_NAME_OBJ_ISEMPTYPRESOBJ),WID_ISEMPTYPRESOBJ, &::getBooleanCppuType(), 0, 0},\ - { MAP_CHAR_LEN(UNO_NAME_OBJ_ISPRESOBJ), WID_ISPRESOBJ, &::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},\ - { MAP_CHAR_LEN(UNO_NAME_OBJ_MASTERDEPENDENT),WID_MASTERDEPEND, &::getBooleanCppuType(), 0, 0},\ - { MAP_CHAR_LEN(UNO_NAME_OBJ_CLICKACTION), WID_CLICKACTION, &::getCppuType((const presentation::ClickAction*)0), 0, 0},\ - { MAP_CHAR_LEN(UNO_NAME_OBJ_PLAYFULL), WID_PLAYFULL, &::getBooleanCppuType(), 0, 0},\ - { MAP_CHAR_LEN(UNO_NAME_OBJ_PRESORDER), WID_PRESORDER, &::getCppuType((const sal_Int32*)0), 0, 0},\ - { MAP_CHAR_LEN(UNO_NAME_OBJ_STYLE), WID_STYLE, &ITYPE( style::XStyle), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},\ - { MAP_CHAR_LEN(UNO_NAME_OBJ_SOUNDFILE), WID_SOUNDFILE, &::getCppuType((const OUString*)0), 0, 0},\ - { MAP_CHAR_LEN(UNO_NAME_OBJ_SOUNDON), WID_SOUNDON, &::getBooleanCppuType(), 0, 0},\ - { MAP_CHAR_LEN(UNO_NAME_OBJ_SPEED), WID_SPEED, &::getCppuType((const presentation::AnimationSpeed*)0), 0, 0},\ - { MAP_CHAR_LEN(UNO_NAME_OBJ_TEXTEFFECT), WID_TEXTEFFECT, &::getCppuType((const presentation::AnimationEffect*)0), 0, 0},\ - { MAP_CHAR_LEN(UNO_NAME_OBJ_BLUESCREEN), WID_BLUESCREEN, &::getCppuType((const sal_Int32*)0), 0, 0},\ - { MAP_CHAR_LEN(UNO_NAME_OBJ_VERB), WID_VERB, &::getCppuType((const sal_Int32*)0), 0, 0},\ - { MAP_CHAR_LEN("IsAnimation"), WID_ISANIMATION, &::getBooleanCppuType(), 0, 0},\ - { MAP_CHAR_LEN("NavigationOrder"), WID_NAVORDER, &::getCppuType((const sal_Int32*)0), 0, 0},\ + { MAP_CHAR_LEN(UNO_NAME_OBJ_ANIMATIONPATH), WID_ANIMPATH, &ITYPE(drawing::XShape), 0, 0},\ + { MAP_CHAR_LEN(UNO_NAME_OBJ_BOOKMARK), WID_BOOKMARK, &::getCppuType((const OUString*)0), 0, 0},\ + { MAP_CHAR_LEN(UNO_NAME_OBJ_DIMCOLOR), WID_DIMCOLOR, &::getCppuType((const sal_Int32*)0), 0, 0},\ + { MAP_CHAR_LEN(UNO_NAME_OBJ_DIMHIDE), WID_DIMHIDE, &::getBooleanCppuType(), 0, 0},\ + { MAP_CHAR_LEN(UNO_NAME_OBJ_DIMPREV), WID_DIMPREV, &::getBooleanCppuType(), 0, 0},\ + { MAP_CHAR_LEN(UNO_NAME_OBJ_EFFECT), WID_EFFECT, &::getCppuType((const presentation::AnimationEffect*)0), 0, 0},\ + { MAP_CHAR_LEN(UNO_NAME_OBJ_ISEMPTYPRESOBJ),WID_ISEMPTYPRESOBJ, &::getBooleanCppuType(), 0, 0},\ + { MAP_CHAR_LEN(UNO_NAME_OBJ_ISPRESOBJ), WID_ISPRESOBJ, &::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},\ + { MAP_CHAR_LEN(UNO_NAME_OBJ_MASTERDEPENDENT),WID_MASTERDEPEND, &::getBooleanCppuType(), 0, 0},\ + { MAP_CHAR_LEN(UNO_NAME_OBJ_CLICKACTION), WID_CLICKACTION, &::getCppuType((const presentation::ClickAction*)0), 0, 0},\ + { MAP_CHAR_LEN(UNO_NAME_OBJ_PLAYFULL), WID_PLAYFULL, &::getBooleanCppuType(), 0, 0},\ + { MAP_CHAR_LEN(UNO_NAME_OBJ_PRESORDER), WID_PRESORDER, &::getCppuType((const sal_Int32*)0), 0, 0},\ + { MAP_CHAR_LEN(UNO_NAME_OBJ_STYLE), WID_STYLE, &ITYPE( style::XStyle), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},\ + { MAP_CHAR_LEN(UNO_NAME_OBJ_SOUNDFILE), WID_SOUNDFILE, &::getCppuType((const OUString*)0), 0, 0},\ + { MAP_CHAR_LEN(UNO_NAME_OBJ_SOUNDON), WID_SOUNDON, &::getBooleanCppuType(), 0, 0},\ + { MAP_CHAR_LEN(UNO_NAME_OBJ_SPEED), WID_SPEED, &::getCppuType((const presentation::AnimationSpeed*)0), 0, 0},\ + { MAP_CHAR_LEN(UNO_NAME_OBJ_TEXTEFFECT), WID_TEXTEFFECT, &::getCppuType((const presentation::AnimationEffect*)0), 0, 0},\ + { MAP_CHAR_LEN(UNO_NAME_OBJ_BLUESCREEN), WID_BLUESCREEN, &::getCppuType((const sal_Int32*)0), 0, 0},\ + { MAP_CHAR_LEN(UNO_NAME_OBJ_VERB), WID_VERB, &::getCppuType((const sal_Int32*)0), 0, 0},\ + { MAP_CHAR_LEN("IsAnimation"), WID_ISANIMATION, &::getBooleanCppuType(), 0, 0},\ + { MAP_CHAR_LEN("NavigationOrder"), WID_NAVORDER, &::getCppuType((const sal_Int32*)0), 0, 0},\ { 0,0,0,0,0,0} const SfxItemPropertyMapEntry* lcl_GetImpress_SdXShapePropertyGraphicMap_Impl() { - + static const SfxItemPropertyMapEntry aImpress_SdXShapePropertyGraphicMap_Impl[] = { - { MAP_CHAR_LEN("ImageMap"), WID_IMAGEMAP, &::getCppuType((const uno::Reference< container::XIndexContainer >*)0), 0, 0 }, + { MAP_CHAR_LEN("ImageMap"), WID_IMAGEMAP, &::getCppuType((const uno::Reference< container::XIndexContainer >*)0), 0, 0 }, IMPRESS_MAP_ENTRIES }; return aImpress_SdXShapePropertyGraphicMap_Impl; @@ -186,7 +186,7 @@ static SdTypesCache gImplTypesCache; const SfxItemPropertyMapEntry* lcl_GetImpress_SdXShapePropertySimpleMap_Impl() { - + static const SfxItemPropertyMapEntry aImpress_SdXShapePropertySimpleMap_Impl[] = { IMPRESS_MAP_ENTRIES @@ -195,10 +195,10 @@ static SdTypesCache gImplTypesCache; } #define DRAW_MAP_ENTRIES\ - { MAP_CHAR_LEN(UNO_NAME_OBJ_BOOKMARK), WID_BOOKMARK, &::getCppuType((const OUString*)0), 0, 0},\ - { MAP_CHAR_LEN(UNO_NAME_OBJ_CLICKACTION), WID_CLICKACTION, &::getCppuType((const presentation::ClickAction*)0),0, 0},\ - { MAP_CHAR_LEN(UNO_NAME_OBJ_STYLE), WID_STYLE, &ITYPE(style::XStyle), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},\ - { MAP_CHAR_LEN("NavigationOrder"), WID_NAVORDER, &::getCppuType((const sal_Int32*)0), 0, 0},\ + { MAP_CHAR_LEN(UNO_NAME_OBJ_BOOKMARK), WID_BOOKMARK, &::getCppuType((const OUString*)0), 0, 0},\ + { MAP_CHAR_LEN(UNO_NAME_OBJ_CLICKACTION), WID_CLICKACTION, &::getCppuType((const presentation::ClickAction*)0),0, 0},\ + { MAP_CHAR_LEN(UNO_NAME_OBJ_STYLE), WID_STYLE, &ITYPE(style::XStyle), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},\ + { MAP_CHAR_LEN("NavigationOrder"), WID_NAVORDER, &::getCppuType((const sal_Int32*)0), 0, 0},\ { 0,0,0,0,0,0} const SfxItemPropertyMapEntry* lcl_GetDraw_SdXShapePropertySimpleMap_Impl() @@ -213,7 +213,7 @@ static SdTypesCache gImplTypesCache; { static const SfxItemPropertyMapEntry aDraw_SdXShapePropertyGraphicMap_Impl[] = { - { MAP_CHAR_LEN("ImageMap"), WID_IMAGEMAP, &::getCppuType((const uno::Reference< container::XIndexContainer >*)0), 0, 0 }, + { MAP_CHAR_LEN("ImageMap"), WID_IMAGEMAP, &::getCppuType((const uno::Reference< container::XIndexContainer >*)0), 0, 0 }, DRAW_MAP_ENTRIES }; return aDraw_SdXShapePropertyGraphicMap_Impl; @@ -236,7 +236,7 @@ static SdTypesCache gImplTypesCache; pRet = lcl_GetDraw_SdXShapePropertySimpleMap_Impl(); } return pRet; - + } const SvxItemPropertySet* lcl_ImplGetShapePropertySet( sal_Bool bImpress, sal_Bool bGraphicObj ) { @@ -251,7 +251,7 @@ static SdTypesCache gImplTypesCache; else { static SvxItemPropertySet aImpress_SdXShapePropertySet_Impl(lcl_GetImpress_SdXShapePropertySimpleMap_Impl(), SdrObject::GetGlobalDrawObjectItemPool()); - pRet = &aImpress_SdXShapePropertySet_Impl; + pRet = &aImpress_SdXShapePropertySet_Impl; } } else @@ -259,7 +259,7 @@ static SdTypesCache gImplTypesCache; if( bGraphicObj ) { static SvxItemPropertySet aDraw_SdXShapePropertyGraphicSet_Impl(lcl_GetDraw_SdXShapePropertyGraphicMap_Impl(), SdrObject::GetGlobalDrawObjectItemPool()); - pRet = &aDraw_SdXShapePropertyGraphicSet_Impl; + pRet = &aDraw_SdXShapePropertyGraphicSet_Impl; } else { @@ -277,7 +277,7 @@ static SdTypesCache gImplTypesCache; }; return aEmpty_SdXShapePropertyMap_Impl; } - + static const SvxItemPropertySet* lcl_GetEmpty_SdXShapePropertySet_Impl() { static SvxItemPropertySet aEmptyPropSet( lcl_GetEmpty_SdXShapePropertyMap_Impl(), SdrObject::GetGlobalDrawObjectItemPool() ); @@ -302,28 +302,28 @@ const SvEventDescription* ImplGetSupportedMacroItems() \************************************************************************/ struct SortStruct { - SdrObject* pObj; - sal_uInt32 nOrder; + SdrObject* pObj; + sal_uInt32 nOrder; }; -typedef SortStruct SORT; -typedef SORT* PSORT; +typedef SortStruct SORT; +typedef SORT* PSORT; extern "C" int __LOADONCALLAPI SortFunc( const void* p1, const void* p2 ); SdXShape::SdXShape( SvxShape* pShape, SdXImpressDocument* pModel) throw() -: mpShape( pShape ), +: mpShape( pShape ), mpPropSet( pModel? lcl_ImplGetShapePropertySet(pModel->IsImpressDocument(), pShape->getShapeKind() == OBJ_GRAF ) - : lcl_GetEmpty_SdXShapePropertySet_Impl() ), + : lcl_GetEmpty_SdXShapePropertySet_Impl() ), mpMap( pModel? lcl_ImplGetShapePropertyMap(pModel->IsImpressDocument(), pShape->getShapeKind() == OBJ_GRAF ) - : lcl_GetEmpty_SdXShapePropertyMap_Impl() ), + : lcl_GetEmpty_SdXShapePropertyMap_Impl() ), mpModel(pModel), mpImplementationId( NULL ) - + { - + pShape->setMaster( this ); } @@ -469,7 +469,7 @@ uno::Any SAL_CALL SdXShape::getPropertyDefault( const OUString& aPropertyName ) sal_uIntPtr nObjId = (sal_uIntPtr)mpShape->getPropertyMapEntries(); SfxExtItemPropertySetInfo* pInfo = NULL; - SdExtPropertySetInfoCache* pCache = (mpModel && mpModel->IsImpressDocument()) ? + SdExtPropertySetInfoCache* pCache = (mpModel && mpModel->IsImpressDocument()) ? &gImplImpressPropertySetInfoCache : &gImplDrawPropertySetInfoCache; SdExtPropertySetInfoCache::iterator aIter( pCache->find( nObjId ) ); @@ -521,7 +521,7 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName, case WID_EFFECT: { - AnimationEffect eEffect; + AnimationEffect eEffect; if(!(aValue >>= eEffect)) throw lang::IllegalArgumentException(); @@ -530,7 +530,7 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName, } case WID_TEXTEFFECT: { - AnimationEffect eEffect; + AnimationEffect eEffect; if(!(aValue >>= eEffect)) throw lang::IllegalArgumentException(); @@ -546,7 +546,7 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName, EffectMigration::SetAnimationSpeed( mpShape, eSpeed ); break; } -/* TODO?? case WID_ISANIMATION: +/* TODO?? case WID_ISANIMATION: { sal_Bool bIsAnimation; @@ -616,7 +616,7 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName, { sal_Int32 nColor = 0; - if( !(aValue >>= nColor) ) + if( !(aValue >>= nColor) ) throw lang::IllegalArgumentException(); EffectMigration::SetDimColor( mpShape, nColor ); @@ -961,7 +961,7 @@ sal_Bool SdXShape::IsEmptyPresObj() const throw() else { return sal_True; - } + } } return sal_False; @@ -1120,23 +1120,23 @@ uno::Any SdXShape::GetStyleSheet() const throw( beans::UnknownPropertyException class SdUnoEventsAccess : public cppu::WeakImplHelper2< com::sun::star::container::XNameReplace, com::sun::star::lang::XServiceInfo > { private: - const OUString maStrOnClick; - const OUString maStrServiceName; - const OUString maStrEventType; - const OUString maStrPresentation; - const OUString maStrLibrary; - const OUString maStrMacroName; - const OUString maStrClickAction; - const OUString maStrBookmark; - const OUString maStrEffect; - const OUString maStrPlayFull; - const OUString maStrVerb; - const OUString maStrSoundURL; - const OUString maStrSpeed; - const OUString maStrStarBasic; - const OUString maStrScript; - - SdXShape* mpShape; + const OUString maStrOnClick; + const OUString maStrServiceName; + const OUString maStrEventType; + const OUString maStrPresentation; + const OUString maStrLibrary; + const OUString maStrMacroName; + const OUString maStrClickAction; + const OUString maStrBookmark; + const OUString maStrEffect; + const OUString maStrPlayFull; + const OUString maStrVerb; + const OUString maStrSoundURL; + const OUString maStrSpeed; + const OUString maStrStarBasic; + const OUString maStrScript; + + SdXShape* mpShape; uno::Reference< document::XEventsSupplier > mxShape; public: @@ -1144,7 +1144,7 @@ public: // XNameReplace virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - + // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); @@ -1186,16 +1186,16 @@ SdUnoEventsAccess::SdUnoEventsAccess( SdXShape* pShape ) throw() { } -#define FOUND_CLICKACTION 0x0001 -#define FOUND_BOOKMARK 0x0002 -#define FOUND_EFFECT 0x0004 -#define FOUND_PLAYFULL 0x0008 -#define FOUND_VERB 0x0010 -#define FOUND_SOUNDURL 0x0020 -#define FOUND_SPEED 0x0040 -#define FOUND_EVENTTYPE 0x0080 -#define FOUND_MACRO 0x0100 -#define FOUND_LIBRARY 0x0200 +#define FOUND_CLICKACTION 0x0001 +#define FOUND_BOOKMARK 0x0002 +#define FOUND_EFFECT 0x0004 +#define FOUND_PLAYFULL 0x0008 +#define FOUND_VERB 0x0010 +#define FOUND_SOUNDURL 0x0020 +#define FOUND_SPEED 0x0040 +#define FOUND_EVENTTYPE 0x0080 +#define FOUND_MACRO 0x0100 +#define FOUND_LIBRARY 0x0200 static void clearEventsInAnimationInfo( SdAnimationInfo* pInfo ) { @@ -1470,7 +1470,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno { sBuffer.append( aStrLibrary ); } - + pInfo->SetBookmark( sBuffer.makeStringAndClear() ); } bOk = sal_True; @@ -1659,7 +1659,7 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName ) pProperties->Value = aAny; pProperties->State = beans::PropertyState_DIRECT_VALUE; pProperties++; - + // NOTE: no break here!!! case presentation::ClickAction_SOUND: diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index 0e472f41ff16..e6f8f4dd25c4 100755 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ class SdXShape : public SvxShapeMaster, private: SvxShape* mpShape; - const SvxItemPropertySet* mpPropSet; + const SvxItemPropertySet* mpPropSet; const SfxItemPropertyMapEntry* mpMap; SdXImpressDocument* mpModel; @@ -96,7 +96,7 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index fb356087245a..7457b3df8c2b 100755 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -114,7 +114,7 @@ enum WID_PAGE WID_PAGE_BACK, WID_PAGE_PREVIEW, WID_PAGE_PREVIEWBITMAP, WID_PAGE_VISIBLE, WID_PAGE_SOUNDFILE, WID_PAGE_BACKFULL, WID_PAGE_BACKVIS, WID_PAGE_BACKOBJVIS, WID_PAGE_USERATTRIBS, WID_PAGE_BOOKMARK, WID_PAGE_ISDARK, WID_PAGE_HEADERVISIBLE, WID_PAGE_HEADERTEXT, WID_PAGE_FOOTERVISIBLE, WID_PAGE_FOOTERTEXT, - WID_PAGE_PAGENUMBERVISIBLE, WID_PAGE_DATETIMEVISIBLE, WID_PAGE_DATETIMEFIXED, + WID_PAGE_PAGENUMBERVISIBLE, WID_PAGE_DATETIMEVISIBLE, WID_PAGE_DATETIMEFIXED, WID_PAGE_DATETIMETEXT, WID_PAGE_DATETIMEFORMAT, WID_TRANSITION_TYPE, WID_TRANSITION_SUBTYPE, WID_TRANSITION_DIRECTION, WID_TRANSITION_FADE_COLOR, WID_TRANSITION_DURATION, WID_LOOP_SOUND, WID_NAVORDER @@ -135,137 +135,137 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin { static const SfxItemPropertyMapEntry aDrawPagePropertyMap_Impl[] = { - { MAP_CHAR_LEN(UNO_NAME_PAGE_BACKGROUND), WID_PAGE_BACK, &ITYPE( beans::XPropertySet ), beans::PropertyAttribute::MAYBEVOID,0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, &::getCppuType((const sal_Int32*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, &::getCppuType((const sal_Int32*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, &::getCppuType((const sal_Int32*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_CHANGE), WID_PAGE_CHANGE, &::getCppuType((const sal_Int32*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_DURATION), WID_PAGE_DURATION, &::getCppuType((const sal_Int32*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_EFFECT), WID_PAGE_EFFECT, &::getCppuType((const presentation::FadeEffect*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, &::getCppuType((const sal_Int16*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, &ITYPE( awt::XBitmap), beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, &::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, &::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, &::getCppuType((const view::PaperOrientation*)0),0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_SPEED), WID_PAGE_SPEED, &::getCppuType((const presentation::AnimationSpeed*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, &::getCppuType((const sal_Int32*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW, SEQTYPE(::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0)), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_PREVIEWBITMAP), WID_PAGE_PREVIEWBITMAP, SEQTYPE(::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0)), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_VISIBLE), WID_PAGE_VISIBLE, &::getBooleanCppuType(), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_OBJ_SOUNDFILE), WID_PAGE_SOUNDFILE, &::getCppuType((const Any*)0), 0, 0}, - { MAP_CHAR_LEN(sUNO_Prop_IsBackgroundVisible), WID_PAGE_BACKVIS, &::getBooleanCppuType(), 0, 0}, - { MAP_CHAR_LEN(sUNO_Prop_IsBackgroundObjectsVisible), WID_PAGE_BACKOBJVIS, &::getBooleanCppuType(), 0, 0}, - { MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - { MAP_CHAR_LEN(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, &::getCppuType((const OUString*)0), 0, 0}, - { MAP_CHAR_LEN("IsBackgroundDark" ), WID_PAGE_ISDARK, &::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN("IsFooterVisible"), WID_PAGE_FOOTERVISIBLE, &::getBooleanCppuType(), 0, 0}, - { MAP_CHAR_LEN("FooterText"), WID_PAGE_FOOTERTEXT, &::getCppuType((const OUString*)0), 0, 0}, - { MAP_CHAR_LEN("IsPageNumberVisible"), WID_PAGE_PAGENUMBERVISIBLE, &::getBooleanCppuType(), 0, 0}, - { MAP_CHAR_LEN("IsDateTimeVisible"), WID_PAGE_DATETIMEVISIBLE, &::getBooleanCppuType(), 0, 0}, - { MAP_CHAR_LEN("IsDateTimeFixed"), WID_PAGE_DATETIMEFIXED, &::getBooleanCppuType(), 0, 0}, - { MAP_CHAR_LEN("DateTimeText"), WID_PAGE_DATETIMETEXT, &::getCppuType((const OUString*)0), 0, 0}, - { MAP_CHAR_LEN("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, &::getCppuType((const sal_Int32*)0), 0, 0}, - { MAP_CHAR_LEN("TransitionType"), WID_TRANSITION_TYPE, &::getCppuType((const sal_Int16*)0), 0, 0}, - { MAP_CHAR_LEN("TransitionSubtype"), WID_TRANSITION_SUBTYPE, &::getCppuType((const sal_Int16*)0), 0, 0}, - { MAP_CHAR_LEN("TransitionDirection"), WID_TRANSITION_DIRECTION, &::getCppuType((const sal_Bool*)0), 0, 0}, - { MAP_CHAR_LEN("TransitionFadeColor"), WID_TRANSITION_FADE_COLOR, &::getCppuType((const sal_Int32*)0), 0, 0}, - { MAP_CHAR_LEN("TransitionDuration"), WID_TRANSITION_DURATION, &::getCppuType((const double*)0), 0, 0}, - { MAP_CHAR_LEN("LoopSound"), WID_LOOP_SOUND, &::getBooleanCppuType(), 0, 0}, - { MAP_CHAR_LEN("NavigationOrder"), WID_NAVORDER, &::com::sun::star::container::XIndexAccess::static_type(),0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_BACKGROUND), WID_PAGE_BACK, &ITYPE( beans::XPropertySet ), beans::PropertyAttribute::MAYBEVOID,0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_CHANGE), WID_PAGE_CHANGE, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_DURATION), WID_PAGE_DURATION, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_EFFECT), WID_PAGE_EFFECT, &::getCppuType((const presentation::FadeEffect*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, &::getCppuType((const sal_Int16*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, &ITYPE( awt::XBitmap), beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, &::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, &::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, &::getCppuType((const view::PaperOrientation*)0),0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_SPEED), WID_PAGE_SPEED, &::getCppuType((const presentation::AnimationSpeed*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW, SEQTYPE(::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0)), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_PREVIEWBITMAP), WID_PAGE_PREVIEWBITMAP, SEQTYPE(::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0)), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_VISIBLE), WID_PAGE_VISIBLE, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_OBJ_SOUNDFILE), WID_PAGE_SOUNDFILE, &::getCppuType((const Any*)0), 0, 0}, + { MAP_CHAR_LEN(sUNO_Prop_IsBackgroundVisible), WID_PAGE_BACKVIS, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN(sUNO_Prop_IsBackgroundObjectsVisible), WID_PAGE_BACKOBJVIS, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { MAP_CHAR_LEN(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN("IsBackgroundDark" ), WID_PAGE_ISDARK, &::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN("IsFooterVisible"), WID_PAGE_FOOTERVISIBLE, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN("FooterText"), WID_PAGE_FOOTERTEXT, &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN("IsPageNumberVisible"), WID_PAGE_PAGENUMBERVISIBLE, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN("IsDateTimeVisible"), WID_PAGE_DATETIMEVISIBLE, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN("IsDateTimeFixed"), WID_PAGE_DATETIMEFIXED, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN("DateTimeText"), WID_PAGE_DATETIMETEXT, &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN("TransitionType"), WID_TRANSITION_TYPE, &::getCppuType((const sal_Int16*)0), 0, 0}, + { MAP_CHAR_LEN("TransitionSubtype"), WID_TRANSITION_SUBTYPE, &::getCppuType((const sal_Int16*)0), 0, 0}, + { MAP_CHAR_LEN("TransitionDirection"), WID_TRANSITION_DIRECTION, &::getCppuType((const sal_Bool*)0), 0, 0}, + { MAP_CHAR_LEN("TransitionFadeColor"), WID_TRANSITION_FADE_COLOR, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN("TransitionDuration"), WID_TRANSITION_DURATION, &::getCppuType((const double*)0), 0, 0}, + { MAP_CHAR_LEN("LoopSound"), WID_LOOP_SOUND, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN("NavigationOrder"), WID_NAVORDER, &::com::sun::star::container::XIndexAccess::static_type(),0, 0}, {0,0,0,0,0,0} }; -#define DRAW_PAGE_NOTES_PROPERTIES \ - { MAP_CHAR_LEN(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, &::getCppuType((const sal_Int32*)0), 0, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, &::getCppuType((const sal_Int32*)0), 0, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, &::getCppuType((const sal_Int32*)0), 0, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, &::getCppuType((const sal_Int16*)0), 0, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, &ITYPE( awt::XBitmap), beans::PropertyAttribute::READONLY, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, &::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, &::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, &::getCppuType((const view::PaperOrientation*)0),0, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, &::getCppuType((const sal_Int32*)0), 0, 0}, \ - { MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},\ - { MAP_CHAR_LEN("IsHeaderVisible"), WID_PAGE_HEADERVISIBLE, &::getBooleanCppuType(), 0, 0}, \ - { MAP_CHAR_LEN("HeaderText"), WID_PAGE_HEADERTEXT, &::getCppuType((const OUString*)0), 0, 0}, \ - { MAP_CHAR_LEN("IsBackgroundDark" ), WID_PAGE_ISDARK, &::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, \ - { MAP_CHAR_LEN("IsFooterVisible"), WID_PAGE_FOOTERVISIBLE, &::getBooleanCppuType(), 0, 0}, \ - { MAP_CHAR_LEN("FooterText"), WID_PAGE_FOOTERTEXT, &::getCppuType((const OUString*)0), 0, 0}, \ - { MAP_CHAR_LEN("IsPageNumberVisible"), WID_PAGE_PAGENUMBERVISIBLE, &::getBooleanCppuType(), 0, 0}, \ - { MAP_CHAR_LEN("IsDateTimeVisible"), WID_PAGE_DATETIMEVISIBLE, &::getBooleanCppuType(), 0, 0}, \ - { MAP_CHAR_LEN("IsDateTimeFixed"), WID_PAGE_DATETIMEFIXED, &::getBooleanCppuType(), 0, 0}, \ - { MAP_CHAR_LEN("DateTimeText"), WID_PAGE_DATETIMETEXT, &::getCppuType((const OUString*)0), 0, 0}, \ - { MAP_CHAR_LEN("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, &::getCppuType((const sal_Int32*)0), 0, 0}, \ - { MAP_CHAR_LEN("NavigationOrder"), WID_NAVORDER, &::com::sun::star::container::XIndexAccess::static_type(),0, 0}, \ +#define DRAW_PAGE_NOTES_PROPERTIES \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, &::getCppuType((const sal_Int16*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, &ITYPE( awt::XBitmap), beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, &::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, &::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, &::getCppuType((const view::PaperOrientation*)0),0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},\ + { MAP_CHAR_LEN("IsHeaderVisible"), WID_PAGE_HEADERVISIBLE, &::getBooleanCppuType(), 0, 0}, \ + { MAP_CHAR_LEN("HeaderText"), WID_PAGE_HEADERTEXT, &::getCppuType((const OUString*)0), 0, 0}, \ + { MAP_CHAR_LEN("IsBackgroundDark" ), WID_PAGE_ISDARK, &::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN("IsFooterVisible"), WID_PAGE_FOOTERVISIBLE, &::getBooleanCppuType(), 0, 0}, \ + { MAP_CHAR_LEN("FooterText"), WID_PAGE_FOOTERTEXT, &::getCppuType((const OUString*)0), 0, 0}, \ + { MAP_CHAR_LEN("IsPageNumberVisible"), WID_PAGE_PAGENUMBERVISIBLE, &::getBooleanCppuType(), 0, 0}, \ + { MAP_CHAR_LEN("IsDateTimeVisible"), WID_PAGE_DATETIMEVISIBLE, &::getBooleanCppuType(), 0, 0}, \ + { MAP_CHAR_LEN("IsDateTimeFixed"), WID_PAGE_DATETIMEFIXED, &::getBooleanCppuType(), 0, 0}, \ + { MAP_CHAR_LEN("DateTimeText"), WID_PAGE_DATETIMETEXT, &::getCppuType((const OUString*)0), 0, 0}, \ + { MAP_CHAR_LEN("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN("NavigationOrder"), WID_NAVORDER, &::com::sun::star::container::XIndexAccess::static_type(),0, 0}, \ {0,0,0,0,0,0} static const SfxItemPropertyMapEntry aDrawPageNotesHandoutPropertyMap_Impl[] = { // this must be the first two entries so they can be excluded for PK_STANDARD - { MAP_CHAR_LEN(UNO_NAME_PAGE_BACKGROUND), WID_PAGE_BACK, &ITYPE( beans::XPropertySet ), beans::PropertyAttribute::MAYBEVOID,0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_BACKGROUND), WID_PAGE_BACK, &ITYPE( beans::XPropertySet ), beans::PropertyAttribute::MAYBEVOID,0}, DRAW_PAGE_NOTES_PROPERTIES }; static const SfxItemPropertyMapEntry aDrawPageNotesHandoutPropertyNoBackMap_Impl[] = { DRAW_PAGE_NOTES_PROPERTIES }; - + #define GRAPHIC_PAGE_PROPERTIES \ - { MAP_CHAR_LEN(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, &::getCppuType((const sal_Int32*)0), 0, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, &::getCppuType((const sal_Int32*)0), 0, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, &::getCppuType((const sal_Int32*)0), 0, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, &ITYPE(awt::XBitmap), beans::PropertyAttribute::READONLY, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, &::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, &::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, &::getCppuType((const view::PaperOrientation*)0),0, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, &::getCppuType((const sal_Int32*)0), 0, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW, SEQTYPE(::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0)), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_PAGE_PREVIEWBITMAP), WID_PAGE_PREVIEWBITMAP, SEQTYPE(::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0)), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},\ - { MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, \ - { MAP_CHAR_LEN(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, &::getCppuType((const OUString*)0), 0, 0}, \ - { MAP_CHAR_LEN("IsBackgroundDark" ), WID_PAGE_ISDARK, &::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, \ - { MAP_CHAR_LEN("NavigationOrder"), WID_NAVORDER, &::com::sun::star::container::XIndexAccess::static_type(),0, 0}, \ - {0,0,0,0,0,0} + { MAP_CHAR_LEN(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, &ITYPE(awt::XBitmap), beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, &::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, &::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, &::getCppuType((const view::PaperOrientation*)0),0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, &::getCppuType((const sal_Int32*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW, SEQTYPE(::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0)), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_PAGE_PREVIEWBITMAP), WID_PAGE_PREVIEWBITMAP, SEQTYPE(::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0)), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},\ + { MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, \ + { MAP_CHAR_LEN(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, &::getCppuType((const OUString*)0), 0, 0}, \ + { MAP_CHAR_LEN("IsBackgroundDark" ), WID_PAGE_ISDARK, &::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN("NavigationOrder"), WID_NAVORDER, &::com::sun::star::container::XIndexAccess::static_type(),0, 0}, \ + {0,0,0,0,0,0} static const SfxItemPropertyMapEntry aGraphicPagePropertyMap_Impl[] = { - { MAP_CHAR_LEN(UNO_NAME_PAGE_BACKGROUND), WID_PAGE_BACK, &ITYPE( beans::XPropertySet), beans::PropertyAttribute::MAYBEVOID,0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_BACKGROUND), WID_PAGE_BACK, &ITYPE( beans::XPropertySet), beans::PropertyAttribute::MAYBEVOID,0}, GRAPHIC_PAGE_PROPERTIES }; - static const SfxItemPropertyMapEntry aGraphicPagePropertyNoBackMap_Impl[] = + static const SfxItemPropertyMapEntry aGraphicPagePropertyNoBackMap_Impl[] = { GRAPHIC_PAGE_PROPERTIES }; // bool bWithoutBackground = ePageKind != PK_STANDARD && ePageKind != PK_HANDOUT; - const SvxItemPropertySet* pRet = 0; + const SvxItemPropertySet* pRet = 0; if( bImpress ) { if( ePageKind == PK_STANDARD ) { //PK_STANDARD always has a background property static SvxItemPropertySet aDrawPagePropertySet_Impl( aDrawPagePropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); - pRet = &aDrawPagePropertySet_Impl; + pRet = &aDrawPagePropertySet_Impl; } else { if(bWithoutBackground) { static SvxItemPropertySet aDrawPageNotesHandoutPropertyNoBackSet_Impl( aDrawPageNotesHandoutPropertyNoBackMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); - pRet = &aDrawPageNotesHandoutPropertyNoBackSet_Impl; - } + pRet = &aDrawPageNotesHandoutPropertyNoBackSet_Impl; + } else { static SvxItemPropertySet aDrawPageNotesHandoutPropertySet_Impl( aDrawPageNotesHandoutPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); - pRet = &aDrawPageNotesHandoutPropertySet_Impl; - } + pRet = &aDrawPageNotesHandoutPropertySet_Impl; + } } } else @@ -273,13 +273,13 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin if(bWithoutBackground) { static SvxItemPropertySet aGraphicPagePropertyNoBackSet_Impl( aGraphicPagePropertyNoBackMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); - pRet = &aGraphicPagePropertyNoBackSet_Impl; - } + pRet = &aGraphicPagePropertyNoBackSet_Impl; + } else { static SvxItemPropertySet aGraphicPagePropertySet_Impl( aGraphicPagePropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); - pRet = &aGraphicPagePropertySet_Impl; - } + pRet = &aGraphicPagePropertySet_Impl; + } } return pRet; } @@ -289,45 +289,45 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind ) { static const SfxItemPropertyMapEntry aMasterPagePropertyMap_Impl[] = { - { MAP_CHAR_LEN(UNO_NAME_PAGE_BACKGROUND), WID_PAGE_BACK, &ITYPE(beans::XPropertySet), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, &::getCppuType((const sal_Int32*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, &::getCppuType((const sal_Int32*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, &::getCppuType((const sal_Int32*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, &ITYPE(awt::XBitmap), beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, &::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, &::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, &::getCppuType((const view::PaperOrientation*)0),0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, &::getCppuType((const sal_Int32*)0), 0, 0}, - { MAP_CHAR_LEN("BackgroundFullSize"), WID_PAGE_BACKFULL, &::getBooleanCppuType(), 0, 0}, - { MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - { MAP_CHAR_LEN("IsBackgroundDark" ), WID_PAGE_ISDARK, &::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_BACKGROUND), WID_PAGE_BACK, &ITYPE(beans::XPropertySet), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, &ITYPE(awt::XBitmap), beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, &::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, &::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, &::getCppuType((const view::PaperOrientation*)0),0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN("BackgroundFullSize"), WID_PAGE_BACKFULL, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { MAP_CHAR_LEN("IsBackgroundDark" ), WID_PAGE_ISDARK, &::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, {0,0,0,0,0,0} }; static const SfxItemPropertyMapEntry aHandoutMasterPagePropertyMap_Impl[] = { - { MAP_CHAR_LEN(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, &::getCppuType((const sal_Int32*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, &::getCppuType((const sal_Int32*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, &::getCppuType((const sal_Int32*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, &::getCppuType((const view::PaperOrientation*)0),0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, &::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, &::getCppuType((const sal_Int32*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, &::getCppuType((const sal_Int16*)0), 0, 0}, - { MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - { MAP_CHAR_LEN("IsBackgroundDark" ), WID_PAGE_ISDARK, &::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN("IsHeaderVisible"), WID_PAGE_HEADERVISIBLE, &::getBooleanCppuType(), 0, 0}, - { MAP_CHAR_LEN("HeaderText"), WID_PAGE_HEADERTEXT, &::getCppuType((const OUString*)0), 0, 0}, - { MAP_CHAR_LEN("IsFooterVisible"), WID_PAGE_FOOTERVISIBLE, &::getBooleanCppuType(), 0, 0}, - { MAP_CHAR_LEN("FooterText"), WID_PAGE_FOOTERTEXT, &::getCppuType((const OUString*)0), 0, 0}, - { MAP_CHAR_LEN("IsPageNumberVisible"), WID_PAGE_PAGENUMBERVISIBLE, &::getBooleanCppuType(), 0, 0}, - { MAP_CHAR_LEN("IsDateTimeVisible"), WID_PAGE_DATETIMEVISIBLE, &::getBooleanCppuType(), 0, 0}, - { MAP_CHAR_LEN("IsDateTimeFixed"), WID_PAGE_DATETIMEFIXED, &::getBooleanCppuType(), 0, 0}, - { MAP_CHAR_LEN("DateTimeText"), WID_PAGE_DATETIMETEXT, &::getCppuType((const OUString*)0), 0, 0}, - { MAP_CHAR_LEN("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, &::getCppuType((const view::PaperOrientation*)0),0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, &::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, &::getCppuType((const sal_Int32*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, &::getCppuType((const sal_Int16*)0), 0, 0}, + { MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + { MAP_CHAR_LEN("IsBackgroundDark" ), WID_PAGE_ISDARK, &::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN("IsHeaderVisible"), WID_PAGE_HEADERVISIBLE, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN("HeaderText"), WID_PAGE_HEADERTEXT, &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN("IsFooterVisible"), WID_PAGE_FOOTERVISIBLE, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN("FooterText"), WID_PAGE_FOOTERTEXT, &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN("IsPageNumberVisible"), WID_PAGE_PAGENUMBERVISIBLE, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN("IsDateTimeVisible"), WID_PAGE_DATETIMEVISIBLE, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN("IsDateTimeFixed"), WID_PAGE_DATETIMEFIXED, &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN("DateTimeText"), WID_PAGE_DATETIMETEXT, &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, &::getCppuType((const sal_Int32*)0), 0, 0}, {0,0,0,0,0,0} }; @@ -335,12 +335,12 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind ) if( ePageKind == PK_HANDOUT ) { static SvxItemPropertySet aHandoutMasterPagePropertySet_Impl( aHandoutMasterPagePropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); - pRet = &aHandoutMasterPagePropertySet_Impl; + pRet = &aHandoutMasterPagePropertySet_Impl; } else { static SvxItemPropertySet aMasterPagePropertySet_Impl( aMasterPagePropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); - pRet = &aMasterPagePropertySet_Impl; + pRet = &aMasterPagePropertySet_Impl; } return pRet; } @@ -378,12 +378,12 @@ sal_Int64 SAL_CALL SdGenericDrawPage::getSomething( const ::com::sun::star::uno: * * ***********************************************************************/ SdGenericDrawPage::SdGenericDrawPage( SdXImpressDocument* _pModel, SdPage* pInPage, const SvxItemPropertySet* _pSet ) throw() -: SvxFmDrawPage( (SdrPage*) pInPage ), +: SvxFmDrawPage( (SdrPage*) pInPage ), SdUnoSearchReplaceShape(this), - mpModel ( _pModel ), + mpModel ( _pModel ), mpSdrModel(0), mnTempPageNumber(0), - mpPropSet ( _pSet ), + mpPropSet ( _pSet ), mbIsImpressDocument(false) { mpSdrModel = SvxFmDrawPage::mpModel; @@ -720,7 +720,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName } case WID_PAGE_VISIBLE : { - sal_Bool bVisible = sal_False; + sal_Bool bVisible = sal_False; if( ! ( aValue >>= bVisible ) ) throw lang::IllegalArgumentException(); GetPage()->SetExcluded( bVisible == FALSE ); @@ -744,7 +744,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName break; } } - + throw lang::IllegalArgumentException(); } @@ -759,7 +759,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName } case WID_PAGE_BACKFULL: { - sal_Bool bFullSize = sal_False; + sal_Bool bFullSize = sal_False; if( ! ( aValue >>= bFullSize ) ) throw lang::IllegalArgumentException(); GetPage()->SetBackgroundFullSize( bFullSize ); @@ -1107,8 +1107,8 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) pDocShell->GetPreviewMetaFile(); if ( pMetaFile ) { - Point aPoint; - Size aSize( GetPage()->GetSize() ); + Point aPoint; + Size aSize( GetPage()->GetSize() ); pMetaFile->AddAction( (MetaAction*) new MetaFillColorAction( COL_WHITE, TRUE ), 0 ); pMetaFile->AddAction( (MetaAction*) new MetaRectAction( Rectangle( aPoint, aSize ) ), 1 ); pMetaFile->SetPrefMapMode( MAP_100TH_MM ); @@ -2076,7 +2076,7 @@ Any SAL_CALL SdDrawPage::queryInterface( const uno::Type & rType ) if( mbIsImpressDocument ) { const PageKind ePageKind = GetPage() ? GetPage()->GetPageKind() : PK_STANDARD; - + if( ePageKind != PK_HANDOUT && rType == ITYPE( presentation::XPresentationPage ) ) { return makeAny( Reference< presentation::XPresentationPage >( this ) ); @@ -2349,7 +2349,7 @@ void SAL_CALL SdDrawPage::setName( const OUString& rName ) ::sd::ViewShell* pViewSh = pDocSh ? pDocSh->GetViewShell() : NULL; if( pViewSh && pViewSh->ISA(::sd::DrawViewShell)) { - ::sd::DrawViewShell* pDrawViewSh = static_cast< + ::sd::DrawViewShell* pDrawViewSh = static_cast< ::sd::DrawViewShell*>(pViewSh); EditMode eMode = pDrawViewSh->GetEditMode(); @@ -2386,8 +2386,8 @@ Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getMasterPage( ) if(GetPage()) { - Reference< drawing::XDrawPages > xPages( GetModel()->getMasterPages() ); - Reference< drawing::XDrawPage > xPage; + Reference< drawing::XDrawPages > xPages( GetModel()->getMasterPages() ); + Reference< drawing::XDrawPage > xPage; if(SvxFmDrawPage::mpPage->TRG_HasMasterPage()) { @@ -2560,7 +2560,7 @@ void SdDrawPage::setBackground( const Any& rValue ) pBackground->fillItemSet( (SdDrawDocument*)GetPage()->GetModel(), aSet ); } -//-/ pObj->NbcSetAttributes( aSet, sal_False ); +//-/ pObj->NbcSetAttributes( aSet, sal_False ); if( aSet.Count() == 0 ) { // no background fill, represent by setting XFILL_NONE @@ -2583,7 +2583,7 @@ Reference< XAnnotation > SAL_CALL SdGenericDrawPage::createAndInsertAnnotation() { if( !GetPage() ) throw DisposedException(); - + Reference< XAnnotation > xRet; GetPage()->createAnnotation(xRet); return xRet; @@ -2612,7 +2612,7 @@ void SdDrawPage::getBackground( Any& rValue ) throw() { // there is a fill set, export to rValue Reference< beans::XPropertySet > xSet(new SdUnoPageBackground( - GetModel()->GetDoc(), + GetModel()->GetDoc(), &GetPage()->getSdrPageProperties().GetItemSet())); rValue <<= xSet; } @@ -2784,7 +2784,7 @@ Sequence< uno::Type > SAL_CALL SdMasterPage::getTypes() throw(uno::RuntimeExcept aTypes.push_back(ITYPE(document::XLinkTargetSupplier)); aTypes.push_back(ITYPE( drawing::XShapeCombiner )); aTypes.push_back(ITYPE( drawing::XShapeBinder )); - aTypes.push_back(ITYPE( office::XAnnotationAccess )); + aTypes.push_back(ITYPE( office::XAnnotationAccess )); aTypes.push_back(ITYPE( beans::XMultiPropertySet )); if( bPresPage ) aTypes.push_back(ITYPE(presentation::XPresentationPage)); @@ -2916,13 +2916,13 @@ void SdMasterPage::setBackground( const Any& rValue ) Reference< beans::XPropertyState > xSetStates( xInputSet, UNO_QUERY ); PropertyEntryVector_t aBackgroundProperties = ImplGetPageBackgroundPropertySet()->getPropertyMap()->getPropertyEntries(); - PropertyEntryVector_t::const_iterator aIt = aBackgroundProperties.begin(); + PropertyEntryVector_t::const_iterator aIt = aBackgroundProperties.begin(); while( aIt != aBackgroundProperties.end() ) { if( xSetInfo->hasPropertyByName( aIt->sName ) ) { if( !xSetStates.is() || xSetStates->getPropertyState( aIt->sName ) == beans::PropertyState_DIRECT_VALUE ) - xStyleSet->setPropertyValue( aIt->sName, xInputSet->getPropertyValue( aIt->sName ) ); + xStyleSet->setPropertyValue( aIt->sName, xInputSet->getPropertyValue( aIt->sName ) ); else xSetStates->setPropertyToDefault( aIt->sName ); } @@ -3075,7 +3075,7 @@ void SAL_CALL SdMasterPage::setName( const OUString& aName ) ::sd::ViewShell* pViewSh = pDocSh ? pDocSh->GetViewShell() : NULL; if( pViewSh && pViewSh->ISA(::sd::DrawViewShell ) ) { - ::sd::DrawViewShell* pDrawViewSh = + ::sd::DrawViewShell* pDrawViewSh = static_cast< ::sd::DrawViewShell*>(pViewSh); EditMode eMode = pDrawViewSh->GetEditMode(); diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx index e3fda70c0f11..b50a1281f890 100755 --- a/sd/source/ui/unoidl/unopage.hxx +++ b/sd/source/ui/unoidl/unopage.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ struct SfxItemPropertySimpleEntry; class SdGenericDrawPage : public SvxFmDrawPage, public SdUnoSearchReplaceShape, public ::com::sun::star::drawing::XShapeCombiner, - public ::com::sun::star::drawing::XShapeBinder, + public ::com::sun::star::drawing::XShapeBinder, public ::com::sun::star::container::XNamed, public ::com::sun::star::beans::XPropertySet, public ::com::sun::star::beans::XMultiPropertySet, @@ -79,7 +79,7 @@ private: protected: friend class SdXImpressDocument; - const SvxItemPropertySet* mpPropSet; + const SvxItemPropertySet* mpPropSet; virtual void setBackground( const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::lang::IllegalArgumentException); virtual void getBackground( ::com::sun::star::uno::Any& rValue ) throw(); @@ -95,7 +95,7 @@ protected: void SetWidth( sal_Int32 nWidth ); void SetHeight( sal_Int32 nHeight ); - bool mbIsImpressDocument; + bool mbIsImpressDocument; virtual void disposing() throw(); diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 1ac62fb1363f..acfc05b64fd5 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,17 +59,17 @@ const SvxItemPropertySet* ImplGetPageBackgroundPropertySet() {0,0,0,0,0,0} }; - static SvxItemPropertySet aPageBackgroundPropertySet_Impl( aPageBackgroundPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); + static SvxItemPropertySet aPageBackgroundPropertySet_Impl( aPageBackgroundPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); return &aPageBackgroundPropertySet_Impl; } UNO3_GETIMPLEMENTATION_IMPL( SdUnoPageBackground ); -SdUnoPageBackground::SdUnoPageBackground( - SdDrawDocument* pDoc /* = NULL */, +SdUnoPageBackground::SdUnoPageBackground( + SdDrawDocument* pDoc /* = NULL */, const SfxItemSet* pSet /* = NULL */) throw() -: mpPropSet(ImplGetPageBackgroundPropertySet()), - mpSet(NULL), +: mpPropSet(ImplGetPageBackgroundPropertySet()), + mpSet(NULL), mpDoc(pDoc) { if( pDoc ) @@ -119,7 +119,7 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) mpDoc = pDoc; mpSet = new SfxItemSet( *rSet.GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST ); - + if( mpPropSet->AreThereOwnUsrAnys() ) { uno::Any* pAny; @@ -251,7 +251,7 @@ void SAL_CALL SdUnoPageBackground::setPropertyValue( const OUString& aPropertyNa } SfxItemPool& rPool = *mpSet->GetPool(); - SfxItemSet aSet( rPool, pEntry->nWID, pEntry->nWID); + SfxItemSet aSet( rPool, pEntry->nWID, pEntry->nWID); aSet.Put( *mpSet ); if( !aSet.Count() ) @@ -314,14 +314,14 @@ uno::Any SAL_CALL SdUnoPageBackground::getPropertyValue( const OUString& Propert else { SfxItemPool& rPool = *mpSet->GetPool(); - SfxItemSet aSet( rPool, pEntry->nWID, pEntry->nWID); + SfxItemSet aSet( rPool, pEntry->nWID, pEntry->nWID); aSet.Put( *mpSet ); if( !aSet.Count() ) aSet.Put( rPool.GetDefaultItem( pEntry->nWID ) ); // Hole Wert aus ItemSet - aAny = SvxItemPropertySet_getPropertyValue( *mpPropSet, pEntry, aSet ); + aAny = SvxItemPropertySet_getPropertyValue( *mpPropSet, pEntry, aSet ); } } else @@ -372,8 +372,8 @@ beans::PropertyState SAL_CALL SdUnoPageBackground::getPropertyState( const OUStr case SFX_ITEM_DEFAULT: return beans::PropertyState_DEFAULT_VALUE; default: -// case SFX_ITEM_DONTCARE: -// case SFX_ITEM_DISABLED: +// case SFX_ITEM_DONTCARE: +// case SFX_ITEM_DISABLED: return beans::PropertyState_AMBIGUOUS_VALUE; } } @@ -446,10 +446,10 @@ uno::Any SAL_CALL SdUnoPageBackground::getPropertyDefault( const OUString& aProp else { SfxItemPool& rPool = *mpSet->GetPool(); - SfxItemSet aSet( rPool, pEntry->nWID, pEntry->nWID); + SfxItemSet aSet( rPool, pEntry->nWID, pEntry->nWID); aSet.Put( rPool.GetDefaultItem( pEntry->nWID ) ); - - aAny = SvxItemPropertySet_getPropertyValue( *mpPropSet, pEntry, aSet ); + + aAny = SvxItemPropertySet_getPropertyValue( *mpPropSet, pEntry, aSet ); } } return aAny; diff --git a/sd/source/ui/unoidl/unopback.hxx b/sd/source/ui/unoidl/unopback.hxx index 530a75856662..b344e532c61d 100644 --- a/sd/source/ui/unoidl/unopback.hxx +++ b/sd/source/ui/unoidl/unopback.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ const SvxItemPropertySet* ImplGetPageBackgroundPropertySet(); class SdDrawDocument; class SfxItemSet; -class SdUnoPageBackground : public ::cppu::WeakImplHelper4< +class SdUnoPageBackground : public ::cppu::WeakImplHelper4< ::com::sun::star::beans::XPropertySet, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::beans::XPropertyState, @@ -52,8 +52,8 @@ class SdUnoPageBackground : public ::cppu::WeakImplHelper4< { protected: const SvxItemPropertySet* mpPropSet; - SfxItemSet* mpSet; - SdrModel* mpDoc; + SfxItemSet* mpSet; + SdrModel* mpDoc; const SfxItemPropertySimpleEntry* getPropertyMapEntry( const ::rtl::OUString& rPropertyName ) const throw(); public: diff --git a/sd/source/ui/unoidl/unopool.cxx b/sd/source/ui/unoidl/unopool.cxx index 21ac567edc70..545b4ea360d0 100644 --- a/sd/source/ui/unoidl/unopool.cxx +++ b/sd/source/ui/unoidl/unopool.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,18 +41,18 @@ using namespace ::comphelper; LanguageType SdUnoGetLanguage( const lang::Locale& rLocale ) { - // empty language -> LANGUAGE_SYSTEM + // empty language -> LANGUAGE_SYSTEM if ( rLocale.Language.getLength() == 0 ) return LANGUAGE_SYSTEM; LanguageType eRet = MsLangId::convertLocaleToLanguage( rLocale ); if ( eRet == LANGUAGE_NONE ) - eRet = LANGUAGE_SYSTEM; //! or throw an exception? + eRet = LANGUAGE_SYSTEM; //! or throw an exception? return eRet; } -class SdUnoDrawPool : public SvxUnoDrawPool +class SdUnoDrawPool : public SvxUnoDrawPool { public: SdUnoDrawPool( SdDrawDocument* pModel ) throw(); @@ -86,7 +86,7 @@ void SdUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEnt lang::Locale aLocale; if( rValue >>= aLocale ) mpDrawModel->SetLanguage( - SdUnoGetLanguage( aLocale ), + SdUnoGetLanguage( aLocale ), (const USHORT)pEntry->mnHandle ); } } diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index 56133e03a375..546eb6ee34fa 100755 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,17 +47,17 @@ using namespace ::vos; using namespace ::rtl; using namespace ::com::sun::star; -#define WID_SEARCH_BACKWARDS 0 -#define WID_SEARCH_CASE 1 -#define WID_SEARCH_WORDS 2 +#define WID_SEARCH_BACKWARDS 0 +#define WID_SEARCH_CASE 1 +#define WID_SEARCH_WORDS 2 const SfxItemPropertyMapEntry* ImplGetSearchPropertyMap() { static const SfxItemPropertyMapEntry aSearchPropertyMap_Impl[] = { - { MAP_CHAR_LEN(UNO_NAME_SEARCH_BACKWARDS), WID_SEARCH_BACKWARDS, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN(UNO_NAME_SEARCH_CASE), WID_SEARCH_CASE, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN(UNO_NAME_SEARCH_WORDS), WID_SEARCH_WORDS, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN(UNO_NAME_SEARCH_BACKWARDS), WID_SEARCH_BACKWARDS, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN(UNO_NAME_SEARCH_CASE), WID_SEARCH_CASE, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN(UNO_NAME_SEARCH_WORDS), WID_SEARCH_WORDS, &::getBooleanCppuType(), 0, 0 }, { 0,0,0,0,0,0} }; @@ -68,7 +68,7 @@ class SearchContext_impl { uno::Reference< drawing::XShapes > mxShapes; sal_Int32 mnIndex; - SearchContext_impl* mpParent; + SearchContext_impl* mpParent; public: SearchContext_impl( uno::Reference< drawing::XShapes > xShapes, SearchContext_impl* pParent = NULL ) @@ -91,7 +91,7 @@ public: } return xShape; } - + SearchContext_impl* getParent() const { return mpParent; } }; @@ -123,7 +123,7 @@ sal_Int32 SAL_CALL SdUnoSearchReplaceShape::replaceAll( const uno::Reference< ut if( pDescr == NULL ) return 0; - sal_Int32 nFound = 0; + sal_Int32 nFound = 0; uno::Reference< drawing::XShapes > xShapes; uno::Reference< drawing::XShape > xShape; @@ -627,7 +627,7 @@ uno::Reference< text::XTextRange > SdUnoSearchReplaceShape::Search( uno::Refere xFound = (text::XText*)pRange; pRange->SetSelection(aSelection); -// pDescr->SetStartPos( nEndPos ); +// pDescr->SetStartPos( nEndPos ); } } else diff --git a/sd/source/ui/unoidl/unowcntr.cxx b/sd/source/ui/unoidl/unowcntr.cxx index e29ee1e1516e..e53d336f7c98 100755 --- a/sd/source/ui/unoidl/unowcntr.cxx +++ b/sd/source/ui/unoidl/unowcntr.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ void SvUnoWeakContainer::insert( uno::WeakReference< uno::XInterface > xRef ) th mpList->Insert( new uno::WeakReference< uno::XInterface >( xRef ) ); } -/** searches the container for a ref that returns true on the given +/** searches the container for a ref that returns true on the given search function */ sal_Bool SvUnoWeakContainer::findRef( uno::WeakReference< uno::XInterface >& rRef, void* pSearchData, weakref_searchfunc pSearchFunc ) diff --git a/sd/source/ui/unoidl/unowcntr.hxx b/sd/source/ui/unoidl/unowcntr.hxx index a35c27cfd583..5276015eec7e 100755 --- a/sd/source/ui/unoidl/unowcntr.hxx +++ b/sd/source/ui/unoidl/unowcntr.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,19 +37,19 @@ class WeakRefList; class SvUnoWeakContainer { private: - WeakRefList* mpList; + WeakRefList* mpList; public: SvUnoWeakContainer() throw(); ~SvUnoWeakContainer() throw(); /** inserts the given ref into this container */ - void insert( ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > xRef ) throw(); + void insert( ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > xRef ) throw(); - /** searches the container for a ref that returns true on the given + /** searches the container for a ref that returns true on the given search function */ - sal_Bool findRef( ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface >& rRef, void* pSearchData, weakref_searchfunc pSearchFunc ); + sal_Bool findRef( ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface >& rRef, void* pSearchData, weakref_searchfunc pSearchFunc ); void dispose(); }; diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 1660c05a124f..a15ba8bd6e08 100755 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,7 +91,7 @@ namespace { maSlidesPerPage(rSlidesPerPage) { } - + bool IsWarningOrientation (void) const { return GetBoolValue(NULL, true); @@ -137,7 +137,7 @@ namespace { { return GetBoolValue("PageContentType", sal_Int32(0)); } - + bool IsHandout (void) const { return GetBoolValue("PageContentType", sal_Int32(1)); @@ -281,7 +281,7 @@ namespace { { return mbIsShapeSelection; } - + /** Call with a 0 based page index. */ bool IsSelected (const sal_Int32 nIndex) const @@ -295,7 +295,7 @@ namespace { else return false; } - + private: const bool mbAreAllPagesSelected; const bool mbIsShapeSelection; @@ -325,7 +325,7 @@ namespace { maSelection(rsPrinterSelection, pView ? pView->getCurrentPage() : NULL), mbPrintMarkedOnly(maSelection.IsMarkedOnly()) {} - + const Printer* mpPrinter; ULONG mnDrawMode; ::rtl::OUString msTimeDate; @@ -416,7 +416,7 @@ namespace { maProperties.size()); } } - + ::std::vector<sal_Int32> GetSlidesPerPage (void) const { return maSlidesPerPage; @@ -433,7 +433,7 @@ namespace { SvtModuleOptions aOpt; String aAppGroupname( String( SdResId( _STR_IMPRESS_PRINT_UI_GROUP_NAME ) ) ); aAppGroupname.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ), - aOpt.GetModuleName( mbImpress ? SvtModuleOptions::E_SIMPRESS : SvtModuleOptions::E_SDRAW ) ); + aOpt.GetModuleName( mbImpress ? SvtModuleOptions::E_SIMPRESS : SvtModuleOptions::E_SDRAW ) ); AddDialogControl( vcl::PrinterOptionsHelper::getGroupControlOpt( aAppGroupname, rtl::OUString() @@ -448,7 +448,7 @@ namespace { rtl::OUString(), aPrintOpt ) ); - + AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( String( SdResId( _STR_IMPRESS_PRINT_UI_CONTENT ) ), CreateChoice(_STR_IMPRESS_PRINT_UI_CONTENT_HELP), @@ -458,9 +458,9 @@ namespace { OUString( RTL_CONSTASCII_USTRINGPARAM( "List" ) ) ) ); - + vcl::PrinterOptionsHelper::UIControlOptions - aContentOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "PageContentType" ) ), 1 ); + aContentOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "PageContentType" ) ), 1 ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( String( SdResId( _STR_IMPRESS_PRINT_UI_SLIDESPERPAGE ) ), CreateChoice(_STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES_HELP), @@ -471,9 +471,9 @@ namespace { aContentOpt ) ); - + vcl::PrinterOptionsHelper::UIControlOptions - aSlidesPerPageOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "SlidesPerPage" ) ), -1, sal_True ); + aSlidesPerPageOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "SlidesPerPage" ) ), -1, sal_True ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( String( SdResId( _STR_IMPRESS_PRINT_UI_ORDER ) ), CreateChoice(_STR_IMPRESS_PRINT_UI_ORDER_CHOICES_HELP), @@ -490,7 +490,7 @@ namespace { if( mbImpress ) - { + { AddDialogControl( vcl::PrinterOptionsHelper::getBoolControlOpt( String( SdResId(_STR_IMPRESS_PRINT_UI_IS_PRINT_NAME) ), String( SdResId(_STR_IMPRESS_PRINT_UI_IS_PRINT_NAME_HELP) ), @@ -548,7 +548,7 @@ namespace { { // FIXME: additional dependency on PrintProspect = false vcl::PrinterOptionsHelper::UIControlOptions - aPageOptionsOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "PageContentType" ) ), 0 ); + aPageOptionsOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "PageContentType" ) ), 0 ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( rtl::OUString(), CreateChoice(_STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_HELP), @@ -563,7 +563,7 @@ namespace { else { vcl::PrinterOptionsHelper::UIControlOptions - aPageOptionsOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspect" ) ), sal_False ); + aPageOptionsOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspect" ) ), sal_False ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( rtl::OUString(), CreateChoice(_STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_HELP), @@ -577,7 +577,7 @@ namespace { } vcl::PrinterOptionsHelper::UIControlOptions aBrochureOpt; - aBrochureOpt.maGroupHint = OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutPage" ) ); + aBrochureOpt.maGroupHint = OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutPage" ) ); AddDialogControl( vcl::PrinterOptionsHelper::getSubgroupControlOpt( String( SdResId(_STR_IMPRESS_PRINT_UI_PAGE_SIDES) ), rtl::OUString(), aBrochureOpt ) ); @@ -593,8 +593,8 @@ namespace { ); vcl::PrinterOptionsHelper::UIControlOptions - aIncludeOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspect" ) ), -1, sal_False ); - aIncludeOpt.maGroupHint = OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutPage" ) ); + aIncludeOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspect" ) ), -1, sal_False ); + aIncludeOpt.maGroupHint = OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutPage" ) ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( String( SdResId(_STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE) ), CreateChoice(_STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST_HELP), @@ -621,12 +621,12 @@ namespace { vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt; aPrintRangeOpt.mbInternalOnly = sal_True; aPrintRangeOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintRange" ) ); - AddDialogControl( vcl::PrinterOptionsHelper::getSubgroupControlOpt( + AddDialogControl( vcl::PrinterOptionsHelper::getSubgroupControlOpt( String( SdResId( _STR_IMPRESS_PRINT_UI_PAGE_RANGE ) ), rtl::OUString(), aPrintRangeOpt ) ); - + // create a choice for the content to create rtl::OUString aPrintRangeName( RTL_CONSTASCII_USTRINGPARAM( "PrintContent" ) ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( rtl::OUString(), @@ -644,7 +644,7 @@ namespace { rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) ), rtl::OUString(), aPageRangeOpt ) - ); + ); FreeResource(); } @@ -719,7 +719,7 @@ namespace { } virtual ~PrinterPage (void) {} - + virtual void Print ( Printer& rPrinter, SdDrawDocument& rDocument, @@ -732,7 +732,7 @@ namespace { ULONG GetDrawMode (void) const { return mnDrawMode; } Orientation GetOrientation (void) const { return meOrientation; } USHORT GetPaperTray (void) const { return mnPaperTray; } - + protected: const PageKind mePageKind; const MapMode maMap; @@ -796,7 +796,7 @@ namespace { msPageString, maPageStringOffset); } - + private: const USHORT mnPageIndex; }; @@ -846,7 +846,7 @@ namespace { const Size aPageSize (pPageToPrint->GetSize()); const Size aPrintSize (rPrinter.GetOutputSize()); - + const sal_Int32 nPageWidth (aPageSize.Width() + mnGap - pPageToPrint->GetLftBorder() - pPageToPrint->GetRgtBorder()); const sal_Int32 nPageHeight (aPageSize.Height() + mnGap @@ -881,7 +881,7 @@ namespace { msPageString, maPageStringOffset); } - + private: const USHORT mnPageIndex; const sal_Int32 mnGap; @@ -914,7 +914,7 @@ namespace { } virtual ~BookletPrinterPage (void) {} - + virtual void Print ( Printer& rPrinter, SdDrawDocument& rDocument, @@ -956,7 +956,7 @@ namespace { rPrintableLayers); } } - + private: const USHORT mnFirstPageIndex; const USHORT mnSecondPageIndex; @@ -987,7 +987,7 @@ namespace { maPageIndices(rPageIndices) { } - + virtual void Print ( Printer& rPrinter, SdDrawDocument& rDocument, @@ -1029,7 +1029,7 @@ namespace { SdrPageObj* pPageObj = (*aPageObjIter++); pPageObj->SetReferencedPage(rDocument.GetSdPage(*iPageIndex, PK_STANDARD)); } - + // if there are more page objects than pages left, set the rest to invisible int nHangoverCount = 0; while (aPageObjIter != aHandoutPageObjects.end()) @@ -1103,7 +1103,7 @@ namespace { } } - + private: const USHORT mnHandoutPageIndex; const ::std::vector<USHORT> maPageIndices; @@ -1161,7 +1161,7 @@ namespace { const USHORT nSavedOutlMode (pOutliner->GetMode()); const BOOL bSavedUpdateMode (pOutliner->GetUpdateMode()); const Size aSavedPaperSize (pOutliner->GetPaperSize()); - + pOutliner->Init(OUTLINERMODE_OUTLINEVIEW); pOutliner->SetPaperSize(aOutRect.GetSize()); pOutliner->SetUpdateMode(TRUE); @@ -1186,7 +1186,7 @@ namespace { ::boost::scoped_ptr<OutlinerParaObject> mpParaObject; }; } - + //===== DocumentRenderer::Implementation ====================================== @@ -1212,8 +1212,8 @@ public: } - - + + virtual ~Implementation (void) { EndListening(mrBase); @@ -1221,7 +1221,7 @@ public: - + virtual void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) { const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); @@ -1234,7 +1234,7 @@ public: } - + /** Process the sequence of properties given to one of the XRenderable methods. */ @@ -1243,7 +1243,7 @@ public: OSL_ASSERT(!mbIsDisposed); if (mbIsDisposed) return; - + bool bIsValueChanged = processProperties( rOptions ); // The RenderDevice property is handled specially: its value is @@ -1267,7 +1267,7 @@ public: } - + /** Return the number of pages that are to be printed. */ sal_Int32 GetPrintPageCount (void) @@ -1288,7 +1288,7 @@ public: const css::uno::Sequence<css::beans::PropertyValue>& rOptions) { (void)rOptions; - + css::uno::Sequence<css::beans::PropertyValue> aProperties (3); aProperties[0].Name = A2S("ExtraPrintUIOptions"); @@ -1296,7 +1296,7 @@ public: aProperties[1].Name = A2S("PageSize"); aProperties[1].Value <<= maPrintSize; - + // FIXME: is this always true ? aProperties[2].Name = A2S("PageIncludesNonprintableArea"); aProperties[2].Value = makeAny( sal_True ); @@ -1305,7 +1305,7 @@ public: } - + /** Print one of the prepared pages. */ @@ -1316,14 +1316,14 @@ public: return; Printer& rPrinter (*mpPrinter); - + ::boost::shared_ptr<ViewShell> pViewShell (mrBase.GetMainViewShell()); if ( ! pViewShell) return; - + SdDrawDocument* pDocument = pViewShell->GetDoc(); OSL_ASSERT(pDocument!=NULL); - + ::boost::shared_ptr<DrawViewShell> pDrawViewShell( ::boost::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell())); @@ -1332,12 +1332,12 @@ public: if (nIndex<0 || sal::static_int_cast<sal_uInt32>(nIndex)>=maPrinterPages.size()) return; - + const ::boost::shared_ptr<PrinterPage> pPage (maPrinterPages[nIndex]); OSL_ASSERT(pPage); if ( ! pPage) return; - + const Orientation eSavedOrientation (rPrinter.GetOrientation()); const ULONG nSavedDrawMode (rPrinter.GetDrawMode()); const MapMode aSavedMapMode (rPrinter.GetMapMode()); @@ -1388,7 +1388,7 @@ public: - + private: ViewShellBase& mrBase; bool mbIsDisposed; @@ -1438,12 +1438,12 @@ private: { maPrintSize = awt::Size(aPaperSize.Width(), aPaperSize.Height()); } - + return true; } - + /** Top most method for preparing printer pages. In this and the other Prepare... methods the various special cases are detected and handled. @@ -1468,7 +1468,7 @@ private: aMap.SetMapUnit(MAP_100TH_MM); aInfo.maMap = aMap; mpPrinter->SetMapMode(aMap); - + ::Outliner& rOutliner = mrBase.GetDocument()->GetDrawOutliner(); const ULONG nSavedControlWord (rOutliner.GetControlWord()); ULONG nCntrl = nSavedControlWord; @@ -1486,7 +1486,7 @@ private: aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getDate( Date() ); aInfo.msTimeDate += ::rtl::OUString((sal_Unicode)' '); } - + if (mpOptions->IsTime()) aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getTime( Time(), FALSE, FALSE ); aInfo.maPrintSize = aInfo.mpPrinter->GetOutputSize(); @@ -1501,13 +1501,13 @@ private: | DRAWMODE_BLACKTEXT | DRAWMODE_GRAYBITMAP | DRAWMODE_GRAYGRADIENT; break; - + case 2: aInfo.mnDrawMode = DRAWMODE_BLACKLINE | DRAWMODE_BLACKTEXT | DRAWMODE_WHITEFILL | DRAWMODE_GRAYBITMAP | DRAWMODE_WHITEGRADIENT; break; - + default: aInfo.mnDrawMode = DRAWMODE_DEFAULT; } @@ -1566,7 +1566,7 @@ private: SdDrawDocument& rModel = *mrBase.GetDocument(); // first, prepare handout page (not handout master) - + SdPage* pHandout = rModel.GetSdPage(0, PK_HANDOUT); if( !pHandout ) return; @@ -1574,7 +1574,7 @@ private: // delete all previous shapes from handout page while( pHandout->GetObjCount() ) { - SdrObject* pObj = pHandout->NbcRemoveObject(0); + SdrObject* pObj = pHandout->NbcRemoveObject(0); if( pObj ) SdrObject::Free( pObj ); } @@ -1588,11 +1588,11 @@ private: while( iter != aAreas.end() ) { pHandout->NbcInsertObject( new SdrPageObj((*iter++)) ); - + if( bDrawLines && (iter != aAreas.end()) ) { Rectangle aRect( (*iter++) ); - + basegfx::B2DPolygon aPoly; aPoly.insert(0, basegfx::B2DPoint( aRect.Left(), aRect.Top() ) ); aPoly.insert(1, basegfx::B2DPoint( aRect.Right(), aRect.Top() ) ); @@ -1674,8 +1674,8 @@ private: } - - + + /** Prepare the outline of the document for printing. There is no fixed number of slides whose outline data is put onto one printer page. If the current printer page has enough room for the outline of the @@ -1690,7 +1690,7 @@ private: aMap.SetScaleX(Fraction(1,2)); aMap.SetScaleY(Fraction(1,2)); mpPrinter->SetMapMode(aMap); - + Rectangle aOutRect(aPageOfs, rInfo.mpPrinter->GetOutputSize()); if( aOutRect.GetWidth() > aOutRect.GetHeight() ) { @@ -1730,7 +1730,7 @@ private: ++nIndex; if (pPage == NULL) continue; - + SdrTextObj* pTextObj = NULL; sal_uInt32 nObj (0); @@ -1783,7 +1783,7 @@ private: { pOutliner->AddText(*(pTextObj->GetOutlinerParaObject())); } - + if (bSubTitle ) { const sal_Int32 nParaCount2 (pOutliner->GetParagraphCount()); @@ -1825,7 +1825,7 @@ private: rInfo.meOrientation, rInfo.mpPrinter->GetPaperBin()))); } - + pOutliner->SetRefMapMode(aSavedMapMode); pOutliner->SetUpdateMode(bSavedUpdateMode); pOutliner->SetPaperSize(aSavedPaperSize); @@ -1833,7 +1833,7 @@ private: } - + /** Prepare handout pages for slides that are to be printed. */ @@ -1842,7 +1842,7 @@ private: SdDrawDocument* pDocument = mrBase.GetDocument(); OSL_ASSERT(pDocument != NULL); SdPage& rHandoutPage (*pDocument->GetSdPage(0, PK_HANDOUT)); - + const bool bScalePage (mpOptions->IsPageSize()); USHORT nPaperBin; @@ -1850,7 +1850,7 @@ private: nPaperBin = rHandoutPage.GetPaperBin(); else nPaperBin = rInfo.mpPrinter->GetPaperBin(); - + // Change orientation? SdPage& rMaster (dynamic_cast<SdPage&>(rHandoutPage.TRG_GetMasterPage())); rInfo.meOrientation = rMaster.GetOrientation(); @@ -1881,10 +1881,10 @@ private: const Size aPageSize (rHandoutPage.GetSize()); const Size aPrintSize (rInfo.mpPrinter->GetOutputSize()); - const double fHorz = (double) aPrintSize.Width() / aPageSize.Width(); + const double fHorz = (double) aPrintSize.Width() / aPageSize.Width(); const double fVert = (double) aPrintSize.Height() / aPageSize.Height(); - Fraction aFract; + Fraction aFract; if ( fHorz < fVert ) aFract = Fraction(aPrintSize.Width(), aPageSize.Width()); else @@ -1961,7 +1961,7 @@ private: PrintInfo& rInfo) { OSL_ASSERT(rInfo.mpPrinter != NULL); - + // Fill in page kind specific data. SdDrawDocument* pDocument = mrBase.GetMainViewShell()->GetDoc(); if (pDocument->GetSdPageCount(ePageKind) == 0) @@ -1971,7 +1971,7 @@ private: if ( ! SetupPaperOrientation(ePageKind, rInfo)) return; - + MapMode aMap (rInfo.maMap); // aMap.SetOrigin(Point() - rInfo.mpPrinter->GetPageOffset()); rInfo.maMap = aMap; @@ -2005,14 +2005,14 @@ private: SdPage* pPage = GetFilteredPage(nIndex, ePageKind, rInfo); if (pPage == NULL) continue; - + MapMode aMap (rInfo.maMap); // Kann sich die Seitengroesse geaendert haben? const Size aPageSize = pPage->GetSize(); if (mpOptions->IsPageSize()) { - const double fHorz ((double) rInfo.maPrintSize.Width() / aPageSize.Width()); + const double fHorz ((double) rInfo.maPrintSize.Width() / aPageSize.Width()); const double fVert ((double) rInfo.maPrintSize.Height() / aPageSize.Height()); Fraction aFract; @@ -2068,7 +2068,7 @@ private: } - + /** Put two slides on one printer page. */ @@ -2219,7 +2219,7 @@ private: rInfo.mnDrawMode, rInfo.meOrientation, nPaperBin))); - } + } @@ -2240,7 +2240,7 @@ private: nPaperBin = rPage.GetPaperBin(); else nPaperBin = rInfo.mpPrinter->GetPaperBin(); - + // For pages larger then the printable area there // are three options: // 1. Scale down to the page to the printable area. @@ -2254,7 +2254,7 @@ private: if (bScalePage || bCutPage) { // Handle 1 and 2. - + // if CutPage is set then do not move it, otherwise move the // scaled page to printable area #if 0 @@ -2331,7 +2331,7 @@ DocumentRenderer::DocumentRenderer (ViewShellBase& rBase) mpImpl(new Implementation(rBase)) { } - + @@ -2353,7 +2353,7 @@ sal_Int32 SAL_CALL DocumentRenderer::getRendererCount ( mpImpl->ProcessProperties(rOptions); return mpImpl->GetPrintPageCount(); } - + @@ -2368,7 +2368,7 @@ Sequence<beans::PropertyValue> SAL_CALL DocumentRenderer::getRenderer ( mpImpl->ProcessProperties(rOptions); return mpImpl->GetProperties(rOptions); } - + diff --git a/sd/source/ui/view/DocumentRenderer.hrc b/sd/source/ui/view/DocumentRenderer.hrc index 3dd57429dd13..25377f1a1217 100644 --- a/sd/source/ui/view/DocumentRenderer.hrc +++ b/sd/source/ui/view/DocumentRenderer.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/view/DocumentRenderer.src b/sd/source/ui/view/DocumentRenderer.src index abd82ea0d397..7ab0643c7fa0 100755 --- a/sd/source/ui/view/DocumentRenderer.src +++ b/sd/source/ui/view/DocumentRenderer.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "Handouts" ; > ; < "Notes" ; > ; < "Outline" ; > ; - }; + }; }; String _STR_IMPRESS_PRINT_UI_SLIDESPERPAGE { @@ -79,7 +79,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "4" ; > ; < "6" ; > ; < "9" ; > ; - }; + }; }; StringArray _STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES_HELP { @@ -99,7 +99,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS { < "Left to right, then down" ; > ; < "Top to bottom, then right" ; > ; - }; + }; }; StringArray _STR_IMPRESS_PRINT_UI_ORDER_CHOICES_HELP { @@ -108,7 +108,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "Specify how to arrange slides on the printed page." ; > ; < "Arrange slides horizontally" ; > ; < "Arrange slides vertically" ; > ; - }; + }; }; String _STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT { @@ -162,7 +162,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "Original colors" ; > ; < "Grayscale" ; > ; < "Black & white" ; > ; - }; + }; }; StringArray _STR_IMPRESS_PRINT_UI_QUALITY_CHOICES_HELP { @@ -172,7 +172,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "Specifies that you want to print in original colors." ; > ; < "Specifies that you want to print colors as grayscale." ; > ; < "Specifies that you want to print in black and white." ; > ; - }; + }; }; String _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS @@ -187,7 +187,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "Fit to printable page" ; > ; < "Distribute on multiple sheets of paper" ; > ; < "Tile sheet of paper with repeated slides" ; > ; - }; + }; }; StringArray _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW { @@ -197,7 +197,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "Fit to printable page" ; > ; < "Distribute on multiple sheets of paper" ; > ; < "Tile sheet of paper with repeated pages" ; > ; - }; + }; }; StringArray _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_HELP { @@ -207,7 +207,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "Specifies that you do not want to further scale pages when printing." ; > ; < "Specifies whether to scale down objects that are beyond the margins of the current printer so they fit on the paper in the printer." ; > ; < "Specifies that pages are to be printed in tiled format. If the pages or slides are smaller than the paper, several pages or slides will be printed on one page of paper." ; > ; - }; + }; }; String _STR_IMPRESS_PRINT_UI_BROCHURE { @@ -236,7 +236,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "All pages" ; > ; < "Front sides / right pages" ; > ; < "Back sides / left pages" ; > ; - }; + }; }; StringArray _STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST_HELP { @@ -245,7 +245,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "Print all pages of a brochure." ; > ; < "Print only front pages of a brochure." ; > ; < "Print only back pages of a brochure." ; > ; - }; + }; }; String _STR_IMPRESS_PRINT_UI_PAPER_TRAY_GROUP diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx index 448df20b50cd..fc3005699e12 100644 --- a/sd/source/ui/view/FormShellManager.cxx +++ b/sd/source/ui/view/FormShellManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -96,7 +96,7 @@ FormShellManager::~FormShellManager (void) ViewShell* pShell = mrBase.GetMainViewShell().get(); if (pShell != NULL) mrBase.GetViewShellManager()->RemoveSubShellFactory(pShell,mpSubShellFactory); - } + } } @@ -113,7 +113,7 @@ void FormShellManager::SetFormShell (FmFormShell* pFormShell) EndListening(*mpFormShell); mpFormShell->SetView(NULL); } - + mpFormShell = pFormShell; // Connect to the new form shell. @@ -217,7 +217,7 @@ void FormShellManager::UnregisterAtCenterPane (void) mrBase.GetViewShellManager()->DeactivateSubShell(*pShell, RID_FORMLAYER_TOOLBOX); mrBase.GetViewShellManager()->RemoveSubShellFactory(pShell, mpSubShellFactory); } - + mpSubShellFactory.reset(); } while (false); diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx index cea33fda98bf..c42b4752eaca 100644 --- a/sd/source/ui/view/GraphicObjectBar.cxx +++ b/sd/source/ui/view/GraphicObjectBar.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,7 +84,7 @@ GraphicObjectBar::GraphicObjectBar ( ViewShell* pSdViewShell, ::sd::View* pSdView ) : SfxShell (pSdViewShell->GetViewShell()), - mpView ( pSdView ), + mpView ( pSdView ), mpViewSh ( pSdViewShell ), nMappedSlotFilter ( SID_GRFFILTER_INVERT ) { @@ -127,8 +127,8 @@ void GraphicObjectBar::Execute( SfxRequest& rReq ) void GraphicObjectBar::GetFilterState( SfxItemSet& rSet ) { - const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); - BOOL bEnable = FALSE; + const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); + BOOL bEnable = FALSE; if( rMarkList.GetMarkCount() == 1 ) { @@ -156,15 +156,15 @@ void GraphicObjectBar::ExecuteFilter( SfxRequest& rReq ) { GraphicObject aFilterObj( ( (SdrGrafObj*) pObj )->GetGraphicObject() ); - if( SVX_GRAPHICFILTER_ERRCODE_NONE == + if( SVX_GRAPHICFILTER_ERRCODE_NONE == SvxGraphicFilter::ExecuteGrfFilterSlot( rReq, aFilterObj ) ) { SdrPageView* pPageView = mpView->GetSdrPageView(); if( pPageView ) { - SdrGrafObj* pFilteredObj = (SdrGrafObj*) pObj->Clone(); - String aStr( mpView->GetDescriptionOfMarkedObjects() ); + SdrGrafObj* pFilteredObj = (SdrGrafObj*) pObj->Clone(); + String aStr( mpView->GetDescriptionOfMarkedObjects() ); aStr.Append( sal_Unicode(' ') ); aStr.Append( String( SdResId( STR_UNDO_GRAFFILTER ) ) ); diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx index 759103760bfe..8026c942c698 100755 --- a/sd/source/ui/view/GraphicViewShellBase.cxx +++ b/sd/source/ui/view/GraphicViewShellBase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ void GraphicViewShellBase::InitFactory() GraphicViewShellBase::GraphicViewShellBase ( - SfxViewFrame* _pFrame, + SfxViewFrame* _pFrame, SfxViewShell* pOldShell) : ViewShellBase (_pFrame, pOldShell) { diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx index 0cd5971eb51e..c7742e53872a 100644 --- a/sd/source/ui/view/ImpressViewShellBase.cxx +++ b/sd/source/ui/view/ImpressViewShellBase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ void ImpressViewShellBase::InitFactory() ImpressViewShellBase::ImpressViewShellBase ( - SfxViewFrame* _pFrame, + SfxViewFrame* _pFrame, SfxViewShell* pOldShell) : ViewShellBase (_pFrame, pOldShell) { diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx index ad5135939bc3..adc4e2c793e0 100644 --- a/sd/source/ui/view/MediaObjectBar.cxx +++ b/sd/source/ui/view/MediaObjectBar.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,15 +97,15 @@ MediaObjectBar::~MediaObjectBar() void MediaObjectBar::GetState( SfxItemSet& rSet ) { - SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); + SfxWhichIter aIter( rSet ); + USHORT nWhich = aIter.FirstWhich(); while( nWhich ) { - if( SID_AVMEDIA_TOOLBOX == nWhich ) + if( SID_AVMEDIA_TOOLBOX == nWhich ) { SdrMarkList* pMarkList = new SdrMarkList( mpView->GetMarkedObjectList() ); - bool bDisable = true; + bool bDisable = true; if( 1 == pMarkList->GetMarkCount() ) { @@ -114,7 +114,7 @@ void MediaObjectBar::GetState( SfxItemSet& rSet ) if( pObj && pObj->ISA( SdrMediaObj ) ) { ::avmedia::MediaItem aItem( SID_AVMEDIA_TOOLBOX ); - + static_cast< sdr::contact::ViewContactOfSdrMediaObj& >( pObj->GetViewContact() ).updateMediaItem( aItem ); rSet.Put( aItem ); bDisable = false; @@ -123,7 +123,7 @@ void MediaObjectBar::GetState( SfxItemSet& rSet ) if( bDisable ) rSet.DisableItem( SID_AVMEDIA_TOOLBOX ); - + delete pMarkList; } @@ -135,14 +135,14 @@ void MediaObjectBar::GetState( SfxItemSet& rSet ) void MediaObjectBar::Execute( SfxRequest& rReq ) { - if( SID_AVMEDIA_TOOLBOX == rReq.GetSlot() ) + if( SID_AVMEDIA_TOOLBOX == rReq.GetSlot() ) { - const SfxItemSet* pArgs = rReq.GetArgs(); - const SfxPoolItem* pItem; - + const SfxItemSet* pArgs = rReq.GetArgs(); + const SfxPoolItem* pItem; + if( !pArgs || ( SFX_ITEM_SET != pArgs->GetItemState( SID_AVMEDIA_TOOLBOX, FALSE, &pItem ) ) ) pItem = NULL; - + if( pItem ) { SdrMarkList* pMarkList = new SdrMarkList( mpView->GetMarkedObjectList() ); @@ -153,7 +153,7 @@ void MediaObjectBar::Execute( SfxRequest& rReq ) if( pObj && pObj->ISA( SdrMediaObj ) ) { - static_cast< sdr::contact::ViewContactOfSdrMediaObj& >( pObj->GetViewContact() ).executeMediaItem( + static_cast< sdr::contact::ViewContactOfSdrMediaObj& >( pObj->GetViewContact() ).executeMediaItem( static_cast< const ::avmedia::MediaItem& >( *pItem ) ); } } diff --git a/sd/source/ui/view/OutlineViewShellBase.cxx b/sd/source/ui/view/OutlineViewShellBase.cxx index 762219c88016..178661f00439 100644 --- a/sd/source/ui/view/OutlineViewShellBase.cxx +++ b/sd/source/ui/view/OutlineViewShellBase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ SfxViewShell* __EXPORT OutlineViewShellBase::CreateInstance ( return pBase; } void OutlineViewShellBase::RegisterFactory( USHORT nPrio ) -{ +{ pFactory = new SfxViewFactory( &CreateInstance,&InitFactory,nPrio,SdResId(STR_DEFAULTVIEW)); InitFactory(); @@ -72,7 +72,7 @@ void OutlineViewShellBase::InitFactory() OutlineViewShellBase::OutlineViewShellBase ( - SfxViewFrame* _pFrame, + SfxViewFrame* _pFrame, SfxViewShell* pOldShell) : ImpressViewShellBase (_pFrame, pOldShell) { diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 7c94e7b27b07..be84bbfc8e68 100755 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1573,7 +1573,7 @@ void Outliner::PrepareConversion (void) mpDrawDocument->GetDocSh()->SetWaitCursor( FALSE ); // Start seach at the right end of the current object's text // depending on the search direction. -// mpOutlineView->SetSelection (GetSearchStartPosition ()); +// mpOutlineView->SetSelection (GetSearchStartPosition ()); } else { diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx index 226d767c6c91..e7d0e0d63475 100755 --- a/sd/source/ui/view/OutlinerIterator.cxx +++ b/sd/source/ui/view/OutlinerIterator.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -216,18 +216,18 @@ Iterator OutlinerContainer::CreateSelectionIterator ( const ::std::vector<SdrObjectWeakRef>& rObjectList, SdDrawDocument* pDocument, const ::boost::shared_ptr<ViewShell>& rpViewShell, - bool bDirectionIsForward, + bool bDirectionIsForward, IteratorLocation aLocation) { OSL_ASSERT(rpViewShell.get()); - + sal_Int32 nObjectIndex; if (bDirectionIsForward) switch (aLocation) { case CURRENT: - case BEGIN: + case BEGIN: default: nObjectIndex = 0; break; @@ -239,7 +239,7 @@ Iterator OutlinerContainer::CreateSelectionIterator ( switch (aLocation) { case CURRENT: - case BEGIN: + case BEGIN: default: nObjectIndex = rObjectList.size()-1; break; @@ -253,13 +253,13 @@ Iterator OutlinerContainer::CreateSelectionIterator ( } Iterator OutlinerContainer::CreateDocumentIterator ( - SdDrawDocument* pDocument, + SdDrawDocument* pDocument, const ::boost::shared_ptr<ViewShell>& rpViewShell, - bool bDirectionIsForward, + bool bDirectionIsForward, IteratorLocation aLocation) { OSL_ASSERT(rpViewShell.get()); - + PageKind ePageKind; EditMode eEditMode; @@ -278,7 +278,7 @@ Iterator OutlinerContainer::CreateDocumentIterator ( eEditMode = EM_MASTERPAGE; } break; - + case END: if (bDirectionIsForward) { @@ -308,7 +308,7 @@ Iterator OutlinerContainer::CreateDocumentIterator ( break; } - sal_Int32 nPageIndex = GetPageIndex (pDocument, rpViewShell, + sal_Int32 nPageIndex = GetPageIndex (pDocument, rpViewShell, ePageKind, eEditMode, bDirectionIsForward, aLocation); return Iterator ( @@ -319,13 +319,13 @@ Iterator OutlinerContainer::CreateDocumentIterator ( sal_Int32 OutlinerContainer::GetPageIndex ( SdDrawDocument* pDocument, const ::boost::shared_ptr<ViewShell>& rpViewShell, - PageKind ePageKind, + PageKind ePageKind, EditMode eEditMode, bool bDirectionIsForward, IteratorLocation aLocation) { OSL_ASSERT(rpViewShell); - + sal_Int32 nPageIndex; sal_Int32 nPageCount; @@ -359,7 +359,7 @@ sal_Int32 OutlinerContainer::GetPageIndex ( } break; - case BEGIN: + case BEGIN: default: if (bDirectionIsForward) nPageIndex = 0; @@ -386,10 +386,10 @@ sal_Int32 OutlinerContainer::GetPageIndex ( IteratorImplBase::IteratorImplBase(SdDrawDocument* pDocument, const ::boost::weak_ptr<ViewShell>& rpViewShellWeak, bool bDirectionIsForward) -: maPosition() -, mpDocument (pDocument) -, mpViewShellWeak (rpViewShellWeak) -, mbDirectionIsForward (bDirectionIsForward) +: maPosition() +, mpDocument (pDocument) +, mpViewShellWeak (rpViewShellWeak) +, mbDirectionIsForward (bDirectionIsForward) { ::boost::shared_ptr<DrawViewShell> pDrawViewShell; if ( ! mpViewShellWeak.expired()) @@ -493,7 +493,7 @@ IteratorImplBase* SelectionIteratorImpl::Clone (IteratorImplBase* pObject) const void SelectionIteratorImpl::GotoNextText (void) { - SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mrObjectList.at(mnObjectIndex).get() ); + SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mrObjectList.at(mnObjectIndex).get() ); if (mbDirectionIsForward) { if( pTextObj ) @@ -503,7 +503,7 @@ void SelectionIteratorImpl::GotoNextText (void) { maPosition.mnText = 0; ++mnObjectIndex; - } + } } else { @@ -519,7 +519,7 @@ void SelectionIteratorImpl::GotoNextText (void) { maPosition.mnText = -1; --mnObjectIndex; - } + } } else { @@ -529,7 +529,7 @@ void SelectionIteratorImpl::GotoNextText (void) if( (maPosition.mnText == -1) && (mnObjectIndex >= 0) ) { - pTextObj = dynamic_cast< SdrTextObj* >( mrObjectList.at(mnObjectIndex).get() ); + pTextObj = dynamic_cast< SdrTextObj* >( mrObjectList.at(mnObjectIndex).get() ); if( pTextObj ) maPosition.mnText = pTextObj->getTextCount() - 1; } @@ -560,9 +560,9 @@ bool SelectionIteratorImpl::IsEqual ( { if (aType == SELECTION) { - const SelectionIteratorImpl* pSelectionIterator = + const SelectionIteratorImpl* pSelectionIterator = static_cast<const SelectionIteratorImpl*>(&rIterator); - return mpDocument == pSelectionIterator->mpDocument + return mpDocument == pSelectionIterator->mpDocument && mnObjectIndex == pSelectionIterator->mnObjectIndex; } else @@ -592,7 +592,7 @@ ViewIteratorImpl::ViewIteratorImpl ( ViewIteratorImpl::ViewIteratorImpl ( sal_Int32 nPageIndex, - SdDrawDocument* pDocument, + SdDrawDocument* pDocument, const ::boost::weak_ptr<ViewShell>& rpViewShellWeak, bool bDirectionIsForward, PageKind ePageKind, @@ -617,7 +617,7 @@ ViewIteratorImpl::~ViewIteratorImpl (void) IteratorImplBase* ViewIteratorImpl::Clone (IteratorImplBase* pObject) const { - + ViewIteratorImpl* pIterator = static_cast<ViewIteratorImpl*>(pObject); if (pIterator == NULL) pIterator = new ViewIteratorImpl ( @@ -644,7 +644,7 @@ IteratorImplBase* ViewIteratorImpl::Clone (IteratorImplBase* pObject) const void ViewIteratorImpl::GotoNextText(void) { - SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( maPosition.mxObject.get() ); + SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( maPosition.mxObject.get() ); if( pTextObj ) { if (mbDirectionIsForward) @@ -684,7 +684,7 @@ void ViewIteratorImpl::GotoNextText(void) maPosition.mnText = 0; if( !mbDirectionIsForward && maPosition.mxObject.is() ) { - pTextObj = dynamic_cast< SdrTextObj* >( maPosition.mxObject.get() ); + pTextObj = dynamic_cast< SdrTextObj* >( maPosition.mxObject.get() ); if( pTextObj ) maPosition.mnText = pTextObj->getTextCount() - 1; } @@ -716,11 +716,11 @@ void ViewIteratorImpl::SetPage (sal_Int32 nPageIndex) { if (maPosition.meEditMode == EM_PAGE) mpPage = mpDocument->GetSdPage ( - (USHORT)nPageIndex, + (USHORT)nPageIndex, maPosition.mePageKind); else mpPage = mpDocument->GetMasterSdPage ( - (USHORT)nPageIndex, + (USHORT)nPageIndex, maPosition.mePageKind); } else @@ -742,7 +742,7 @@ void ViewIteratorImpl::SetPage (sal_Int32 nPageIndex) maPosition.mnText = 0; if( !mbDirectionIsForward && maPosition.mxObject.is() ) { - SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( maPosition.mxObject.get() ); + SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( maPosition.mxObject.get() ); if( pTextObj ) maPosition.mnText = pTextObj->getTextCount() - 1; } @@ -824,14 +824,14 @@ void DocumentIteratorImpl::GotoNextText (void) if (mbDirectionIsForward) { if (maPosition.mnPageIndex >= mnPageCount) - { + { // Switch to master page. if (maPosition.meEditMode == EM_PAGE) { maPosition.meEditMode = EM_MASTERPAGE; SetPage (0); } - + // Switch to next view mode. else { @@ -860,7 +860,7 @@ void DocumentIteratorImpl::GotoNextText (void) maPosition.meEditMode = EM_PAGE; bSetToOnePastLastPage = true; } - + // Switch to previous view mode. else { @@ -887,7 +887,7 @@ void DocumentIteratorImpl::GotoNextText (void) nPageCount = mpDocument->GetSdPageCount (maPosition.mePageKind); else nPageCount = mpDocument->GetMasterSdPageCount(maPosition.mePageKind); - + // Now that we know the number of pages we can set the current page index. if (bSetToOnePastLastPage) SetPage (nPageCount); diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx index a16b12d3cb63..96ffefdb4c03 100644 --- a/sd/source/ui/view/PresentationViewShellBase.cxx +++ b/sd/source/ui/view/PresentationViewShellBase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,13 +62,13 @@ SfxViewFactory* PresentationViewShellBase::pFactory; SfxViewShell* __EXPORT PresentationViewShellBase::CreateInstance ( SfxViewFrame *_pFrame, SfxViewShell *pOldView) { - PresentationViewShellBase* pBase = + PresentationViewShellBase* pBase = new PresentationViewShellBase(_pFrame, pOldView); pBase->LateInit(framework::FrameworkHelper::msPresentationViewURL); return pBase; } void PresentationViewShellBase::RegisterFactory( USHORT nPrio ) -{ +{ pFactory = new SfxViewFactory( &CreateInstance,&InitFactory,nPrio,SdResId(STR_DEFAULTVIEW)); InitFactory(); @@ -82,7 +82,7 @@ void PresentationViewShellBase::InitFactory() PresentationViewShellBase::PresentationViewShellBase ( - SfxViewFrame* _pFrame, + SfxViewFrame* _pFrame, SfxViewShell* pOldShell) : ViewShellBase (_pFrame, pOldShell) { diff --git a/sd/source/ui/view/SlideSorterViewShellBase.cxx b/sd/source/ui/view/SlideSorterViewShellBase.cxx index 466f699b1bb0..5be1a913f87e 100644 --- a/sd/source/ui/view/SlideSorterViewShellBase.cxx +++ b/sd/source/ui/view/SlideSorterViewShellBase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ SfxViewShell* __EXPORT SlideSorterViewShellBase::CreateInstance ( void SlideSorterViewShellBase::RegisterFactory( USHORT nPrio ) -{ +{ pFactory = new SfxViewFactory( &CreateInstance,&InitFactory,nPrio,SdResId(STR_DEFAULTVIEW)); InitFactory(); @@ -83,7 +83,7 @@ void SlideSorterViewShellBase::InitFactory() SlideSorterViewShellBase::SlideSorterViewShellBase ( - SfxViewFrame* _pFrame, + SfxViewFrame* _pFrame, SfxViewShell* pOldShell) : ImpressViewShellBase (_pFrame, pOldShell) { diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index ce3064392d40..13d3f2070d6f 100755 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -320,7 +320,7 @@ public: void LockViewShellManager (void); void LockUpdate (void); void UnlockUpdate (void); - + ToolBarRules& GetToolBarRules (void); private: diff --git a/sd/source/ui/view/UpdateLockManager.cxx b/sd/source/ui/view/UpdateLockManager.cxx index f373042f627b..a8121af4e3b4 100644 --- a/sd/source/ui/view/UpdateLockManager.cxx +++ b/sd/source/ui/view/UpdateLockManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ class UpdateLockManager::Implementation public: Implementation (ViewShellBase& rBase); virtual ~Implementation (void); - + void Lock (void); void Unlock (void); bool IsLocked (void) const; @@ -99,13 +99,13 @@ private: release when unlocking). */ virtual void SAL_CALL layoutEvent ( - const lang::EventObject& xSource, + const lang::EventObject& xSource, sal_Int16 eLayoutEvent, const Any& rInfo) throw (uno::RuntimeException); //===== lang::XEventListener ============================================ - virtual void SAL_CALL + virtual void SAL_CALL disposing (const lang::EventObject& rEventObject) throw (::com::sun::star::uno::RuntimeException); @@ -289,7 +289,7 @@ void UpdateLockManager::Implementation::Unlock (void) } catch (RuntimeException) { } - + // Force a rearrangement of the UI elements of the views. mrBase.Rearrange(); } @@ -316,7 +316,7 @@ void UpdateLockManager::Implementation::ForceUnlock (void) void SAL_CALL UpdateLockManager::Implementation::layoutEvent ( - const lang::EventObject&, + const lang::EventObject&, sal_Int16 eLayoutEvent, const Any& rInfo) throw (uno::RuntimeException) diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx index ab108fd1991a..eab308e2000d 100755 --- a/sd/source/ui/view/ViewClipboard.cxx +++ b/sd/source/ui/view/ViewClipboard.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,7 +87,7 @@ SdPage* ViewClipboard::GetFirstMasterPage (const SdTransferable& rTransferable) const List* pBookmarks = &rTransferable.GetPageBookmarks(); if (pBookmarks == NULL) break; - + DrawDocShell* pDocShell = rTransferable.GetPageDocShell(); if (pDocShell == NULL) break; @@ -104,7 +104,7 @@ SdPage* ViewClipboard::GetFirstMasterPage (const SdTransferable& rTransferable) { String sName (*(String*) pBookmarks->GetObject(nIndex)); BOOL bIsMasterPage; - + // SdPage* GetMasterSdPage(USHORT nPgNum, PageKind ePgKind); // USHORT GetMasterSdPageCount(PageKind ePgKind) const; @@ -177,7 +177,7 @@ void ViewClipboard::AssignMasterPage ( if (String(sLayoutName, sLayoutName.Len()-nLength, nLength).Equals ( sLayoutSuffix)) sLayoutName = String(sLayoutName, 0, sLayoutName.Len()-nLength); - + pDocument->SetMasterPage ( pPage->GetPageNum() / 2, sLayoutName, @@ -254,23 +254,23 @@ USHORT ViewClipboard::InsertSlides ( if( bWait ) pWin->LeaveWait(); - + pDoc->InsertBookmarkAsPage( - const_cast<List*>(pBookmarkList), - NULL, - FALSE, - FALSE, + const_cast<List*>(pBookmarkList), + NULL, + FALSE, + FALSE, nInsertPosition, (&rTransferable == SD_MOD()->pTransferDrag), - pDataDocSh, - TRUE, - bMergeMasterPages, + pDataDocSh, + TRUE, + bMergeMasterPages, FALSE); if( bWait ) pWin->EnterWait(); } - + return nInsertPgCnt; } diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 1e18ad5c5ee9..15f7b265210b 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -777,14 +777,14 @@ void ViewShellBase::Execute (SfxRequest& rRequest) framework::FrameworkHelper::msLeftDrawPaneURL, framework::FrameworkHelper::msSlideSorterURL); break; - + case SID_LEFT_PANE_IMPRESS: mpImpl->SetPaneVisibility( rRequest, framework::FrameworkHelper::msLeftImpressPaneURL, framework::FrameworkHelper::msSlideSorterURL); break; - + case SID_TASKPANE: mpImpl->SetPaneVisibility( rRequest, @@ -1035,7 +1035,7 @@ void ViewShellBase::UpdateBorder ( bool bForce /* = false */ ) bool bOuterResize ( ! GetDocShell()->IsInPlaceActive()); SvBorder aBorder (GetBorder(bOuterResize)); aBorder += pMainViewShell->GetBorder(bOuterResize); - + if (bForce || (aBorder != aCurrentBorder)) { SetBorderPixel (aBorder); @@ -1165,7 +1165,7 @@ const Rectangle& ViewShellBase::getClientRectangle (void) const { OSL_ASSERT(mpImpl.get()!=NULL); OSL_ASSERT(mpImpl->mpUpdateLockManager.get()!=NULL); - + return mpImpl->mpUpdateLockManager; } @@ -1176,7 +1176,7 @@ const Rectangle& ViewShellBase::getClientRectangle (void) const { OSL_ASSERT(mpImpl.get()!=NULL); OSL_ASSERT(mpImpl->mpToolBarManager.get()!=NULL); - + return mpImpl->mpToolBarManager; } @@ -1363,7 +1363,7 @@ void ViewShellBase::Implementation::ResizePixel ( // Forward the call to both the base class and the main stacked sub // shell only when main sub shell exists. ViewShell* pMainViewShell = mrBase.GetMainViewShell().get(); - + // Set the ViewTabBar temporarily to full size so that, when asked // later, it can return its true height. mrBase.SetWindow (mpViewWindow.get()); @@ -1386,7 +1386,7 @@ void ViewShellBase::Implementation::ResizePixel ( mpViewTabBar->GetTabControl()->SetPosSizePixel( rOrigin, Size(rSize.Width(),aBaseBorder.Top())); } - + // The view window gets the remaining space. Point aViewWindowPosition ( rOrigin.X()+aBaseBorder.Left(), @@ -1395,7 +1395,7 @@ void ViewShellBase::Implementation::ResizePixel ( rSize.Width() - aBaseBorder.Left() - aBaseBorder.Right(), rSize.Height() - aBaseBorder.Top() - aBaseBorder.Bottom()); mpViewWindow->SetPosSizePixel(aViewWindowPosition, aViewWindowSize); - + maClientArea = Rectangle(Point(0,0), aViewWindowSize); } @@ -1417,7 +1417,7 @@ void ViewShellBase::Implementation::SetPaneVisibility ( xContext, rsPaneURL)); Reference<XResourceId> xViewId (ResourceId::createWithAnchorURL( xContext, rsViewURL, rsPaneURL)); - + // Determine the new visibility state. const SfxItemSet* pArguments = rRequest.GetArgs(); BOOL bShowChildWindow; @@ -1435,10 +1435,10 @@ void ViewShellBase::Implementation::SetPaneVisibility ( xConfigurationController->getRequestedConfiguration()); if ( ! xConfiguration.is()) throw RuntimeException(); - + bShowChildWindow = ! xConfiguration->hasResource(xPaneId); } - + // Set the desired visibility state at the current configuration // and update it accordingly. Reference<XConfigurationController> xConfigurationController ( @@ -1499,7 +1499,7 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet) xResourceId = ResourceId::create( xContext, FrameworkHelper::msLeftImpressPaneURL); break; - + case SID_LEFT_PANE_DRAW: xResourceId = ResourceId::create( xContext, FrameworkHelper::msLeftDrawPaneURL); @@ -1509,7 +1509,7 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet) xResourceId = ResourceId::create( xContext, FrameworkHelper::msRightPaneURL); break; - + case SID_NORMAL_MULTI_PANE_GUI: xResourceId = ResourceId::createWithAnchorURL( xContext, @@ -1581,13 +1581,13 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet) bState &= !bMasterPageMode; break; } - + case SID_HANDOUTMODE: // There is only the master page mode for the handout // view so ignore the master page flag. break; } - + // And finally set the state. rSet.Put(SfxBoolItem(nItemId, bState)); diff --git a/sd/source/ui/view/ViewShellHint.cxx b/sd/source/ui/view/ViewShellHint.cxx index e23cc8964d23..a5aee5c09a0c 100644 --- a/sd/source/ui/view/ViewShellHint.cxx +++ b/sd/source/ui/view/ViewShellHint.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index fdd7c530137f..6eb129da24ce 100755 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -185,10 +185,10 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( if (aLayout >= AUTOLAYOUT__START && aLayout < AUTOLAYOUT__END) { - aNewName = pNewName->GetValue (); + aNewName = pNewName->GetValue (); aNewAutoLayout = (AutoLayout) pNewAutoLayout->GetValue (); - bBVisible = pBVisible->GetValue (); - bBObjsVisible = pBObjsVisible->GetValue (); + bBVisible = pBVisible->GetValue (); + bBObjsVisible = pBObjsVisible->GetValue (); } else { @@ -291,7 +291,7 @@ void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind eP { pPage = pDocument->GetSdPage(static_cast<USHORT>(pWhatPage->GetValue()), ePageKind); } - + if( pPage == 0 ) pPage = mrViewShell.getCurrentPage(); @@ -301,7 +301,7 @@ void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind eP if( pWhatLayout ) eLayout = static_cast< AutoLayout >( pWhatLayout->GetValue() ); - + // Transform the given request into the four argument form that is // understood by ProcessModifyPageSlot(). SdrLayerAdmin& rLayerAdmin (mrViewShell.GetViewShellBase().GetDocument()->GetLayerAdmin()); @@ -309,7 +309,7 @@ void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind eP BYTE aBackgroundObject (rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE)); SetOfByte aVisibleLayers; - + if( pPage->GetPageKind() == PK_HANDOUT ) aVisibleLayers.SetAll(); else @@ -340,7 +340,7 @@ sal_uInt16 ViewShell::Implementation::GetViewId (void) case ViewShell::ST_DRAW: return DRAW_FACTORY_ID; - + case ViewShell::ST_OUTLINE: return OUTLINE_FACTORY_ID; diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index c25c0f11270a..a4154ede45d8 100755 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -119,10 +119,10 @@ public: ~Implementation (void); void AddShellFactory ( - const SfxShell* pViewShell, + const SfxShell* pViewShell, const SharedShellFactory& rpFactory); void RemoveShellFactory ( - const SfxShell* pViewShell, + const SfxShell* pViewShell, const SharedShellFactory& rpFactory); void ActivateViewShell ( ViewShell* pViewShell); @@ -189,12 +189,12 @@ private: typedef ::std::list<ShellDescriptor> SubShellSubList; typedef ::std::hash_map<const SfxShell*,SubShellSubList,ShellHash> SubShellList; SubShellList maActiveSubShells; - + /** In this member we remember what shells we have pushed on the shell stack. */ typedef ::std::vector<SfxShell*> ShellStack; - + int mnUpdateLockCount; /** When this flag is set then the main view shell is always kept at the @@ -218,7 +218,7 @@ private: void GatherActiveShells (ShellStack& rShellList); void UpdateShellStack (void); - + void CreateShells (void); /** This method rebuilds the stack of shells that are stacked upon the @@ -271,7 +271,7 @@ ViewShellManager::~ViewShellManager (void) void ViewShellManager::AddSubShellFactory ( - ViewShell* pViewShell, + ViewShell* pViewShell, const SharedShellFactory& rpFactory) { if (mbValid) @@ -282,7 +282,7 @@ void ViewShellManager::AddSubShellFactory ( void ViewShellManager::RemoveSubShellFactory ( - ViewShell* pViewShell, + ViewShell* pViewShell, const SharedShellFactory& rpFactory) { if (mbValid) @@ -665,7 +665,7 @@ void ViewShellManager::Implementation::ActivateSubShell ( if (iList == maActiveSubShells.end()) iList = maActiveSubShells.insert( SubShellList::value_type(&rParentShell,SubShellSubList())).first; - + // Do not activate an object bar that is already active. Requesting // this is not exactly an error but may be an indication of one. SubShellSubList& rList (iList->second); @@ -705,7 +705,7 @@ void ViewShellManager::Implementation::DeactivateSubShell ( SfxShell* pShell = iShell->mpShell; if (pShell == NULL) break; - + UpdateLock aLock (*this); ShellDescriptor aDescriptor(*iShell); @@ -782,7 +782,7 @@ void ViewShellManager::Implementation::MoveToTop (const SfxShell& rShell) bMove = false; } else if (iShell == ++maActiveViewShells.begin() - && ! iShell->IsMainViewShell() + && ! iShell->IsMainViewShell() && mbKeepMainViewShellOnTop) { // The shell is a the second-to-top position, not the main view @@ -798,7 +798,7 @@ void ViewShellManager::Implementation::MoveToTop (const SfxShell& rShell) // that. bMove = false; } - + // When the shell is not at the right position it is removed from the // internal list of shells and inserted at the correct position. if (bMove) @@ -806,7 +806,7 @@ void ViewShellManager::Implementation::MoveToTop (const SfxShell& rShell) UpdateLock aLock (*this); ShellDescriptor aDescriptor(*iShell); - + TakeShellsFromStack(&rShell); maActiveViewShells.erase(iShell); @@ -920,12 +920,12 @@ void ViewShellManager::Implementation::UpdateShellStack (void) // 1. Create the missing shells. CreateShells(); - + // 2. Create the internal target stack. ShellStack aTargetStack; CreateTargetStack(aTargetStack); - + // 3. Get SFX shell stack. ShellStack aSfxShellStack; USHORT nIndex (0); @@ -943,7 +943,7 @@ void ViewShellManager::Implementation::UpdateShellStack (void) DumpShellStack(aTargetStack); #endif - + // 4. Find the lowest shell in which the two stacks differ. ShellStack::const_iterator iSfxShell (aSfxShellStack.begin()); ShellStack::iterator iTargetShell (aTargetStack.begin()); @@ -955,7 +955,7 @@ void ViewShellManager::Implementation::UpdateShellStack (void) ++iTargetShell; } - + // 5. Remove all shells above and including the differing shell from the // SFX stack starting with the shell on top of the stack. while (iSfxShell != aSfxShellStack.end()) @@ -968,7 +968,7 @@ void ViewShellManager::Implementation::UpdateShellStack (void) mrBase.RemoveSubShell(pShell); } - + // 6. Push shells from the given stack onto the SFX stack. mbShellStackIsUpToDate = false; while (iTargetShell != aTargetStack.end()) @@ -1037,7 +1037,7 @@ void ViewShellManager::Implementation::TakeShellsFromStack (const SfxShell* pShe else if (pShellOnStack == pShell) break; } - + if (pShell != NULL) { // 1. Deactivate our shells on the stack before they are removed so @@ -1119,7 +1119,7 @@ void ViewShellManager::Implementation::CreateTargetStack (ShellStack& rStack) co // stack. We can thus safly create the required shells wile still // having a valid shell stack. for (ActiveShellList::const_reverse_iterator iViewShell (maActiveViewShells.rbegin()); - iViewShell != maActiveViewShells.rend(); + iViewShell != maActiveViewShells.rend(); ++iViewShell) { // Possibly place the form shell below the current view shell. @@ -1129,7 +1129,7 @@ void ViewShellManager::Implementation::CreateTargetStack (ShellStack& rStack) co { rStack.push_back(mpFormShell); } - + // Put the view shell itself on the local stack. rStack.push_back (iViewShell->mpShell); @@ -1161,7 +1161,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*, { if (pEvent != NULL) { - ::Window* pEventWindow + ::Window* pEventWindow = static_cast<VclWindowEvent*>(pEvent)->GetWindow(); switch (pEvent->GetId()) @@ -1169,7 +1169,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*, case VCLEVENT_WINDOW_GETFOCUS: { for (ActiveShellList::iterator aI(maActiveViewShells.begin()); - aI!=maActiveViewShells.end(); + aI!=maActiveViewShells.end(); aI++) { if (pEventWindow == static_cast< ::Window*>(aI->GetWindow())) @@ -1219,7 +1219,7 @@ ShellDescriptor ViewShellManager::Implementation::CreateSubShell ( break; } } - + return aResult; } @@ -1230,7 +1230,7 @@ void ViewShellManager::Implementation::DestroyViewShell ( const ShellDescriptor& rDescriptor) { OSL_ASSERT(rDescriptor.mpShell != NULL); - + ::Window* pWindow = rDescriptor.GetWindow(); if (pWindow != NULL) { @@ -1291,7 +1291,7 @@ void ViewShellManager::Implementation::Shutdown (void) { UpdateLock aLock (*this); - + while ( ! maActiveViewShells.empty()) { SfxShell* pShell = maActiveViewShells.front().mpShell; @@ -1312,7 +1312,7 @@ void ViewShellManager::Implementation::Shutdown (void) } } mrBase.RemoveSubShell (NULL); - + maShellFactories.clear(); } @@ -1324,7 +1324,7 @@ void ViewShellManager::Implementation::DumpShellStack (const ShellStack& rStack) ShellStack::const_reverse_iterator iEntry; for (iEntry=rStack.rbegin(); iEntry!=rStack.rend(); ++iEntry) if (*iEntry != NULL) - OSL_TRACE (" %p : %s\r", + OSL_TRACE (" %p : %s\r", *iEntry, ::rtl::OUStringToOString((*iEntry)->GetName(),RTL_TEXTENCODING_UTF8).getStr()); else diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index a12412bf7f7d..d49f977ee15d 100755 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,7 +97,7 @@ class ViewTabPage : public TabPage { public: ViewTabPage (Window* pParent) : TabPage(pParent) {} - virtual void Resize (void) + virtual void Resize (void) { SetPosSizePixel(Point(0,0),GetParent()->GetOutputSizePixel()); } }; @@ -152,7 +152,7 @@ ViewTabBar::ViewTabBar ( } mpTabControl->Show(); - + if (mpViewShellBase != NULL && rxViewTabBarId->isBoundToURL( FrameworkHelper::msCenterPaneURL, AnchorBindingMode_DIRECT)) @@ -203,7 +203,7 @@ void ViewTabBar::disposing (void) mpTabPage.reset(); mpTabControl.reset(); } - + mxController = NULL; } @@ -224,7 +224,7 @@ void ViewTabBar::disposing (void) { ::Window* pWindow = NULL; ViewShellBase* pBase = NULL; - + // Tunnel through the controller and use the ViewShellBase to obtain the // view frame. try @@ -273,7 +273,7 @@ void ViewTabBar::disposing (void) catch (RuntimeException&) {} } - + return pWindow; } @@ -409,7 +409,7 @@ const Sequence<sal_Int8>& ViewTabBar::getUnoTunnelId (void) sal_Int64 SAL_CALL ViewTabBar::getSomething (const Sequence<sal_Int8>& rId) throw (RuntimeException) -{ +{ sal_Int64 nResult = 0; if (rId.getLength() == 16 @@ -447,7 +447,7 @@ bool ViewTabBar::ActivatePage (void) catch (DeploymentException) { } - + Client* pIPClient = NULL; if (mpViewShellBase != NULL) pIPClient = dynamic_cast<Client*>(mpViewShellBase->GetIPClient()); @@ -475,7 +475,7 @@ bool ViewTabBar::ActivatePage (void) { DBG_UNHANDLED_EXCEPTION(); } - + return false; } @@ -529,7 +529,7 @@ void ViewTabBar::AddTabBarButton ( } } } - + AddTabBarButton(rButton,nIndex); } @@ -553,7 +553,7 @@ void ViewTabBar::AddTabBarButton ( && nPosition<=mpTabControl->GetPageCount()) { USHORT nIndex ((USHORT)nPosition); - + // Insert the button into our local array. maTabBarButtons.insert(maTabBarButtons.begin()+nIndex, rButton); UpdateTabBarButtons(); @@ -587,7 +587,7 @@ bool ViewTabBar::HasTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton) { bool bResult (false); - + for (sal_uInt32 nIndex=0; nIndex<maTabBarButtons.size(); ++nIndex) { if (IsEqual(maTabBarButtons[nIndex], rButton)) @@ -707,7 +707,7 @@ void TabBarControl::Paint (const Rectangle& rRect) void TabBarControl::ActivatePage (void) { if (mpViewTabBar->ActivatePage()) - { + { // Call the parent so that the correct tab is highlighted. this->::TabControl::ActivatePage(); } diff --git a/sd/source/ui/view/WindowUpdater.cxx b/sd/source/ui/view/WindowUpdater.cxx index 3e074e0108ad..481ff0e118ee 100644 --- a/sd/source/ui/view/WindowUpdater.cxx +++ b/sd/source/ui/view/WindowUpdater.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -178,7 +178,7 @@ void WindowUpdater::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uI // Reformat the document for the modified state to take effect. if (mpDocument != NULL) mpDocument->ReformatAllTextObjects(); - + // Invalidate the windows to make the modified state visible. aWindowIterator = maWindowList.begin(); while (aWindowIterator != maWindowList.end()) diff --git a/sd/source/ui/view/bmcache.cxx b/sd/source/ui/view/bmcache.cxx index c7f313037ff8..c529e1d334c0 100755 --- a/sd/source/ui/view/bmcache.cxx +++ b/sd/source/ui/view/bmcache.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ struct BitmapCacheEntry const SdPage* pPage; GraphicObject* pGraphicObject; sal_uInt32 nSizeBytes; - long nZoom; + long nZoom; }; /************************************************************************* @@ -63,7 +63,7 @@ void BitmapCache::Remove( const SdPage* pPage ) for( ULONG nPos = 0; nPos < aEntries.Count(); ) { BitmapCacheEntry* pCand = (BitmapCacheEntry*) aEntries.GetObject( nPos ); - + if( pCand->pPage == pPage ) { pCand = (BitmapCacheEntry*) aEntries.Remove((ULONG)nPos); diff --git a/sd/source/ui/view/clview.cxx b/sd/source/ui/view/clview.cxx index 3d6197d00db5..eb702e5b8c48 100644 --- a/sd/source/ui/view/clview.cxx +++ b/sd/source/ui/view/clview.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index b32cd1fe023a..76f6f71e3c2d 100755 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -209,9 +209,9 @@ BOOL DrawView::SetAttributes(const SfxItemSet& rSet, else if (eObjKind == OBJ_OUTLINETEXT) { // Presentation object outline - OutlinerView* pOV = GetTextEditOutlinerView(); + OutlinerView* pOV = GetTextEditOutlinerView(); ::Outliner* pOutliner = pOV->GetOutliner(); - List* pList = (List*)pOV->CreateSelectionList(); + List* pList = (List*)pOV->CreateSelectionList(); aTemplateName += String(SdResId(STR_LAYOUT_OUTLINE)); pOutliner->SetUpdateMode(FALSE); @@ -290,7 +290,7 @@ BOOL DrawView::SetAttributes(const SfxItemSet& rSet, { // Selection const SdrMarkList& rList = GetMarkedObjectList(); - ULONG nMarkCount = rList.GetMarkCount(); + ULONG nMarkCount = rList.GetMarkCount(); for (ULONG nMark = 0; nMark < nMarkCount; nMark++) { SdrObject* pObject = rList.GetMark(nMark)->GetMarkedSdrObj(); @@ -385,7 +385,7 @@ BOOL DrawView::SetAttributes(const SfxItemSet& rSet, bOk = ::sd::View::SetAttributes(rSet, bReplaceAll); } } - else // nicht auf der Masterpage + else // nicht auf der Masterpage { bOk = ::sd::View::SetAttributes(rSet, bReplaceAll); } diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx index ae512b0441d9..6c8be6b8a1eb 100644 --- a/sd/source/ui/view/drbezob.cxx +++ b/sd/source/ui/view/drbezob.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -148,17 +148,17 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) // #i77187# if object is move and/or size protected, do not allow point editing at all rSet.DisableItem(SID_BEZIER_MOVE); rSet.DisableItem(SID_BEZIER_INSERT); - + rSet.DisableItem(SID_BEZIER_DELETE); rSet.DisableItem(SID_BEZIER_CUTLINE); rSet.DisableItem(SID_BEZIER_CONVERT); - + rSet.DisableItem(SID_BEZIER_EDGE); rSet.DisableItem(SID_BEZIER_SMOOTH); rSet.DisableItem(SID_BEZIER_SYMMTR); - + rSet.DisableItem(SID_BEZIER_CLOSE); - + rSet.DisableItem(SID_BEZIER_ELIMINATE_POINTS); } else @@ -225,7 +225,7 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) } } - if(pIPPEC == mpView) + if(pIPPEC == mpView) rSet.Put(SfxBoolItem(SID_BEZIER_ELIMINATE_POINTS, mpView->IsEliminatePolyPoints())); else rSet.DisableItem( SID_BEZIER_ELIMINATE_POINTS ); // only works for views diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 9eb0a3b2ff8c..fd94f011ba27 100755 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -165,13 +165,13 @@ TextObjectBar::~TextObjectBar() void TextObjectBar::GetAttrState( SfxItemSet& rSet ) { - SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); - BOOL bTemplate = FALSE; - SfxItemSet aAttrSet( mpView->GetDoc()->GetPool() ); + SfxWhichIter aIter( rSet ); + USHORT nWhich = aIter.FirstWhich(); + BOOL bTemplate = FALSE; + SfxItemSet aAttrSet( mpView->GetDoc()->GetPool() ); SvtLanguageOptions aLangOpt; sal_Bool bDisableParagraphTextDirection = !aLangOpt.IsCTLFontEnabled(); - sal_Bool bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled(); + sal_Bool bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled(); mpView->GetAttributes( aAttrSet ); @@ -406,8 +406,8 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) //! avoid puting the same item as SfxBoolItem at the end of this function nSlotId = 0; } - break; - + break; + default: break; } diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 4a6d83e376e7..db1792ba613a 100755 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -317,14 +317,14 @@ void TextObjectBar::Execute( SfxRequest &rReq ) break; case FN_NUM_BULLET_ON: - if( pOLV ) + if( pOLV ) pOLV->ToggleBullets(); break; case SID_GROW_FONT_SIZE: case SID_SHRINK_FONT_SIZE: { - const SvxFontListItem* pFonts = (const SvxFontListItem*)mpViewShell->GetDocSh()->GetItem( SID_ATTR_CHAR_FONTLIST ); + const SvxFontListItem* pFonts = (const SvxFontListItem*)mpViewShell->GetDocSh()->GetItem( SID_ATTR_CHAR_FONTLIST ); const FontList* pFontList = pFonts ? pFonts->GetFontList(): 0; if( pFontList ) { @@ -344,7 +344,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) if (aReplaceText.Len() > 0) ReplaceTextWithSynonym( pOLV->GetEditView(), aReplaceText ); } - break; + break; default: { diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 5fbd400d7520..3c36538130a5 100755 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -344,7 +344,7 @@ USHORT DrawViewShell::PrepareClose( BOOL bUI, BOOL bForBrowsing ) if ( ViewShell::PrepareClose(bUI, bForBrowsing) != TRUE ) return FALSE; - BOOL bRet = TRUE; + BOOL bRet = TRUE; if( bRet && HasCurrentFunction() ) { @@ -540,7 +540,7 @@ bool DrawViewShell::IsLayerModeActive (void) const long DrawViewShell::GetHCtrlWidth() { - // return maTabControl.GetSizePixel().Width(); + // return maTabControl.GetSizePixel().Width(); return 0; } @@ -555,11 +555,11 @@ SvxRuler* DrawViewShell::CreateHRuler (::sd::Window* pWin, BOOL bIsFirst) { Ruler* pRuler; WinBits aWBits; - USHORT nFlags = SVXRULER_SUPPORT_OBJECT; + USHORT nFlags = SVXRULER_SUPPORT_OBJECT; if ( bIsFirst ) { - aWBits = WB_HSCROLL | WB_3DLOOK | WB_BORDER | WB_EXTRAFIELD; + aWBits = WB_HSCROLL | WB_3DLOOK | WB_BORDER | WB_EXTRAFIELD; nFlags |= ( SVXRULER_SUPPORT_SET_NULLOFFSET | SVXRULER_SUPPORT_TABS | SVXRULER_SUPPORT_PARAGRAPH_MARGINS ); // Neu @@ -599,7 +599,7 @@ SvxRuler* DrawViewShell::CreateVRuler(::sd::Window* pWin) { Ruler* pRuler; WinBits aWBits = WB_VSCROLL | WB_3DLOOK | WB_BORDER; - USHORT nFlags = SVXRULER_SUPPORT_OBJECT; + USHORT nFlags = SVXRULER_SUPPORT_OBJECT; pRuler = new Ruler(*this, GetParentWindow(), pWin, nFlags, GetViewFrame()->GetBindings(), aWBits); @@ -722,7 +722,7 @@ SdPage* DrawViewShell::getCurrentPage() const void DrawViewShell::ResetActualPage() { USHORT nCurrentPage = maTabControl.GetCurPageId() - 1; - USHORT nPageCount = (meEditMode == EM_PAGE)?GetDoc()->GetSdPageCount(mePageKind):GetDoc()->GetMasterSdPageCount(mePageKind); + USHORT nPageCount = (meEditMode == EM_PAGE)?GetDoc()->GetSdPageCount(mePageKind):GetDoc()->GetMasterSdPageCount(mePageKind); if (nPageCount > 0) nCurrentPage = Min((USHORT)(nPageCount - 1), nCurrentPage); else @@ -1219,7 +1219,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) // set pages for all available handout presentation objects sd::ShapeList& rShapeList = pMaster->GetPresentationShapeList(); SdrObject* pObj = 0; - + while( (pObj = rShapeList.getNextShape(pObj)) != 0 ) { if( pMaster->GetPresObjKind(pObj) == PRESOBJ_HANDOUT ) diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 3102dc726a61..08c144048d58 100755 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -534,7 +534,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) rReq.Done (); break; } - case SID_ZOOMING : // kein Menueintrag, sondern aus dem Zoomdialog generiert + case SID_ZOOMING : // kein Menueintrag, sondern aus dem Zoomdialog generiert { const SfxItemSet* pArgs = rReq.GetArgs(); @@ -645,7 +645,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) Cancel(); if( HasCurrentFunction(SID_BEZIER_EDIT) ) - { // ggf. die richtige Editfunktion aktivieren + { // ggf. die richtige Editfunktion aktivieren GetViewFrame()->GetDispatcher()->Execute(SID_SWITCH_POINTEDIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); } @@ -870,10 +870,10 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_DELETE_SNAPITEM: { SdrPageView* pPV; - Point aMPos = GetActiveWindow()->PixelToLogic( maMousePos ); - USHORT nHitLog = (USHORT) GetActiveWindow()->PixelToLogic( Size( + Point aMPos = GetActiveWindow()->PixelToLogic( maMousePos ); + USHORT nHitLog = (USHORT) GetActiveWindow()->PixelToLogic( Size( FuPoor::HITPIX, 0 ) ).Width(); - USHORT nHelpLine; + USHORT nHelpLine; mbMousePosFreezed = FALSE; @@ -908,7 +908,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_DRAW_FONTWORK: case SID_DRAW_FONTWORK_VERTICAL: { - svx::FontworkBar::execute( mpView, rReq, GetViewFrame()->GetBindings() ); // SJ: can be removed (I think) + svx::FontworkBar::execute( mpView, rReq, GetViewFrame()->GetBindings() ); // SJ: can be removed (I think) Cancel(); rReq.Done(); } diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 28f8d909031b..9f7961730649 100755 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -149,7 +149,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) } } - // USHORT nSlot = rReq.GetSlot(); + // USHORT nSlot = rReq.GetSlot(); switch (nSlot) { case SID_SWITCHPAGE: // BASIC @@ -194,8 +194,8 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) } nSelectedPage = (short) nWhatPage; - mePageKind = (PageKind) nWhatKind; - bWasBasic = TRUE; + mePageKind = (PageKind) nWhatKind; + bWasBasic = TRUE; } } else @@ -240,7 +240,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) break; } - case SID_PAGEMODE: // BASIC + case SID_PAGEMODE: // BASIC { const SfxItemSet *pArgs = rReq.GetArgs (); @@ -849,7 +849,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet) { rSet.DisableItem( SID_RULER_OBJECT ); rSet.DisableItem( EE_PARA_TABS ); -// rSet.DisableItem( SID_RULER_TEXT_RIGHT_TO_LEFT ); +// rSet.DisableItem( SID_RULER_TEXT_RIGHT_TO_LEFT ); } rSet.Put( aLRSpace ); @@ -898,10 +898,10 @@ void DrawViewShell::ExecStatusBar(SfxRequest& rReq) void DrawViewShell::GetSnapItemState( SfxItemSet &rSet ) { SdrPageView* pPV; - Point aMPos = GetActiveWindow()->PixelToLogic(maMousePos); - USHORT nHitLog = (USHORT) GetActiveWindow()->PixelToLogic( + Point aMPos = GetActiveWindow()->PixelToLogic(maMousePos); + USHORT nHitLog = (USHORT) GetActiveWindow()->PixelToLogic( Size(FuPoor::HITPIX,0)).Width(); - USHORT nHelpLine; + USHORT nHelpLine; if ( mpDrawView->PickHelpLine(aMPos, nHitLog, *GetActiveWindow(), nHelpLine, pPV) ) { diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index 88027d360806..7f604cc8d26c 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,7 +102,7 @@ using namespace ::com::sun::star::drawing; void DrawViewShell::DeleteActualPage() { - USHORT nPage = maTabControl.GetCurPageId() - 1; + USHORT nPage = maTabControl.GetCurPageId() - 1; mpDrawView->SdrEndTextEdit(); @@ -146,7 +146,7 @@ void DrawViewShell::DeleteActualLayer() // Hint von Joe angestossen werden // ( View::Notify() --> ViewShell::ResetActualLayer() ) - mbIsLayerModeActive = false; // damit ChangeEditMode() ueberhaupt was tut + mbIsLayerModeActive = false; // damit ChangeEditMode() ueberhaupt was tut ChangeEditMode(GetEditMode(), true); } } @@ -400,14 +400,14 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin) if ( mbPipette && GetViewFrame()->HasChildWindow( SvxBmpMaskChildWindow::GetChildWindowId() ) ) { - const long nStartX = maMousePos.X() - PIPETTE_RANGE; - const long nEndX = maMousePos.X() + PIPETTE_RANGE; - const long nStartY = maMousePos.Y() - PIPETTE_RANGE; - const long nEndY = maMousePos.Y() + PIPETTE_RANGE; - long nRed = 0; - long nGreen = 0; - long nBlue = 0; - const double fDiv = ( ( PIPETTE_RANGE << 1 ) + 1 ) * ( ( PIPETTE_RANGE << 1 ) + 1 ); + const long nStartX = maMousePos.X() - PIPETTE_RANGE; + const long nEndX = maMousePos.X() + PIPETTE_RANGE; + const long nStartY = maMousePos.Y() - PIPETTE_RANGE; + const long nEndY = maMousePos.Y() + PIPETTE_RANGE; + long nRed = 0; + long nGreen = 0; + long nBlue = 0; + const double fDiv = ( ( PIPETTE_RANGE << 1 ) + 1 ) * ( ( PIPETTE_RANGE << 1 ) + 1 ); for ( long nY = nStartY; nY <= nEndY; nY++ ) { @@ -518,7 +518,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) if( !mpDrawView->InsertData( aDataHelper, aPos, nDnDAction, FALSE ) ) { - INetBookmark aINetBookmark( aEmptyStr, aEmptyStr ); + INetBookmark aINetBookmark( aEmptyStr, aEmptyStr ); if( ( aDataHelper.HasFormat( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK ) && aDataHelper.GetINetBookmark( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, aINetBookmark ) ) || @@ -540,13 +540,13 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) // Ist ein Fangobjekt unter dem Mauszeiger? SdrPageView* pPV; - Point aMPos = pWin->PixelToLogic( maMousePos ); - USHORT nHitLog = (USHORT) GetActiveWindow()->PixelToLogic( + Point aMPos = pWin->PixelToLogic( maMousePos ); + USHORT nHitLog = (USHORT) GetActiveWindow()->PixelToLogic( Size(FuPoor::HITPIX, 0 ) ).Width(); - USHORT nHelpLine; + USHORT nHelpLine; // fuer Klebepunkt - SdrObject* pObj = NULL; - USHORT nPickId = 0; + SdrObject* pObj = NULL; + USHORT nPickId = 0; // fuer Feldbefehl OutlinerView* pOLV = mpDrawView->GetTextEditOutlinerView(); const SvxFieldItem* pFldItem = NULL; @@ -622,7 +622,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) mpDrawView->GetMarkedObjectList().GetMarkCount() == 1 ) { pObj = mpDrawView->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj(); - if( HasCurrentFunction(SID_BEZIER_EDIT) && (dynamic_cast< SdrPathObj * >( pObj ) != 0 ) ) + if( HasCurrentFunction(SID_BEZIER_EDIT) && (dynamic_cast< SdrPathObj * >( pObj ) != 0 ) ) { nSdResId = RID_BEZIER_POPUP; } @@ -694,7 +694,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) break; case OBJ_FREELINE: - case OBJ_EDGE: // Connector + case OBJ_EDGE: // Connector nSdResId = bGraphicShell ? RID_GRAPHIC_EDGEOBJ_POPUP : RID_DRAW_EDGEOBJ_POPUP; break; @@ -845,11 +845,11 @@ void DrawViewShell::ShowMousePosInfo(const Rectangle& rRect, { if (mbHasRulers && pWin ) { - RulerLine pHLines[2]; - RulerLine pVLines[2]; + RulerLine pHLines[2]; + RulerLine pVLines[2]; long nHOffs = 0L; long nVOffs = 0L; - USHORT nCnt; + USHORT nCnt; if (mpHorizontalRuler.get() != NULL) mpHorizontalRuler->SetLines(); @@ -899,7 +899,7 @@ void DrawViewShell::ShowMousePosInfo(const Rectangle& rRect, SID_ATTR_SIZE, SID_ATTR_SIZE, 0L); -// GetStatusBarState(aSet); nicht performant bei gedrueckter Modifiertaste!! +// GetStatusBarState(aSet); nicht performant bei gedrueckter Modifiertaste!! aSet.Put( SfxStringItem( SID_CONTEXT, mpDrawView->GetStatusText() ) ); diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index 18ff686fc612..32041728aa97 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -100,7 +100,7 @@ void DrawViewShell::ModelHasChanged() // jetzt den von der Drawing Engine neu erzeugten TextEditOutliner // initialisieren - ::Outliner* pOutliner = mpDrawView->GetTextEditOutliner(); + ::Outliner* pOutliner = mpDrawView->GetTextEditOutliner(); if (pOutliner) { SfxStyleSheetPool* pSPool = (SfxStyleSheetPool*) GetDocSh()->GetStyleSheetPool(); @@ -135,7 +135,7 @@ void DrawViewShell::ArrangeGUIElements (void) // Retrieve the current size (thickness) of the scroll bars. That is // the width of the vertical and the height of the horizontal scroll // bar. - int nScrollBarSize = + int nScrollBarSize = GetParentWindow()->GetSettings().GetStyleSettings().GetScrollBarSize(); maScrBarWH = Size (nScrollBarSize, nScrollBarSize); @@ -273,8 +273,8 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView) mpDrawView->SetMasterPagePaintCaching( pView->IsMasterPagePaintCaching() ); // Definition: - // grosse Handles: 9 - // kleine Handles: 7 + // grosse Handles: 9 + // kleine Handles: 7 USHORT nTmp = mpDrawView->GetMarkHdlSizePixel(); //DBG_ASSERT(nTmp != 7, "HandleSize != 7 oder 9"); if( nTmp == 9 && !pView->IsBigHandles() ) @@ -468,7 +468,7 @@ void DrawViewShell::Paint(const Rectangle& rRect, ::sd::Window* pWin) aFillColor = Color( aColorConfig.GetColorValue( svtools::DOCCOLOR ).nColor ); } - /* #97517# This is done before each text edit, so why not do it before every paint. + /* #97517# This is done before each text edit, so why not do it before every paint. The default language is only used if the outliner only contains one character in a symbol font */ GetDoc()->GetDrawOutliner( NULL ).SetDefaultLanguage( GetDoc()->GetLanguage( EE_CHAR_LANGUAGE ) ); @@ -476,7 +476,7 @@ void DrawViewShell::Paint(const Rectangle& rRect, ::sd::Window* pWin) // #103834# Set Application Background color for usage in SdrPaintView(s) mpDrawView->SetApplicationBackgroundColor(aFillColor); - /* #97517# This is done before each text edit, so why not do it before every paint. + /* #97517# This is done before each text edit, so why not do it before every paint. The default language is only used if the outliner only contains one character in a symbol font */ GetDoc()->GetDrawOutliner( NULL ).SetDefaultLanguage( Application::GetSettings().GetLanguage() ); @@ -687,7 +687,7 @@ void DrawViewShell::VisAreaChanged(const Rectangle& rRect) int DrawViewShell::GetActiveTabLayerIndex (void) const { - const LayerTabBar* pBar + const LayerTabBar* pBar = const_cast<DrawViewShell*>(this)->GetLayerTabControl (); if (pBar != NULL) return pBar->GetPagePos (pBar->GetCurPageId()); @@ -734,7 +734,7 @@ LayerTabBar* DrawViewShell::GetLayerTabControl (void) int DrawViewShell::GetTabLayerCount (void) const { - const LayerTabBar* pBar + const LayerTabBar* pBar = const_cast<DrawViewShell*>(this)->GetLayerTabControl (); if (pBar != NULL) return pBar->GetPageCount(); diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 681192ff351b..76944c419623 100755 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -126,7 +126,7 @@ void DrawViewShell::ExecFormText(SfxRequest& rReq) GetValue()); if(HasCurrentFunction(SID_BEZIER_EDIT)) - { // ggf. die richtige Editfunktion aktivieren + { // ggf. die richtige Editfunktion aktivieren GetViewFrame()->GetDispatcher()->Execute(SID_SWITCH_POINTEDIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); } @@ -160,8 +160,8 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet) !((SdrTextObj*) pObj)->HasText() ) { // automatisches Auf/Zuklappen des FontWork-Dialog; erstmal deaktiviert -// if ( pDlg ) -// pDlg->SetActive(FALSE); +// if ( pDlg ) +// pDlg->SetActive(FALSE); rSet.DisableItem(XATTR_FORMTXTSTYLE); rSet.DisableItem(XATTR_FORMTXTADJUST); @@ -180,7 +180,7 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet) { if ( pDlg ) { -// pDlg->SetActive(); +// pDlg->SetActive(); pDlg->SetColorTable(GetDoc()->GetColorTable()); } @@ -261,7 +261,7 @@ void DrawViewShell::GetAnimationWinState( SfxItemSet& rSet ) { const SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); UINT32 nInv = pObj->GetObjInventor(); - UINT16 nId = pObj->GetObjIdentifier(); + UINT16 nId = pObj->GetObjIdentifier(); // 1 selektiertes Gruppenobjekt if( nInv == SdrInventor && nId == OBJ_GRUP ) nValue = 3; @@ -373,8 +373,8 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) if ( pObj && !mpDrawView->IsTextEdit() ) { - SdrGrafObj* pNewObj = (SdrGrafObj*) pObj->Clone(); - BOOL bCont = TRUE; + SdrGrafObj* pNewObj = (SdrGrafObj*) pObj->Clone(); + BOOL bCont = TRUE; if( pNewObj->IsLinkedGraphic() ) { @@ -392,8 +392,8 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) if( bCont ) { - const Graphic& rOldGraphic = pNewObj->GetGraphic(); - const Graphic aNewGraphic( ( (SvxBmpMask*) GetViewFrame()->GetChildWindow( + const Graphic& rOldGraphic = pNewObj->GetGraphic(); + const Graphic aNewGraphic( ( (SvxBmpMask*) GetViewFrame()->GetChildWindow( SvxBmpMaskChildWindow::GetChildWindowId() )->GetWindow() )-> Mask( rOldGraphic ) ); @@ -402,7 +402,7 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) SdrPageView* pPV = mpDrawView->GetSdrPageView(); pNewObj->SetEmptyPresObj( FALSE ); - pNewObj->SetGraphic( ( (SvxBmpMask*) GetViewFrame()->GetChildWindow( + pNewObj->SetGraphic( ( (SvxBmpMask*) GetViewFrame()->GetChildWindow( SvxBmpMaskChildWindow::GetChildWindowId() )->GetWindow() )-> Mask( pNewObj->GetGraphic() ) ); @@ -431,11 +431,11 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) void DrawViewShell::GetBmpMaskState( SfxItemSet& rSet ) { - const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); - const SdrObject* pObj = NULL; - USHORT nId = SvxBmpMaskChildWindow::GetChildWindowId(); - SvxBmpMask* pDlg = NULL; - BOOL bEnable = FALSE; + const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); + const SdrObject* pObj = NULL; + USHORT nId = SvxBmpMaskChildWindow::GetChildWindowId(); + SvxBmpMask* pDlg = NULL; + BOOL bEnable = FALSE; if ( GetViewFrame()->HasChildWindow( nId ) ) { @@ -683,7 +683,7 @@ void DrawViewShell::FuTemp04(SfxRequest& rReq) rReq.Ignore (); } break; - + case SID_LAYER_DIALOG_WIN: { if ( rReq.GetArgs() ) diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 5166c392292c..af6de2dd4703 100755 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -303,7 +303,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if( pPage && !pPage->IsMasterPage() ) { - rSet.Put( SfxUInt32Item( SID_ASSIGN_LAYOUT, static_cast< sal_uInt32 >(pPage->GetAutoLayout()) ) ); + rSet.Put( SfxUInt32Item( SID_ASSIGN_LAYOUT, static_cast< sal_uInt32 >(pPage->GetAutoLayout()) ) ); bDisable = false; } } @@ -447,7 +447,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) // Vertikale Ausrichtung USHORT nVert = mpDrawView->GetMarkedGluePointsAlign( TRUE ); rSet.Put( SfxBoolItem( SID_GLUE_VERTALIGN_CENTER, nVert == SDRVERTALIGN_CENTER ) ); - rSet.Put( SfxBoolItem( SID_GLUE_VERTALIGN_TOP, nVert == SDRVERTALIGN_TOP ) ); + rSet.Put( SfxBoolItem( SID_GLUE_VERTALIGN_TOP, nVert == SDRVERTALIGN_TOP ) ); rSet.Put( SfxBoolItem( SID_GLUE_VERTALIGN_BOTTOM, nVert == SDRVERTALIGN_BOTTOM ) ); } @@ -872,9 +872,9 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DELETE_MASTER_PAGE ) ) { if (maTabControl.GetPageCount() == 1 || - meEditMode == EM_MASTERPAGE || - mePageKind == PK_NOTES || - mePageKind == PK_HANDOUT || + meEditMode == EM_MASTERPAGE || + mePageKind == PK_NOTES || + mePageKind == PK_HANDOUT || (GetShellType()!=ST_DRAW&&IsLayerModeActive())) { if (rSet.GetItemState(SID_DELETE_PAGE) == SFX_ITEM_AVAILABLE) @@ -887,8 +887,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) // darf der aktuelle Layer geloescht werden? if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DELETE_LAYER ) ) { - USHORT nCurrentLayer = GetLayerTabControl()->GetCurPageId(); - const String& rName = GetLayerTabControl()->GetPageText(nCurrentLayer); + USHORT nCurrentLayer = GetLayerTabControl()->GetCurPageId(); + const String& rName = GetLayerTabControl()->GetPageText(nCurrentLayer); BOOL bDisableIt = !IsLayerModeActive(); bDisableIt |= (rName == String(SdResId(STR_LAYER_LAYOUT))); @@ -970,7 +970,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem( SID_SIZE_ALL ); rSet.DisableItem( SID_SIZE_PAGE_WIDTH ); rSet.DisableItem( SID_SIZE_PAGE ); -// rSet.DisableItem( SID_INSERTPAGE ); +// rSet.DisableItem( SID_INSERTPAGE ); rSet.DisableItem( SID_DUPLICATE_PAGE ); rSet.DisableItem( SID_ZOOM_TOOLBOX ); } @@ -1397,7 +1397,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) BOOL bFoundAny = FALSE; bool bFoundTable = false; -// const int nMarkCount = (int) aMarkList.GetMarkCount(); +// const int nMarkCount = (int) aMarkList.GetMarkCount(); for (ULONG i=0; i < nMarkCount && !bFoundAny; i++) { SdrObject* pObj= aMarkList.GetMark(i)->GetMarkedSdrObj(); @@ -1467,11 +1467,11 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if( bFoundObjNoLine ) rSet.DisableItem( SID_ATTRIBUTES_LINE ); - if( bFoundBitmap && !bFoundMetafile && !bFoundNoGraphicObj ) // only Bitmaps marked + if( bFoundBitmap && !bFoundMetafile && !bFoundNoGraphicObj ) // only Bitmaps marked rSet.DisableItem( SID_CONVERT_TO_BITMAP ); - else if( !bFoundBitmap && bFoundMetafile && !bFoundNoGraphicObj ) // only Metafiles marked + else if( !bFoundBitmap && bFoundMetafile && !bFoundNoGraphicObj ) // only Metafiles marked rSet.DisableItem( SID_CONVERT_TO_METAFILE ); - else if( !bFoundBitmap && !bFoundMetafile && !bFoundNoGraphicObj ) // nothing to do + else if( !bFoundBitmap && !bFoundMetafile && !bFoundNoGraphicObj ) // nothing to do { rSet.DisableItem( SID_CONVERT_TO_BITMAP ); rSet.DisableItem( SID_CONVERT_TO_METAFILE ); diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx index 54cd0c792c94..beb6b2fbb996 100755 --- a/sd/source/ui/view/drviews8.cxx +++ b/sd/source/ui/view/drviews8.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,7 +85,7 @@ #include "drawview.hxx" #include "zoomlist.hxx" #include <vos/mutex.hxx> -#include <vcl/salbtype.hxx> // FRound +#include <vcl/salbtype.hxx> // FRound #include <vcl/svapp.hxx> namespace sd { @@ -122,7 +122,7 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq) } break; - case SID_CHAR_DLG: // BASIC + case SID_CHAR_DLG: // BASIC { SetCurrentFunction( FuChar::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) ); Cancel(); @@ -463,8 +463,8 @@ void DrawViewShell::ScannerEvent( const ::com::sun::star::lang::EventObject& ) { if( mxScannerManager.is() ) { - const ::com::sun::star::scanner::ScannerContext aContext( mxScannerManager->getAvailableScanners().getConstArray()[ 0 ] ); - const ::com::sun::star::scanner::ScanError eError = mxScannerManager->getError( aContext ); + const ::com::sun::star::scanner::ScannerContext aContext( mxScannerManager->getAvailableScanners().getConstArray()[ 0 ] ); + const ::com::sun::star::scanner::ScanError eError = mxScannerManager->getError( aContext ); if( ::com::sun::star::scanner::ScanError_ScanErrorNone == eError ) { diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index 998d723aec45..31fd7fbcc8d8 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -100,8 +100,8 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) if ( pArgs ) { - const UINT32 nFormats = ( (SfxUInt32Item&) pArgs->Get( SID_GALLERY_FORMATS ) ).GetValue(); - GalleryExplorer* pGal = SVX_GALLERY(); + const UINT32 nFormats = ( (SfxUInt32Item&) pArgs->Get( SID_GALLERY_FORMATS ) ).GetValue(); + GalleryExplorer* pGal = SVX_GALLERY(); if ( pGal ) { @@ -128,12 +128,12 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) // Falls Grafik zu gross, wird die Grafik // in die Seite eingepasst - if ( ( ( aSize.Height() > aPageSize.Height() ) || ( aSize.Width() > aPageSize.Width() ) ) && + if ( ( ( aSize.Height() > aPageSize.Height() ) || ( aSize.Width() > aPageSize.Width() ) ) && aSize.Height() && aPageSize.Height() ) { - float fGrfWH = (float)aSize.Width() / + float fGrfWH = (float)aSize.Width() / (float)aSize.Height(); - float fWinWH = (float)aPageSize.Width() / + float fWinWH = (float)aPageSize.Width() / (float)aPageSize.Height(); // Grafik an Pagesize anpassen (skaliert) @@ -151,7 +151,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) // Ausgaberechteck fuer Grafik setzen - Point aPnt ((aPageSize.Width() - aSize.Width()) / 2, + Point aPnt ((aPageSize.Width() - aSize.Width()) / 2, (aPageSize.Height() - aSize.Height()) / 2); aPnt += Point(pPage->GetLftBorder(), pPage->GetUppBorder()); Rectangle aRect (aPnt, aSize); @@ -258,8 +258,8 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) CheckLineTo (rReq); - SfxBindings& rBindings = GetViewFrame()->GetBindings(); - SfxItemSet* pAttr = new SfxItemSet ( GetDoc()->GetPool() ); + SfxBindings& rBindings = GetViewFrame()->GetBindings(); + SfxItemSet* pAttr = new SfxItemSet ( GetDoc()->GetPool() ); GetView()->GetAttributes( *pAttr ); const SfxItemSet* pArgs = rReq.GetArgs(); @@ -375,8 +375,8 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, FALSE); XGradientList *pGradientList = GetDoc()->GetGradientList (); - long nCounts = pGradientList->Count (); - Color aColor ((BYTE) pRed->GetValue (), + long nCounts = pGradientList->Count (); + Color aColor ((BYTE) pRed->GetValue (), (BYTE) pGreen->GetValue (), (BYTE) pBlue->GetValue ()); long i; @@ -435,8 +435,8 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, FALSE); XHatchList *pHatchList = GetDoc()->GetHatchList (); - long nCounts = pHatchList->Count (); - Color aColor ((BYTE) pRed->GetValue (), + long nCounts = pHatchList->Count (); + Color aColor ((BYTE) pRed->GetValue (), (BYTE) pGreen->GetValue (), (BYTE) pBlue->GetValue ()); long i; @@ -500,8 +500,8 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) pAttr->ClearItem (XATTR_LINESTYLE); XDashList *pDashList = GetDoc()->GetDashList (); - long nCounts = pDashList->Count (); - XDashEntry *pEntry = new XDashEntry (aNewDash, pName->GetValue ()); + long nCounts = pDashList->Count (); + XDashEntry *pEntry = new XDashEntry (aNewDash, pName->GetValue ()); long i; for ( i = 0; i < nCounts; i++ ) @@ -552,7 +552,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) pAttr->ClearItem (XATTR_FILLSTYLE); XGradientList *pGradientList = GetDoc()->GetGradientList (); - long nCounts = pGradientList->Count (); + long nCounts = pGradientList->Count (); long i; for ( i = 0; i < nCounts; i++ ) @@ -618,7 +618,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) pAttr->ClearItem (XATTR_FILLSTYLE); XHatchList *pHatchList = GetDoc()->GetHatchList (); - long nCounts = pHatchList->Count (); + long nCounts = pHatchList->Count (); long i; for ( i = 0; i < nCounts; i++ ) @@ -668,7 +668,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, FALSE); XGradientList *pGradientList = GetDoc()->GetGradientList (); - long nCounts = pGradientList->Count (); + long nCounts = pGradientList->Count (); for (long i = 0; i < nCounts; @@ -702,7 +702,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, FALSE); XHatchList *pHatchList = GetDoc()->GetHatchList (); - long nCounts = pHatchList->Count (); + long nCounts = pHatchList->Count (); for (long i = 0; i < nCounts; @@ -743,7 +743,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) StarBASIC::FatalError (SbERR_WRONG_ARGS); break; -/* case SID_SETFONTFAMILYNAME : +/* case SID_SETFONTFAMILYNAME : case SID_SETFONTSTYLENAME : case SID_SETFONTFAMILY : case SID_SETFONTPITCH : @@ -779,8 +779,8 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) void DrawViewShell::AttrState (SfxItemSet& rSet) { - SfxWhichIter aIter (rSet); - USHORT nWhich = aIter.FirstWhich (); + SfxWhichIter aIter (rSet); + USHORT nWhich = aIter.FirstWhich (); SfxItemSet aAttr( GetDoc()->GetPool() ); mpDrawView->GetAttributes( aAttr ); @@ -817,7 +817,7 @@ void DrawViewShell::AttrState (SfxItemSet& rSet) case SID_GETBLUE : { const SfxUInt32Item &rWhatKind = (const SfxUInt32Item &) rSet.Get (ID_VAL_WHATKIND); - Color aColor; + Color aColor; switch (rWhatKind.GetValue ()) { @@ -841,7 +841,7 @@ void DrawViewShell::AttrState (SfxItemSet& rSet) case 4 : { const XFillGradientItem &rFillGradientItem = (const XFillGradientItem &) aAttr.Get (XATTR_FILLGRADIENT); - const XGradient &rGradient = rFillGradientItem.GetGradientValue (); + const XGradient &rGradient = rFillGradientItem.GetGradientValue (); aColor = (rWhatKind.GetValue () == 3) ? rGradient.GetStartColor () @@ -852,7 +852,7 @@ void DrawViewShell::AttrState (SfxItemSet& rSet) case 5: { const XFillHatchItem &rFillHatchItem = (const XFillHatchItem &) aAttr.Get (XATTR_FILLHATCH); - const XHatch &rHatch = rFillHatchItem.GetHatchValue (); + const XHatch &rHatch = rFillHatchItem.GetHatchValue (); aColor = rHatch.GetColor (); break; diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 3628a11ac5a1..374310d21c4c 100755 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -104,7 +104,7 @@ class ScannerEventListener : public ::cppu::WeakImplHelper1< ::com::sun::star::l { private: - DrawViewShell* mpParent; + DrawViewShell* mpParent; public: @@ -112,9 +112,9 @@ public: ~ScannerEventListener(); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEventObject ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEventObject ) throw (::com::sun::star::uno::RuntimeException); - void ParentDestroyed() { mpParent = NULL; } + void ParentDestroyed() { mpParent = NULL; } }; // ----------------------------------------------------------------------------- @@ -159,7 +159,7 @@ DrawViewShell::~DrawViewShell() { mpAnnotationManager.reset(); mpViewOverlayManager.reset(); - + OSL_ASSERT (GetViewShell()!=NULL); if( mxScannerListener.is() ) @@ -204,7 +204,7 @@ DrawViewShell::~DrawViewShell() if ( mpClipEvtLstnr ) { mpClipEvtLstnr->AddRemoveListener( GetActiveWindow(), FALSE ); - mpClipEvtLstnr->ClearCallbackLink(); // #103849# prevent callback if another thread is waiting + mpClipEvtLstnr->ClearCallbackLink(); // #103849# prevent callback if another thread is waiting mpClipEvtLstnr->release(); } @@ -273,7 +273,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) GetDoc()->CreateFirstPages(); mpDrawView = new DrawView(pDocSh, GetActiveWindow(), this); - mpView = mpDrawView; // Pointer der Basisklasse ViewShell + mpView = mpDrawView; // Pointer der Basisklasse ViewShell mpDrawView->SetSwapAsynchron(TRUE); // Asynchrones Laden von Graphiken // We do not read the page kind from the frame view anymore so we have @@ -401,8 +401,8 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) ::com::sun::star::uno::UNO_QUERY ); } } - - mpAnnotationManager.reset( new AnnotationManager( GetViewShellBase() ) ); + + mpAnnotationManager.reset( new AnnotationManager( GetViewShellBase() ) ); mpViewOverlayManager.reset( new ViewOverlayManager( GetViewShellBase() ) ); } @@ -473,7 +473,7 @@ bool DrawViewShell::RelocateToParentWindow (::Window* pParentWindow) /* linienzuege werden ueber makros als folge von MoveTo (x, y) - LineTo (x, y) [oder BezierTo (x, y)] + LineTo (x, y) [oder BezierTo (x, y)] LineTo (x, y) : dargestellt. einen endbefehl fuer die linienzuege @@ -844,7 +844,7 @@ void DrawViewShell::Notify (SfxBroadcaster&, const SfxHint& rHint) void DrawViewShell::ExecuteAnnotation (SfxRequest& rRequest) { if( mpAnnotationManager.get() ) - mpAnnotationManager->ExecuteAnnotation( rRequest ); + mpAnnotationManager->ExecuteAnnotation( rRequest ); } // -------------------------------------------------------------------- @@ -852,7 +852,7 @@ void DrawViewShell::ExecuteAnnotation (SfxRequest& rRequest) void DrawViewShell::GetAnnotationState (SfxItemSet& rItemSet ) { if( mpAnnotationManager.get() ) - mpAnnotationManager->GetAnnotationState( rItemSet ); + mpAnnotationManager->GetAnnotationState( rItemSet ); } diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index 2574032e3d99..ae7ec1b2513d 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ #include "SlideSorter.hxx" #include "controller/SlideSorterController.hxx" -#define RET_DELETE 100 +#define RET_DELETE 100 namespace sd { @@ -134,7 +134,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) while( bLoop && pDlg->Execute() == RET_OK ) { pDlg->GetAttr( aNewAttr ); - aLayerName = ((SdAttrLayerName &) aNewAttr.Get (ATTR_LAYER_NAME)).GetValue (); + aLayerName = ((SdAttrLayerName &) aNewAttr.Get (ATTR_LAYER_NAME)).GetValue (); if( rLayerAdmin.GetLayer( aLayerName, FALSE ) || aLayerName.Len()==0 ) @@ -160,11 +160,11 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) else { //pDlg->GetAttr( aNewAttr ); - //aLayerName = ((SdAttrLayerName &) aNewAttr.Get (ATTR_LAYER_NAME)).GetValue (); + //aLayerName = ((SdAttrLayerName &) aNewAttr.Get (ATTR_LAYER_NAME)).GetValue (); aLayerTitle = ((SdAttrLayerTitle &) aNewAttr.Get (ATTR_LAYER_TITLE)).GetValue (); aLayerDesc = ((SdAttrLayerDesc &) aNewAttr.Get (ATTR_LAYER_DESC)).GetValue (); - bIsVisible = ((SdAttrLayerVisible &) aNewAttr.Get (ATTR_LAYER_VISIBLE)).GetValue (); - bIsLocked = ((SdAttrLayerLocked &) aNewAttr.Get (ATTR_LAYER_LOCKED)).GetValue () ; + bIsVisible = ((SdAttrLayerVisible &) aNewAttr.Get (ATTR_LAYER_VISIBLE)).GetValue (); + bIsLocked = ((SdAttrLayerLocked &) aNewAttr.Get (ATTR_LAYER_LOCKED)).GetValue () ; bIsPrintable = ((SdAttrLayerPrintable &) aNewAttr.Get (ATTR_LAYER_PRINTABLE)).GetValue () ; delete pDlg; @@ -187,7 +187,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) aLayerName = pLayerName->GetValue (); bIsVisible = pIsVisible->GetValue (); - bIsLocked = pIsLocked->GetValue (); + bIsLocked = pIsLocked->GetValue (); bIsPrintable = pIsPrintable->GetValue (); } @@ -296,12 +296,12 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) pDlg->SetHelpId( SID_MODIFYLAYER ); // Ueberpruefung auf schon vorhandene Namen - BOOL bLoop = TRUE; - USHORT nRet = 0; + BOOL bLoop = TRUE; + USHORT nRet = 0; while( bLoop && ( (nRet = pDlg->Execute()) == RET_OK ) ) { pDlg->GetAttr( aNewAttr ); - aLayerName = ((SdAttrLayerName &) aNewAttr.Get (ATTR_LAYER_NAME)).GetValue (); + aLayerName = ((SdAttrLayerName &) aNewAttr.Get (ATTR_LAYER_NAME)).GetValue (); if( (rLayerAdmin.GetLayer( aLayerName, FALSE ) && aLayerName != aOldLayerName) || aLayerName.Len()==0 ) @@ -321,8 +321,8 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) case RET_OK : aLayerTitle = ((SdAttrLayerTitle &) aNewAttr.Get (ATTR_LAYER_TITLE)).GetValue (); aLayerDesc = ((SdAttrLayerDesc &) aNewAttr.Get (ATTR_LAYER_DESC)).GetValue (); - bIsVisible = ((const SdAttrLayerVisible &) aNewAttr.Get (ATTR_LAYER_VISIBLE)).GetValue (); - bIsLocked = ((const SdAttrLayerLocked &) aNewAttr.Get (ATTR_LAYER_LOCKED)).GetValue (); + bIsVisible = ((const SdAttrLayerVisible &) aNewAttr.Get (ATTR_LAYER_VISIBLE)).GetValue (); + bIsLocked = ((const SdAttrLayerLocked &) aNewAttr.Get (ATTR_LAYER_LOCKED)).GetValue (); bIsPrintable = ((const SdAttrLayerLocked &) aNewAttr.Get (ATTR_LAYER_PRINTABLE)).GetValue (); delete pDlg; @@ -345,7 +345,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) aLayerName = pLayerName->GetValue (); bIsVisible = pIsVisible->GetValue (); - bIsLocked = pIsLocked->GetValue (); + bIsLocked = pIsLocked->GetValue (); bIsPrintable = pIsPrintable->GetValue (); } else @@ -554,7 +554,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) if( GetDocSh()->HasName() ) aName = GetDocSh()->GetMedium()->GetName(); //else - // aName = GetDocSh()->GetName(); + // aName = GetDocSh()->GetName(); pFieldItem = new SvxFieldItem( SvxExtFileField( aName ), EE_FEATURE_FIELD ); } break; diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx index eefe0680d2d4..1f76e41d396b 100644 --- a/sd/source/ui/view/drviewsc.cxx +++ b/sd/source/ui/view/drviewsc.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,11 +69,11 @@ #include "drawdoc.hxx" #include "DrawDocShell.hxx" #include "drawview.hxx" -#include "sdabstdlg.hxx" -#include "brkdlg.hrc" +#include "sdabstdlg.hxx" +#include "brkdlg.hrc" namespace sd { -#define MIN_ACTIONS_FOR_DIALOG 5000 // bei mehr als 1600 Metaobjekten +#define MIN_ACTIONS_FOR_DIALOG 5000 // bei mehr als 1600 Metaobjekten // wird beim Aufbrechen ein Dialog // angezeigt. /************************************************************************* @@ -126,7 +126,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) OSL_ENSURE(pFact, "Dialogdiet fail!"); AbstractSvxObjectNameDialog* pDlg = pFact->CreateSvxObjectNameDialog(NULL, aName); OSL_ENSURE(pDlg, "Dialogdiet fail!"); - + pDlg->SetCheckNameHdl(LINK(this, DrawViewShell, NameObjectHdl)); if(RET_OK == pDlg->Execute()) @@ -205,7 +205,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) rReq.Done (); } break; - + case SID_COMBINE: // BASIC { // #88224# End text edit to avoid conflicts @@ -426,7 +426,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) } break; - case SID_FRAME_TO_TOP: // BASIC + case SID_FRAME_TO_TOP: // BASIC { mpDrawView->PutMarkedToTop(); Cancel(); @@ -444,7 +444,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) } break; - case SID_MOREBACK: // BASIC + case SID_MOREBACK: // BASIC { mpDrawView->MovMarkedToBtm(); Cancel(); @@ -453,7 +453,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) } break; - case SID_FRAME_TO_BOTTOM: // BASIC + case SID_FRAME_TO_BOTTOM: // BASIC { mpDrawView->PutMarkedToBtm(); Cancel(); @@ -470,7 +470,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) } break; - case SID_VERTICAL: // BASIC + case SID_VERTICAL: // BASIC { mpDrawView->MirrorAllMarkedVertical(); Cancel(); @@ -542,7 +542,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) } break; - case SID_STYLE_NEW: // BASIC ??? + case SID_STYLE_NEW: // BASIC ??? case SID_STYLE_APPLY: case SID_STYLE_EDIT: case SID_STYLE_DELETE: @@ -599,7 +599,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) case SID_IMAP: { SvxIMapDlg* pDlg; - USHORT nId = SvxIMapDlgChildWindow::GetChildWindowId(); + USHORT nId = SvxIMapDlgChildWindow::GetChildWindowId(); GetViewFrame()->ToggleChildWindow( nId ); GetViewFrame()->GetBindings().Invalidate( SID_IMAP ); @@ -607,7 +607,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) if ( GetViewFrame()->HasChildWindow( nId ) && ( ( pDlg = ViewShell::Implementation::GetImageMapDialog() ) != NULL ) ) { - const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); + const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); if ( rMarkList.GetMarkCount() == 1 ) UpdateIMapDlg( rMarkList.GetMark( 0 )->GetMarkedSdrObj() ); @@ -945,9 +945,9 @@ void DrawViewShell::UpdateIMapDlg( SdrObject* pObj ) if( ( pObj->ISA( SdrGrafObj ) || pObj->ISA( SdrOle2Obj ) ) && !mpDrawView->IsTextEdit() && GetViewFrame()->HasChildWindow( SvxIMapDlgChildWindow::GetChildWindowId() ) ) { - Graphic aGraphic; - ImageMap* pIMap = NULL; - TargetList* pTargetList = NULL; + Graphic aGraphic; + ImageMap* pIMap = NULL; + TargetList* pTargetList = NULL; SdIMapInfo* pIMapInfo = GetDoc()->GetIMapInfo( pObj ); // get graphic from shape diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx index 7e0dff5eeede..bf12c998cd7d 100644 --- a/sd/source/ui/view/drviewsd.cxx +++ b/sd/source/ui/view/drviewsd.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 6f6f49fdc93c..92c024a70cbc 100755 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -249,7 +249,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) switch ( nSId ) { - case SID_TEXTEDIT: // BASIC ??? + case SID_TEXTEDIT: // BASIC ??? case SID_ATTR_CHAR: case SID_ATTR_CHAR_VERTICAL: case SID_TEXT_FITTOSIZE: @@ -541,7 +541,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) rBind.Update( nSId ); break; } - + default: break; } @@ -703,7 +703,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if( xPresentation.is() ) { if( ( SID_REHEARSE_TIMINGS != rReq.GetSlot() ) ) - xPresentation->start(); + xPresentation->start(); else xPresentation->rehearseTimings(); } @@ -1167,7 +1167,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) // Namensverwirrung: SID_SIZE_OPTIMAL -> Zoom auf selektierte Objekte // --> Wird als Objektzoom im Programm angeboten - case SID_SIZE_OPTIMAL: // BASIC + case SID_SIZE_OPTIMAL: // BASIC { mbZoomOnPage = FALSE; if ( mpDrawView->AreObjectsMarked() ) @@ -1197,7 +1197,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) // Namensverwirrung: SID_SIZE_ALL -> Zoom auf alle Objekte // --> Wird als Optimal im Programm angeboten - case SID_SIZE_ALL: // BASIC + case SID_SIZE_ALL: // BASIC { mbZoomOnPage = FALSE; SdrPageView* pPageView = mpDrawView->GetSdrPageView(); @@ -1376,7 +1376,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if( rGraphic.GetType() == GRAPHIC_BITMAP ) { - SdrGrafObj* pNewObj = (SdrGrafObj*) pObj->Clone(); + SdrGrafObj* pNewObj = (SdrGrafObj*) pObj->Clone(); if( rGraphic.IsAnimated() ) { diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index ac6b46f3018b..c3accabc2f62 100755 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -293,10 +293,10 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet) void DrawViewShell::GetAttrState( SfxItemSet& rSet ) { - SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); + SfxWhichIter aIter( rSet ); + USHORT nWhich = aIter.FirstWhich(); - BOOL bAttr = FALSE; + BOOL bAttr = FALSE; SfxAllItemSet aAllSet( *rSet.GetPool() ); while ( nWhich ) @@ -356,9 +356,9 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) { SfxStyleFamily eFamily = pStyleSheet->GetFamily(); - if ((eFamily == SD_STYLE_FAMILY_GRAPHICS && nSlotId == SID_STYLE_FAMILY2) || - (eFamily == SD_STYLE_FAMILY_CELL && nSlotId == SID_STYLE_FAMILY3) || - (eFamily == SD_STYLE_FAMILY_PSEUDO && nSlotId == SID_STYLE_FAMILY5)) + if ((eFamily == SD_STYLE_FAMILY_GRAPHICS && nSlotId == SID_STYLE_FAMILY2) || + (eFamily == SD_STYLE_FAMILY_CELL && nSlotId == SID_STYLE_FAMILY3) || + (eFamily == SD_STYLE_FAMILY_PSEUDO && nSlotId == SID_STYLE_FAMILY5)) { SfxTemplateItem aTmpItem ( nWhich, pStyleSheet->GetName() ); aAllSet.Put( aTmpItem, aTmpItem.Which() ); @@ -372,7 +372,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) } } else - { SfxTemplateItem aItem( nWhich, String() ); + { SfxTemplateItem aItem( nWhich, String() ); aAllSet.Put( aItem, aItem.Which() ); // rSet.DisableItem( nWhich ); } diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx index 41b43864a3c0..45971ac268c7 100644 --- a/sd/source/ui/view/drviewsg.cxx +++ b/sd/source/ui/view/drviewsg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,13 +78,13 @@ void DrawViewShell::ExecIMap( SfxRequest& rReq ) if ( pMark ) { - SdrObject* pSdrObj = pMark->GetMarkedSdrObj(); + SdrObject* pSdrObj = pMark->GetMarkedSdrObj(); SvxIMapDlg* pDlg = ViewShell::Implementation::GetImageMapDialog(); if ( pDlg->GetEditingObject() == (void*) pSdrObj ) { const ImageMap& rImageMap = pDlg->GetImageMap(); - SdIMapInfo* pIMapInfo = GetDoc()->GetIMapInfo( pSdrObj ); + SdIMapInfo* pIMapInfo = GetDoc()->GetIMapInfo( pSdrObj ); if ( !pIMapInfo ) pSdrObj->InsertUserData( new SdIMapInfo( rImageMap ) ); @@ -110,9 +110,9 @@ void DrawViewShell::GetIMapState( SfxItemSet& rSet ) if( GetViewFrame()->HasChildWindow( SvxIMapDlgChildWindow::GetChildWindowId() ) ) { - const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); - const SdrObject* pObj = NULL; - ULONG nMarkCount = rMarkList.GetMarkCount(); + const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); + const SdrObject* pObj = NULL; + ULONG nMarkCount = rMarkList.GetMarkCount(); if ( nMarkCount == 1 ) { @@ -133,7 +133,7 @@ void DrawViewShell::GetIMapState( SfxItemSet& rSet ) /************************************************************************* |* -|* Execute-Methode der Optionsleiste +|* Execute-Methode der Optionsleiste |* \************************************************************************/ @@ -266,7 +266,7 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq ) /************************************************************************* |* -|* State-Methode der Optionsleiste +|* State-Methode der Optionsleiste |* \************************************************************************/ diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx index 26d0a70ba9a6..260b998b03e5 100644 --- a/sd/source/ui/view/drviewsh.cxx +++ b/sd/source/ui/view/drviewsh.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ namespace sd { -#define TABCONTROL_INITIAL_SIZE 500 +#define TABCONTROL_INITIAL_SIZE 500 /************************************************************************* |* @@ -149,7 +149,7 @@ void DrawViewShell::MakeVisible(const Rectangle& rRect, ::Window& rWin) while(rRect.Right() > aNewPos.X() + aVisAreaSize.Width()) aNewPos.X() += nFreeSpaceX; - + while(rRect.Left() < aNewPos.X()) aNewPos.X() -= nFreeSpaceX; } @@ -175,7 +175,7 @@ void DrawViewShell::MakeVisible(const Rectangle& rRect, ::Window& rWin) while(rRect.Bottom() > aNewPos.Y() + aVisAreaSize.Height()) aNewPos.Y() += nFreeSpaceY; - + while(rRect.Top() < aNewPos.Y()) aNewPos.Y() -= nFreeSpaceY; } diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx index 17ebe33ea540..0b51df2ba3e1 100644 --- a/sd/source/ui/view/drviewsi.cxx +++ b/sd/source/ui/view/drviewsi.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,7 +71,7 @@ namespace sd { #define ATTR_MIXED 1 // Attribut uneindeutig (bei Mehrfachselektion) #define ATTR_SET 2 // Attribut eindeutig -#define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue() +#define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue() /************************************************************************* |* @@ -149,7 +149,7 @@ void DrawViewShell::AssignFrom3DWindow() if(!GetView()->IsPresObjSelected()) { SfxItemSet aSet( GetDoc()->GetPool(), - SDRATTR_START, SDRATTR_END, + SDRATTR_START, SDRATTR_END, 0, 0); p3DWin->GetAttr( aSet ); @@ -160,7 +160,7 @@ void DrawViewShell::AssignFrom3DWindow() { // Nur TextAttribute zuweisen SfxItemSet aTextSet( GetDoc()->GetPool(), - EE_ITEMS_START, EE_ITEMS_END, 0 ); + EE_ITEMS_START, EE_ITEMS_END, 0 ); aTextSet.Put( aSet, FALSE ); GetView()->SetAttributes( aTextSet ); diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx index ca69aeac0e59..59580e401f44 100644 --- a/sd/source/ui/view/drviewsj.cxx +++ b/sd/source/ui/view/drviewsj.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -103,8 +103,8 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_MEASURE_DLG ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONNECTION_DLG ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONNECTION_NEW_ROUTING ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_3D_LATHE ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_3D_LATHE_FAST ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_3D_LATHE ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_3D_LATHE_FAST ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_SHEAR ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_1BIT_THRESHOLD ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_1BIT_MATRIX ) || @@ -330,21 +330,21 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) rSet.DisableItem( SID_MODIFY_FIELD ); if( 1 ) -// if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_FILL_STYLE ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_UNGROUP ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_MEASURE_DLG ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONNECTION_DLG ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_COMBINE ) || +// if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_FILL_STYLE ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_UNGROUP ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_MEASURE_DLG ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONNECTION_DLG ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_COMBINE ) || // SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_SHEAR ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_TEXTATTR_DLG ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_3D_LATHE ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_3D_LATHE_FAST ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_LEFT ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_CENTER ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_RIGHT ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_UP ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_MIDDLE ) || -// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_DOWN ) ) +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_TEXTATTR_DLG ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_3D_LATHE ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_3D_LATHE_FAST ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_LEFT ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_CENTER ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_RIGHT ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_UP ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_MIDDLE ) || +// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_DOWN ) ) { BOOL bText = FALSE; BOOL bLine = FALSE; @@ -532,7 +532,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) rSet.DisableItem( SID_BEHIND_OBJ ); rSet.DisableItem( SID_CONVERT ); -// rSet.DisableItem( SID_BEZIER_EDIT ); +// rSet.DisableItem( SID_BEZIER_EDIT ); rSet.DisableItem( SID_SIZE_OPTIMAL ); rSet.DisableItem( SID_LINEEND_POLYGON ); rSet.DisableItem( SID_COPYOBJECTS ); diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx index 76590dd45003..2df4ee0c8184 100755 --- a/sd/source/ui/view/drvwshrg.cxx +++ b/sd/source/ui/view/drvwshrg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ using namespace sd; namespace sd { -//AF:unused #define TABCONTROL_INITIAL_SIZE 500 +//AF:unused #define TABCONTROL_INITIAL_SIZE 500 /************************************************************************* |* diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index aca0130624ce..f2c32ac2022f 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -126,7 +126,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * { default: // case ViewShell::ST_IMPRESS: -// case ViewShell::ST_NOTES: +// case ViewShell::ST_NOTES: // case ViewShell::ST_HANDOUT: mnPresViewShellId = SID_VIEWSHELL0; break; @@ -183,7 +183,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * SetEliminatePolyPointLimitAngle( pFrameView->GetEliminatePolyPointLimitAngle() ); SetEliminatePolyPoints( pFrameView->IsEliminatePolyPoints() ); // #110094#-7 -// SetMasterPagePaintCaching( pFrameView->IsMasterPagePaintCaching() ); +// SetMasterPagePaintCaching( pFrameView->IsMasterPagePaintCaching() ); SetDesignMode( pFrameView->IsDesignMode() ); SetSolidMarkHdl( pFrameView->IsSolidMarkHdl() ); @@ -209,12 +209,12 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * SetViewShEditModeOnLoad(pFrameView->GetViewShEditModeOnLoad()); mbLayerMode = pFrameView->IsLayerMode(); mbQuickEdit = pFrameView->IsQuickEdit(); - + // #i26631# SetMasterPagePaintCaching( pFrameView->IsMasterPagePaintCaching() ); - + SetDragWithCopy( pFrameView->IsDragWithCopy() ); - mbBigHandles = pFrameView->IsBigHandles(); + mbBigHandles = pFrameView->IsBigHandles(); mbDoubleClickTextEdit = pFrameView->IsDoubleClickTextEdit(); mbClickChangeRotation = pFrameView->IsClickChangeRotation(); mnSlidesPerRow = pFrameView->GetSlidesPerRow(); @@ -352,7 +352,7 @@ void FrameView::Update(SdOptions* pOptions) SetOrtho( pOptions->IsOrtho() ); SetEliminatePolyPointLimitAngle( pOptions->GetEliminatePolyPointLimitAngle() ); // #110094#-7 -// SetMasterPagePaintCaching( pOptions->IsMasterPagePaintCaching() ); +// SetMasterPagePaintCaching( pOptions->IsMasterPagePaintCaching() ); GetModel()->SetPickThroughTransparentTextFrames( pOptions->IsPickThrough() ); SetSolidMarkHdl( pOptions->IsSolidMarkHdl() ); @@ -364,10 +364,10 @@ void FrameView::Update(SdOptions* pOptions) Fraction aFractY(pOptions->GetFldDrawY(), pOptions->GetFldDrawY() / ( pOptions->GetFldDivisionY() ? pOptions->GetFldDivisionY() : 1 )); SetSnapGridWidth(aFractX, aFractY); SetQuickEdit(pOptions->IsQuickEdit()); - + // #i26631# SetMasterPagePaintCaching( pOptions->IsMasterPagePaintCaching() ); - + SetDragWithCopy(pOptions->IsDragWithCopy()); SetBigHandles( pOptions->IsBigHandles() ); SetDoubleClickTextEdit( pOptions->IsDoubleClickTextEdit() ); @@ -491,38 +491,38 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com: aUserData.addValue( sUNO_View_IsSnapToObjectFrame, makeAny( (sal_Bool)IsOFrmSnap() ) ); aUserData.addValue( sUNO_View_IsSnapToObjectPoints, makeAny( (sal_Bool)IsOPntSnap() ) ); -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsSnapLinesVisible ) ); -// pValue->Value <<= (sal_Bool)IsHlplVisible(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsSnapLinesVisible ) ); +// pValue->Value <<= (sal_Bool)IsHlplVisible(); // pValue++;nIndex++; -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsDragStripes ) ); -// pValue->Value <<= (sal_Bool)IsDragStripes(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsDragStripes ) ); +// pValue->Value <<= (sal_Bool)IsDragStripes(); // pValue++;nIndex++; aUserData.addValue( sUNO_View_IsPlusHandlesAlwaysVisible, makeAny( (sal_Bool)IsPlusHandlesAlwaysVisible() ) ); aUserData.addValue( sUNO_View_IsFrameDragSingles, makeAny( (sal_Bool)IsFrameDragSingles() ) ); -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsMarkedHitMovesAlways ) ); -// pValue->Value <<= (sal_Bool)IsMarkedHitMovesAlways(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsMarkedHitMovesAlways ) ); +// pValue->Value <<= (sal_Bool)IsMarkedHitMovesAlways(); // pValue++;nIndex++; aUserData.addValue( sUNO_View_EliminatePolyPointLimitAngle, makeAny( (sal_Int32)GetEliminatePolyPointLimitAngle() ) ); aUserData.addValue( sUNO_View_IsEliminatePolyPoints, makeAny( (sal_Bool)IsEliminatePolyPoints() ) ); -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsLineDraft ) ); -// pValue->Value <<= (sal_Bool)IsLineDraft(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsLineDraft ) ); +// pValue->Value <<= (sal_Bool)IsLineDraft(); // pValue++;nIndex++; -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsFillDraft ) ); -// pValue->Value <<= (sal_Bool)IsFillDraft(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsFillDraft ) ); +// pValue->Value <<= (sal_Bool)IsFillDraft(); // pValue++;nIndex++; -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsTextDraft ) ); -// pValue->Value <<= (sal_Bool)IsTextDraft(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsTextDraft ) ); +// pValue->Value <<= (sal_Bool)IsTextDraft(); // pValue++;nIndex++; -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsGrafDraft ) ); -// pValue->Value <<= (sal_Bool)IsGrafDraft(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsGrafDraft ) ); +// pValue->Value <<= (sal_Bool)IsGrafDraft(); // pValue++;nIndex++; Any aAny; @@ -552,16 +552,16 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com: aUserData.addValue( sUNO_View_SelectedPage, makeAny( (sal_Int16)GetSelectedPage() ) ); aUserData.addValue( sUNO_View_IsLayerMode, makeAny( (sal_Bool)IsLayerMode() ) ); -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsQuickEdit ) ); -// pValue->Value <<= (sal_Bool)IsQuickEdit(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsQuickEdit ) ); +// pValue->Value <<= (sal_Bool)IsQuickEdit(); // pValue++;nIndex++; aUserData.addValue( sUNO_View_IsBigHandles, makeAny( (sal_Bool)IsBigHandles() ) ); aUserData.addValue( sUNO_View_IsDoubleClickTextEdit, makeAny( (sal_Bool)IsDoubleClickTextEdit() ) ); aUserData.addValue( sUNO_View_IsClickChangeRotation, makeAny( (sal_Bool)IsClickChangeRotation() ) ); -// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsDragWithCopy ) ); -// pValue->Value <<= (sal_Bool)IsDragWithCopy(); +// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsDragWithCopy ) ); +// pValue->Value <<= (sal_Bool)IsDragWithCopy(); // pValue++;nIndex++; aUserData.addValue( sUNO_View_SlidesPerRow, makeAny( (sal_Int16)GetSlidesPerRow() ) ); @@ -761,14 +761,14 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : SetLayerMode( bBool ); } } -/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsQuickEdit ) ) ) +/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsQuickEdit ) ) ) { if( pValue->Value >>= bBool ) { SetQuickEdit( bBool ); } } -*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsBigHandles ) ) ) +*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsBigHandles ) ) ) { if( pValue->Value >>= bBool ) { @@ -789,14 +789,14 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : SetClickChangeRotation( bBool ); } } -/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsDragWithCopy ) ) ) +/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsDragWithCopy ) ) ) { if( pValue->Value >>= bBool ) { SetDragWithCopy( bBool ); } } -*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_SlidesPerRow ) ) ) +*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_SlidesPerRow ) ) ) { if( pValue->Value >>= nInt16 ) { @@ -949,7 +949,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : SetOPntSnap( bBool ); } } -/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsSnapLinesVisible ) ) ) +/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsSnapLinesVisible ) ) ) { if( pValue->Value >>= bBool ) { @@ -963,7 +963,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : SetDragStripes( bBool ); } } -*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsPlusHandlesAlwaysVisible ) ) ) +*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsPlusHandlesAlwaysVisible ) ) ) { if( pValue->Value >>= bBool ) { @@ -977,14 +977,14 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : SetFrameDragSingles( bBool ); } } -/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsMarkedHitMovesAlways ) ) ) +/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsMarkedHitMovesAlways ) ) ) { if( pValue->Value >>= bBool ) { SetMarkedHitMovesAlways( bBool ); } } -*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_EliminatePolyPointLimitAngle ) ) ) +*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_EliminatePolyPointLimitAngle ) ) ) { if( pValue->Value >>= nInt32 ) { @@ -1182,8 +1182,8 @@ ViewShell::ShellType FrameView::GetViewShellTypeOnLoad (void) const void FrameView::SetSelectedPage(USHORT nPage) -{ - mnSelectedPage = nPage; +{ + mnSelectedPage = nPage; } @@ -1191,7 +1191,7 @@ void FrameView::SetSelectedPage(USHORT nPage) USHORT FrameView::GetSelectedPage (void) const { - return mnSelectedPage; + return mnSelectedPage; } diff --git a/sd/source/ui/view/grviewsh.cxx b/sd/source/ui/view/grviewsh.cxx index 646a437c42bf..a06a6eb2792c 100755 --- a/sd/source/ui/view/grviewsh.cxx +++ b/sd/source/ui/view/grviewsh.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/viewfrm.hxx> #include <vcl/scrbar.hxx> -#include <vcl/salbtype.hxx> // FRound +#include <vcl/salbtype.hxx> // FRound namespace sd { diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index 2acf143ff0b3..f96f35399417 100755 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -421,12 +421,12 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq) case SID_SET_DEFAULT: { // 1. Selektion merken (kriegt die eselige EditEngine nicht selbst - // auf die Reihe!) + // auf die Reihe!) // 2. Update auf False (sonst flackert's noch staerker // an allen selektierten Absaetzen: - // a. deren Vorlage nochmal setzen, um absatzweite harte Attribute - // zu entfernen - // b. harte Zeichenattribute loeschen + // a. deren Vorlage nochmal setzen, um absatzweite harte Attribute + // zu entfernen + // b. harte Zeichenattribute loeschen // 3. Update auf True und Selektion wieder setzen /* ESelection aEsel= pOutlinerView->GetSelection(); @@ -531,7 +531,7 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq) if( GetDocSh()->HasName() ) aName = GetDocSh()->GetMedium()->GetName(); //else - // aName = GetDocSh()->GetName(); + // aName = GetDocSh()->GetName(); pFieldItem = new SvxFieldItem( SvxExtFileField( aName ), EE_FEATURE_FIELD ); } break; diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 955a9d167b49..c30926020d47 100755 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,8 +106,8 @@ using namespace sd; namespace sd { -#define MIN_ZOOM 10 // Minimaler Zoomfaktor -#define MAX_ZOOM 1000 // Maximaler Zoomfaktor +#define MIN_ZOOM 10 // Minimaler Zoomfaktor +#define MAX_ZOOM 1000 // Maximaler Zoomfaktor /************************************************************************/ @@ -157,7 +157,7 @@ void OutlineViewShell::Construct(DrawDocShell* ) GetActiveWindow()->SetMaxZoom( MAX_ZOOM ); InitWindows(aViewOrigin, aSize, aWinPos); pOlView = new OutlineView(GetDocSh(), GetActiveWindow(), this); - mpView = pOlView; // Pointer der Basisklasse ViewShell + mpView = pOlView; // Pointer der Basisklasse ViewShell SetPool( &GetDoc()->GetPool() ); @@ -253,7 +253,7 @@ OutlineViewShell::~OutlineViewShell() if ( pClipEvtLstnr ) { pClipEvtLstnr->AddRemoveListener( GetActiveWindow(), FALSE ); - pClipEvtLstnr->ClearCallbackLink(); // #103849# prevent callback if another thread is waiting + pClipEvtLstnr->ClearCallbackLink(); // #103849# prevent callback if another thread is waiting pClipEvtLstnr->release(); } } @@ -313,7 +313,7 @@ void OutlineViewShell::ArrangeGUIElements () OutlinerView* pOutlinerView = pOlView->GetViewByWindow(pWindow); Rectangle aWin(Point(0,0), pWindow->GetOutputSizePixel()); -// aWin.nLeft = pOlView->GetPageNumberWidthPixel(); +// aWin.nLeft = pOlView->GetPageNumberWidthPixel(); aWin = pWindow->PixelToLogic(aWin); pOutlinerView->SetOutputArea(aWin); @@ -325,7 +325,7 @@ void OutlineViewShell::ArrangeGUIElements () pOlView->GetOutliner()->GetTextHeight())); aText.Bottom() += aWin.GetHeight(); - if (!aWin.IsEmpty()) // nicht beim Oeffnen + if (!aWin.IsEmpty()) // nicht beim Oeffnen { InitWindows(Point(0,0), aText.GetSize(), Point(aVis.TopLeft())); UpdateScrollBars(); @@ -514,7 +514,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) (nSlot == SID_TRANSLITERATE_HIRAGANA) || (nSlot == SID_TRANSLITERATE_KATAGANA) || (nSlot == SID_CUT) || -// (nSlot == SID_COPY) || +// (nSlot == SID_COPY) || (nSlot == SID_PASTE) || (nSlot == SID_DELETE))) { @@ -868,7 +868,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) // zunaechst selektionsabhaengige: COLLAPSE, EXPAND BOOL bDisableCollapse = TRUE; BOOL bDisableExpand = TRUE; - BOOL bUnique = TRUE; + BOOL bUnique = TRUE; OutlinerView* pOutlinerView = pOlView->GetViewByWindow(GetActiveWindow()); List* pList = pOutlinerView->CreateSelectionList(); Paragraph* pPara = (Paragraph*)pList->First(); @@ -915,7 +915,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) // jetzt die selektionsunabhaengigen: COLLAPSE_ALL, EXPAND_ALL BOOL bDisableCollapseAll = TRUE; - BOOL bDisableExpandAll = TRUE; + BOOL bDisableExpandAll = TRUE; // wenn schon die Selektion etwas kollabierbares/expandierbares enthaelt if (!bDisableCollapse) @@ -1130,17 +1130,17 @@ long OutlineViewShell::VirtHScrollHdl(ScrollBar* pHScroll) { long nThumb = pHScroll->GetThumbPos(); long nRange = pHScroll->GetRange().Len(); - double fX = (double) nThumb / nRange; + double fX = (double) nThumb / nRange; - Window* pWin = mpContentWindow.get(); + Window* pWin = mpContentWindow.get(); OutlinerView* pOutlinerView = pOlView->GetViewByWindow(pWin); - long nViewWidth = pWin->PixelToLogic( + long nViewWidth = pWin->PixelToLogic( pWin->GetSizePixel()).Width(); - long nTextWidth = pOlView->GetPaperWidth(); - nViewWidth = Max(nViewWidth, nTextWidth); - long nCurrentPos = pOutlinerView->GetVisArea().Left(); - long nTargetPos = (long)(fX * nViewWidth); - long nDelta = nTargetPos - nCurrentPos; + long nTextWidth = pOlView->GetPaperWidth(); + nViewWidth = Max(nViewWidth, nTextWidth); + long nCurrentPos = pOutlinerView->GetVisArea().Left(); + long nTargetPos = (long)(fX * nViewWidth); + long nDelta = nTargetPos - nCurrentPos; pOutlinerView->HideCursor(); pOutlinerView->Scroll(-nDelta, 0); @@ -1162,15 +1162,15 @@ long OutlineViewShell::VirtVScrollHdl(ScrollBar* pVScroll) long nRange = pVScroll->GetRange().Len(); double fY = (double) nThumb / nRange; - Window* pWin = mpContentWindow.get(); + Window* pWin = mpContentWindow.get(); OutlinerView* pOutlinerView = pOlView->GetViewByWindow(pWin); - long nViewHeight = pWin->PixelToLogic( + long nViewHeight = pWin->PixelToLogic( pWin->GetSizePixel()).Height(); - long nTextHeight = pOlView->GetOutliner()->GetTextHeight(); - nViewHeight += nTextHeight; - long nCurrentPos = pOutlinerView->GetVisArea().Top(); - long nTargetPos = (long)(fY * nViewHeight); - long nDelta = nTargetPos - nCurrentPos; + long nTextHeight = pOlView->GetOutliner()->GetTextHeight(); + nViewHeight += nTextHeight; + long nCurrentPos = pOutlinerView->GetVisArea().Top(); + long nTargetPos = (long)(fY * nViewHeight); + long nDelta = nTargetPos - nCurrentPos; pOutlinerView->HideCursor(); pOutlinerView->Scroll(0, -nDelta); @@ -1409,15 +1409,15 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet) if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_STATUS_PAGE ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_STATUS_LAYOUT ) ) */ - USHORT nPageCount = GetDoc()->GetSdPageCount( PK_STANDARD ); - String aPageStr, aLayoutStr; + USHORT nPageCount = GetDoc()->GetSdPageCount( PK_STANDARD ); + String aPageStr, aLayoutStr; - ::sd::Window* pWin = GetActiveWindow(); - OutlinerView* pActiveView = pOlView->GetViewByWindow( pWin ); + ::sd::Window* pWin = GetActiveWindow(); + OutlinerView* pActiveView = pOlView->GetViewByWindow( pWin ); ::Outliner* pOutliner = pOlView->GetOutliner(); - List* pSelList = (List*)pActiveView->CreateSelectionList(); - Paragraph* pFirstPara = (Paragraph*)pSelList->First(); - Paragraph* pLastPara = (Paragraph*)pSelList->Last(); + List* pSelList = (List*)pActiveView->CreateSelectionList(); + Paragraph* pFirstPara = (Paragraph*)pSelList->First(); + Paragraph* pLastPara = (Paragraph*)pSelList->Last(); if( !pOutliner->HasParaFlag(pFirstPara,PARAFLAG_ISPAGE) ) pFirstPara = pOlView->GetPrevTitle( pFirstPara ); @@ -1425,7 +1425,7 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet) if( !pOutliner->HasParaFlag(pLastPara, PARAFLAG_ISPAGE) ) pLastPara = pOlView->GetPrevTitle( pLastPara ); - delete pSelList; // die wurde extra fuer uns erzeugt + delete pSelList; // die wurde extra fuer uns erzeugt // nur eine Seite selektiert? if( pFirstPara == pLastPara ) @@ -1446,7 +1446,7 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet) aPageStr = String(SdResId( STR_SD_PAGE )); aPageStr += sal_Unicode(' '); - aPageStr += String::CreateFromInt32( (sal_Int32)(nPos + 1) ); // ULONG -> sal_Int32 + aPageStr += String::CreateFromInt32( (sal_Int32)(nPos + 1) ); // ULONG -> sal_Int32 aPageStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " / " )); aPageStr += String::CreateFromInt32( nPageCount ); @@ -1566,7 +1566,7 @@ Size OutlineViewShell::GetOptimalSizePixel() const // und jetzt jetzt das Standardgelumpe draufaddieren aResult.Width() += mpVerticalScrollBar->GetSizePixel().Width(); aResult.Height() += mpHorizontalScrollBar->GetSizePixel().Height(); - //!!! + System::GetMenuBarHeightPixel(); // statt Titlebar + //!!! + System::GetMenuBarHeightPixel(); // statt Titlebar return aResult; } @@ -1783,11 +1783,11 @@ SdPage* OutlineViewShell::GetActualPage() String OutlineViewShell::GetPageRangeString() { - ::sd::Window* pWin = GetActiveWindow(); - OutlinerView* pActiveView = pOlView->GetViewByWindow(pWin); + ::sd::Window* pWin = GetActiveWindow(); + OutlinerView* pActiveView = pOlView->GetViewByWindow(pWin); ::Outliner* pOutl = pActiveView->GetOutliner(); - List* pSelList = (List*)pActiveView->CreateSelectionList(); - Paragraph* pPara = (Paragraph*)pSelList->First(); + List* pSelList = (List*)pActiveView->CreateSelectionList(); + Paragraph* pPara = (Paragraph*)pSelList->First(); String aStrPageRange; BOOL bFirstPageNo = TRUE; @@ -1867,7 +1867,7 @@ String OutlineViewShell::GetPageRangeString() if( nPageCount == 0 ) aStrPageRange.Erase(); - delete pSelList; // die wurde extra fuer uns erzeugt + delete pSelList; // die wurde extra fuer uns erzeugt return aStrPageRange; } @@ -1897,13 +1897,13 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara ) if( !pPage || !pPara ) return false; - ::Outliner* pOutliner = pOlView->GetOutliner(); - SdrTextObj* pTO = pOlView->GetTitleTextObject( pPage ); + ::Outliner* pOutliner = pOlView->GetOutliner(); + SdrTextObj* pTO = pOlView->GetTitleTextObject( pPage ); OutlinerParaObject* pOPO = NULL; - String aTest( pOutliner->GetText( pPara ) ); - bool bText = aTest.Len() > 0; - bool bNewObject = false; + String aTest( pOutliner->GetText( pPara ) ); + bool bText = aTest.Len() > 0; + bool bNewObject = false; if( bText ) { @@ -1984,9 +1984,9 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) if( !pPage || !pPara ) return false; - ::Outliner* pOutliner = pOlView->GetOutliner(); + ::Outliner* pOutliner = pOlView->GetOutliner(); OutlinerParaObject* pOPO = NULL; - SdrTextObj* pTO = NULL; + SdrTextObj* pTO = NULL; BOOL bNewObject = FALSE; @@ -1999,7 +1999,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) } // wieviele Absaetze in der Gliederung? - ULONG nTitlePara = pOutliner->GetAbsPos( pPara ); + ULONG nTitlePara = pOutliner->GetAbsPos( pPara ); ULONG nPara = nTitlePara + 1; ULONG nParasInLayout = 0L; pPara = pOutliner->GetParagraph( nPara ); diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index dfad4b34c6f2..0dcada9250e9 100755 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -98,7 +98,7 @@ namespace sd { struct SdParaAndPos { Paragraph* pPara; - USHORT nPos; + USHORT nPos; }; TYPEINIT1( OutlineView, ::sd::View ); @@ -329,7 +329,7 @@ void OutlineView::Paint(const Rectangle& rRect, ::sd::Window* pWin) sal_Int32 nLineHeight = pOlView->GetOutliner()->GetLineHeight( nPara, 0 ); aPos.X() = nNumberOffset; - + Point aPoint( aPos.X() - pWin->GetTextWidth( aStr ), aPos.Y() + ( nLineHeight - maPageNumberFont.GetHeight()) / 2 ); pWin->DrawText( aPoint, aStr ); @@ -341,13 +341,13 @@ void OutlineView::Paint(const Rectangle& rRect, ::sd::Window* pWin) } pWin->SetFont( aOldFont ); -*/ +*/ mbFirstPaint = FALSE; } } void OutlineView::InvalidateSlideNumberArea() -{ +{ /* for( sal_Int16 nView = 0; nView < MAX_OUTLINERVIEWS; ++nView ) { @@ -531,7 +531,7 @@ Paragraph* OutlineView::GetNextTitle(const Paragraph* pPara) IMPL_LINK( OutlineView, ParagraphInsertedHdl, ::Outliner *, pOutliner ) { -// DBG_ASSERT( isRecordingUndo(), "sd::OutlineView::ParagraphInsertedHdl(), model change without undo?!" ); +// DBG_ASSERT( isRecordingUndo(), "sd::OutlineView::ParagraphInsertedHdl(), model change without undo?!" ); // we get calls to this handler during binary insert of drag and drop contents but // we ignore it here and handle it later in OnEndPasteOrDrop() @@ -564,8 +564,8 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) mpOutliner->SetParaFlag( pPara, PARAFLAG_ISPAGE ); // wieviele Titel sind vor dem neuen Titelabsatz? - ULONG nExample = 0L; // Position der "Vorbild"seite - ULONG nTarget = 0L; // Einfuegeposition + ULONG nExample = 0L; // Position der "Vorbild"seite + ULONG nTarget = 0L; // Einfuegeposition while(pPara) { pPara = GetPrevTitle(pPara); @@ -761,11 +761,11 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) // haben es noch nicht getan? if (mnPagesToProcess == 0) { - Window* pActWin = mpOutlineViewShell->GetActiveWindow(); + Window* pActWin = mpOutlineViewShell->GetActiveWindow(); OutlinerView* pOlView = GetViewByWindow(pActWin); - List* pList = pOlView->CreateSelectionList(); + List* pList = pOlView->CreateSelectionList(); - Paragraph* pParagraph = (Paragraph*)pList->First(); + Paragraph* pParagraph = (Paragraph*)pList->First(); while (pParagraph) { if( !pOutliner->HasParaFlag( pParagraph, PARAFLAG_ISPAGE ) && (pOutliner->GetDepth( (USHORT) pOutliner->GetAbsPos( pParagraph ) ) <= 0) ) @@ -773,7 +773,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) pParagraph = (Paragraph*)pList->Next(); } - mnPagesToProcess++; // der Absatz, der jetzt schon auf Level 0 + mnPagesToProcess++; // der Absatz, der jetzt schon auf Level 0 // steht, gehoert auch dazu mnPagesProcessed = 0; @@ -967,10 +967,10 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) IMPL_LINK( OutlineView, StatusEventHdl, EditStatus *, EMPTYARG ) { ::sd::Window* pWin = mpOutlineViewShell->GetActiveWindow(); - OutlinerView* pOutlinerView = GetViewByWindow(pWin); - Rectangle aVis = pOutlinerView->GetVisArea(); + OutlinerView* pOutlinerView = GetViewByWindow(pWin); + Rectangle aVis = pOutlinerView->GetVisArea(); -// ULONG nWidth = ((SdPage*)mpDoc->GetSdPage(0, PK_STANDARD))->GetSize().Width(); +// ULONG nWidth = ((SdPage*)mpDoc->GetSdPage(0, PK_STANDARD))->GetSize().Width(); ULONG nWidth = OUTLINE_PAPERWIDTH; Rectangle aText = Rectangle(Point(0,0), Size(nWidth, @@ -978,7 +978,7 @@ IMPL_LINK( OutlineView, StatusEventHdl, EditStatus *, EMPTYARG ) Rectangle aWin(Point(0,0), pWin->GetOutputSizePixel()); aWin = pWin->PixelToLogic(aWin); - if (!aVis.IsEmpty()) // nicht beim Oeffnen + if (!aVis.IsEmpty()) // nicht beim Oeffnen { aText.Bottom() += aWin.GetHeight(); @@ -1082,8 +1082,8 @@ IMPL_LINK( OutlineView, EndMovingHdl, ::Outliner *, pOutliner ) // den ersten der selektierten Paragraphen in der neuen Ordnung suchen USHORT nPosNewOrder = 0; ULONG nParaPos = 0; - Paragraph* pPara = pOutliner->GetParagraph( 0 ); - Paragraph* pPrev = NULL; + Paragraph* pPara = pOutliner->GetParagraph( 0 ); + Paragraph* pPrev = NULL; while (pPara && pPara != pSearchIt) { if( pOutliner->HasParaFlag(pPara, PARAFLAG_ISPAGE) ) @@ -1094,10 +1094,10 @@ IMPL_LINK( OutlineView, EndMovingHdl, ::Outliner *, pOutliner ) pPara = pOutliner->GetParagraph( ++nParaPos ); } - USHORT nPos = nPosNewOrder; // nPosNewOrder nicht veraendern + USHORT nPos = nPosNewOrder; // nPosNewOrder nicht veraendern if (nPos == 0) { - nPos = (USHORT)-1; // vor der ersten Seite einfuegen + nPos = (USHORT)-1; // vor der ersten Seite einfuegen } else { @@ -1138,9 +1138,9 @@ IMPL_LINK( OutlineView, EndMovingHdl, ::Outliner *, pOutliner ) SdrTextObj* OutlineView::GetTitleTextObject(SdrPage* pPage) { - ULONG nObjectCount = pPage->GetObjCount(); - SdrObject* pObject = NULL; - SdrTextObj* pResult = NULL; + ULONG nObjectCount = pPage->GetObjCount(); + SdrObject* pObject = NULL; + SdrTextObj* pResult = NULL; for (ULONG nObject = 0; nObject < nObjectCount; nObject++) { @@ -1164,9 +1164,9 @@ SdrTextObj* OutlineView::GetTitleTextObject(SdrPage* pPage) SdrTextObj* OutlineView::GetOutlineTextObject(SdrPage* pPage) { - ULONG nObjectCount = pPage->GetObjCount(); - SdrObject* pObject = NULL; - SdrTextObj* pResult = NULL; + ULONG nObjectCount = pPage->GetObjCount(); + SdrObject* pObject = NULL; + SdrTextObj* pResult = NULL; for (ULONG nObject = 0; nObject < nObjectCount; nObject++) { @@ -1209,13 +1209,13 @@ SdrTextObj* OutlineView::CreateOutlineTextObject(SdPage* pPage) { case AUTOLAYOUT_NONE: case AUTOLAYOUT_ONLY_TITLE: - case AUTOLAYOUT_TITLE: eNewLayout = AUTOLAYOUT_ENUM; break; + case AUTOLAYOUT_TITLE: eNewLayout = AUTOLAYOUT_ENUM; break; - case AUTOLAYOUT_CHART: eNewLayout = AUTOLAYOUT_CHARTTEXT; break; + case AUTOLAYOUT_CHART: eNewLayout = AUTOLAYOUT_CHARTTEXT; break; case AUTOLAYOUT_ORG: case AUTOLAYOUT_TAB: - case AUTOLAYOUT_OBJ: eNewLayout = AUTOLAYOUT_OBJTEXT; break; + case AUTOLAYOUT_OBJ: eNewLayout = AUTOLAYOUT_OBJTEXT; break; default: break; } @@ -1307,7 +1307,7 @@ void OutlineView::FillOutliner() // fill outliner with paragraphs from slides title & (outlines|subtitles) for (USHORT nPage = 0; nPage < nPageCount; nPage++) { - SdPage* pPage = (SdPage*)mpDoc->GetSdPage(nPage, PK_STANDARD); + SdPage* pPage = (SdPage*)mpDoc->GetSdPage(nPage, PK_STANDARD); Paragraph * pPara = NULL; // take text from title shape @@ -1353,7 +1353,7 @@ void OutlineView::FillOutliner() if (!pTO) // if no subtile found, try outline pTO = GetOutlineTextObject(pPage); - + if(pTO && !(pTO->IsEmptyPresObj())) // found some text { OutlinerParaObject* pOPO = pTO->GetOutlinerParaObject(); @@ -1494,7 +1494,7 @@ Paragraph* OutlineView::GetParagraphForPage( ::Outliner* pOutl, SdPage* pPage ) { // see if we already skiped enough pages if( 0 == nPagesToSkip ) - break; // and if so, end the loop + break; // and if so, end the loop // we skiped another page nPagesToSkip--; @@ -1972,13 +1972,13 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo) long nFontHeight = 0; if ( !rEditEngine.IsFlatMode() ) { -// const SvxFontHeightItem& rFH = (const SvxFontHeightItem&)rEditEngine.GetParaAttrib( pInfo->mnPara, EE_CHAR_FONTHEIGHT ); +// const SvxFontHeightItem& rFH = (const SvxFontHeightItem&)rEditEngine.GetParaAttrib( pInfo->mnPara, EE_CHAR_FONTHEIGHT ); // nBulletHeight = rFH.GetHeight(); nFontHeight = nBulletHeight / 5; } else { -// const SvxFontHeightItem& rFH = (const SvxFontHeightItem&)rEditEngine.GetEmptyItemSet().Get( EE_CHAR_FONTHEIGHT ); +// const SvxFontHeightItem& rFH = (const SvxFontHeightItem&)rEditEngine.GetEmptyItemSet().Get( EE_CHAR_FONTHEIGHT ); // nBulletHeight = rFH.GetHeight(); nFontHeight = (nBulletHeight * 10) / 25; } @@ -2006,7 +2006,7 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo) Point aTextPos( aImagePos.X() - aOffset.Width(), pInfo->mrStartPos.Y() ); Font aNewFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SANS_UNICODE, eLang, 0 ) ); aNewFont.SetSize( aFontSz ); -// aNewFont.SetAlign( aBulletFont.GetAlign() ); +// aNewFont.SetAlign( aBulletFont.GetAlign() ); aNewFont.SetVertical( bVertical ); aNewFont.SetOrientation( bVertical ? 2700 : 0 ); aNewFont.SetColor( COL_AUTO ); diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index 11f20c7a83d4..aa60560e714a 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index 679c28bb3a93..2b6a36156a52 100644 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -101,7 +101,7 @@ void RulerCtrlItem::StateChanged( USHORT nSId, SfxItemState, const SfxPoolItem* |* \************************************************************************/ -Ruler::Ruler( DrawViewShell& rViewSh, ::Window* pParent, ::sd::Window* pWin, USHORT nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle) +Ruler::Ruler( DrawViewShell& rViewSh, ::Window* pParent, ::sd::Window* pWin, USHORT nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle) : SvxRuler(pParent, pWin, nRulerFlags, rBindings, nWinStyle) , pSdWin(pWin) , pDrViewShell(&rViewSh) @@ -189,8 +189,8 @@ void Ruler::SetNullOffset(const Point& rOffset) { long nOffset; - if ( bHorz ) nOffset = rOffset.X(); - else nOffset = rOffset.Y(); + if ( bHorz ) nOffset = rOffset.X(); + else nOffset = rOffset.Y(); SetNullOffsetLogic(nOffset); } diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 3aed9c6c0d9c..e10246772186 100755 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -215,7 +215,7 @@ public: // all default implementations just call the same methods at the original. To do something // different, overload the method and at least do what the method does. virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence( - const sdr::contact::ViewObjectContact& rOriginal, + const sdr::contact::ViewObjectContact& rOriginal, const sdr::contact::DisplayInfo& rDisplayInfo); }; @@ -228,7 +228,7 @@ ViewRedirector::~ViewRedirector() } drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedPrimitive2DSequence( - const sdr::contact::ViewObjectContact& rOriginal, + const sdr::contact::ViewObjectContact& rOriginal, const sdr::contact::DisplayInfo& rDisplayInfo) { SdrObject* pObject = rOriginal.GetViewContact().TryToGetSdrObject(); @@ -312,7 +312,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP // create line and stroke attribute ::std::vector< double > aDotDashArray; - + aDotDashArray.push_back(160.0); aDotDashArray.push_back(80.0); @@ -322,8 +322,8 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP // create primitive and add const drawinglayer::primitive2d::Primitive2DReference xRef(new drawinglayer::primitive2d::PolygonStrokePrimitive2D( - aPolygon, - aLine, + aPolygon, + aLine, aStroke)); drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, xRef); } @@ -343,7 +343,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP static String aTitleAreaStr( SdResId( STR_PLACEHOLDER_DESCRIPTION_TITLE ) ); aObjectString = aTitleAreaStr; } - + break; } case PRESOBJ_OUTLINE: @@ -403,16 +403,16 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP basegfx::B2DTuple aTranslate; double fRotate, fShearX; aObjectMatrix.decompose(aScale, aTranslate, fRotate, fShearX); - + // create font SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( pObject ); const SdrTextVertAdjust eTVA(pTextObj ? pTextObj->GetTextVerticalAdjust() : SDRTEXTVERTADJUST_CENTER); Font aScaledVclFont; - - // use a text size factor to get more reliable text sizes from the text layouter + + // use a text size factor to get more reliable text sizes from the text layouter // (and from vcl), tipp from HDU static sal_uInt32 nTextSizeFactor(100); - + // use a factor to get more linear text size calculations aScaledVclFont.SetHeight( 500 * nTextSizeFactor ); @@ -420,7 +420,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP drawinglayer::primitive2d::TextLayouterDevice aTextLayouter; aTextLayouter.setFont(aScaledVclFont); const xub_StrLen nTextLength(aObjectString.Len()); - + // do not forget to use the factor again to get the width for the 500 const double fTextWidth(aTextLayouter.getTextWidth(aObjectString, 0, nTextLength) * (1.0 / nTextSizeFactor)); const double fTextHeight(aTextLayouter.getTextHeight() * (1.0 / nTextSizeFactor)); @@ -443,7 +443,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP const drawinglayer::attribute::FontAttribute aFontAttribute( drawinglayer::primitive2d::getFontAttributeFromVclFont( - aTextSizeAttribute, + aTextSizeAttribute, aVclFont, false, false)); @@ -451,8 +451,8 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP // fill text matrix const basegfx::B2DHomMatrix aTextMatrix(basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix( aTextSizeAttribute.getX(), aTextSizeAttribute.getY(), - fShearX, - fRotate, + fShearX, + fRotate, fPosX, fPosY)); // create DXTextArray (can be empty one) @@ -464,13 +464,13 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP // create primitive and add const drawinglayer::primitive2d::Primitive2DReference xRef( new drawinglayer::primitive2d::TextSimplePortionPrimitive2D( - aTextMatrix, - aObjectString, - 0, - nTextLength, - aDXArray, - aFontAttribute, - aLocale, + aTextMatrix, + aObjectString, + 0, + nTextLength, + aDXArray, + aFontAttribute, + aLocale, aFontColor)); drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, xRef); } @@ -482,9 +482,9 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP if(bDoCreateGeometry) { drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence( - xRetval, + xRetval, sdr::contact::ViewObjectContactRedirector::createRedirectedPrimitive2DSequence( - rOriginal, + rOriginal, rDisplayInfo)); } } @@ -532,7 +532,7 @@ void View::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contac bScreenDisplay = false; } - // #i75566# Name change GetBackgroundColor -> GetPageBackgroundColor and + // #i75566# Name change GetBackgroundColor -> GetPageBackgroundColor and // hint value if screen display. Only then the AutoColor mechanisms shall be applied rOutl.SetBackgroundColor( pPage->GetPageBackgroundColor(pPgView, bScreenDisplay) ); } @@ -548,7 +548,7 @@ void View::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contac mpLockedRedraws = new List; SdViewRedrawRec* pRec = new SdViewRedrawRec; - pRec->mpOut = pOutDev; + pRec->mpOut = pOutDev; pRec->aRect = rReg.GetBoundRect(); mpLockedRedraws->Insert(pRec, LIST_APPEND); } @@ -998,7 +998,7 @@ void View::DoConnect(SdrOle2Obj* pObj) Fraction aScaleWidth (aDrawSize.Width(), aObjAreaSize.Width() ); Fraction aScaleHeight(aDrawSize.Height(), aObjAreaSize.Height() ); - aScaleWidth.ReduceInaccurate(10); // kompatibel zum SdrOle2Obj + aScaleWidth.ReduceInaccurate(10); // kompatibel zum SdrOle2Obj aScaleHeight.ReduceInaccurate(10); pSdClient->SetSizeScale(aScaleWidth, aScaleHeight); @@ -1020,15 +1020,15 @@ void View::DoConnect(SdrOle2Obj* pObj) BOOL View::IsMorphingAllowed() const { - const SdrMarkList& rMarkList = GetMarkedObjectList(); - BOOL bRet = FALSE; + const SdrMarkList& rMarkList = GetMarkedObjectList(); + BOOL bRet = FALSE; if ( rMarkList.GetMarkCount() == 2 ) { - const SdrObject* pObj1 = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); - const SdrObject* pObj2 = rMarkList.GetMark( 1 )->GetMarkedSdrObj(); - const UINT16 nKind1 = pObj1->GetObjIdentifier(); - const UINT16 nKind2 = pObj2->GetObjIdentifier(); + const SdrObject* pObj1 = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); + const SdrObject* pObj2 = rMarkList.GetMark( 1 )->GetMarkedSdrObj(); + const UINT16 nKind1 = pObj1->GetObjIdentifier(); + const UINT16 nKind2 = pObj2->GetObjIdentifier(); if ( ( nKind1 != OBJ_TEXT && nKind2 != OBJ_TEXT ) && ( nKind1 != OBJ_TITLETEXT && nKind2 != OBJ_TITLETEXT ) && @@ -1046,14 +1046,14 @@ BOOL View::IsMorphingAllowed() const ( nKind1 != OBJ_CAPTION && nKind2 != OBJ_CAPTION ) && !pObj1->ISA( E3dObject) && !pObj2->ISA( E3dObject) ) { - SfxItemSet aSet1( mpDoc->GetPool(), XATTR_FILLSTYLE, XATTR_FILLSTYLE ); - SfxItemSet aSet2( mpDoc->GetPool(), XATTR_FILLSTYLE, XATTR_FILLSTYLE ); + SfxItemSet aSet1( mpDoc->GetPool(), XATTR_FILLSTYLE, XATTR_FILLSTYLE ); + SfxItemSet aSet2( mpDoc->GetPool(), XATTR_FILLSTYLE, XATTR_FILLSTYLE ); aSet1.Put(pObj1->GetMergedItemSet()); aSet2.Put(pObj2->GetMergedItemSet()); - const XFillStyle eFillStyle1 = ( (const XFillStyleItem&) aSet1.Get( XATTR_FILLSTYLE ) ).GetValue(); - const XFillStyle eFillStyle2 = ( (const XFillStyleItem&) aSet2.Get( XATTR_FILLSTYLE ) ).GetValue(); + const XFillStyle eFillStyle1 = ( (const XFillStyleItem&) aSet1.Get( XATTR_FILLSTYLE ) ).GetValue(); + const XFillStyle eFillStyle2 = ( (const XFillStyleItem&) aSet2.Get( XATTR_FILLSTYLE ) ).GetValue(); if( ( eFillStyle1 == XFILL_NONE || eFillStyle1 == XFILL_SOLID ) && ( eFillStyle2 == XFILL_NONE || eFillStyle2 == XFILL_SOLID ) ) @@ -1072,8 +1072,8 @@ BOOL View::IsMorphingAllowed() const BOOL View::IsVectorizeAllowed() const { - const SdrMarkList& rMarkList = GetMarkedObjectList(); - BOOL bRet = FALSE; + const SdrMarkList& rMarkList = GetMarkedObjectList(); + BOOL bRet = FALSE; if( rMarkList.GetMarkCount() == 1 ) { @@ -1295,7 +1295,7 @@ void View::OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) pStyle = static_cast<SfxStyleSheet*>( pStylePool->Find( aStyleSheetName, pStyleSheet->GetFamily() ) ); DBG_ASSERT( pStyle, "sd::View::OnEndPasteOrDrop(), Style not found!" ); } - + if( !pStyle ) pStyle = pStyleSheet; diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index ea4d120b1219..4cfe38a6b27e 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -104,8 +104,8 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent { DropTargetHelper& mrTargetHelper; ::sd::Window* mpTargetWindow; - USHORT mnPage; - USHORT mnLayer; + USHORT mnPage; + USHORT mnLayer; SdNavigatorDropEvent ( const ExecuteDropEvent& rEvt, @@ -136,13 +136,13 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent pTransferable->SetWorkDocument( (SdDrawDocument*) GetAllMarkedModel() ); mpDoc->CreatingDataObj( NULL ); - const Rectangle aMarkRect( GetAllMarkedRect() ); - TransferableObjectDescriptor aObjDesc; - String aDisplayName; - SdrOle2Obj* pSdrOleObj = NULL; - SdrPageView* pPgView = GetSdrPageView(); - SdPage* pOldPage = pPgView ? ( (SdPage*) pPgView->GetPage() ) : NULL; - SdPage* pNewPage = (SdPage*) pTransferable->GetWorkDocument()->GetPage( 0 ); + const Rectangle aMarkRect( GetAllMarkedRect() ); + TransferableObjectDescriptor aObjDesc; + String aDisplayName; + SdrOle2Obj* pSdrOleObj = NULL; + SdrPageView* pPgView = GetSdrPageView(); + SdPage* pOldPage = pPgView ? ( (SdPage*) pPgView->GetPage() ) : NULL; + SdPage* pNewPage = (SdPage*) pTransferable->GetWorkDocument()->GetPage( 0 ); if( pOldPage ) { @@ -194,9 +194,9 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent SD_MOD()->pTransferDrag = pTransferable; - TransferableObjectDescriptor aObjDesc; - String aDisplayName; - SdrOle2Obj* pSdrOleObj = NULL; + TransferableObjectDescriptor aObjDesc; + String aDisplayName; + SdrOle2Obj* pSdrOleObj = NULL; if( GetMarkedObjectCount() == 1 ) { @@ -242,9 +242,9 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent { SdTransferable* pTransferable = new SdTransferable( mpDoc, pWorkView, TRUE ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRet( pTransferable ); - TransferableObjectDescriptor aObjDesc; - const Rectangle aMarkRect( GetAllMarkedRect() ); - String aDisplayName; + TransferableObjectDescriptor aObjDesc; + const Rectangle aMarkRect( GetAllMarkedRect() ); + String aDisplayName; SD_MOD()->pTransferSelection = pTransferable; @@ -327,9 +327,9 @@ void View::DoPaste (::Window* pWindow) { const_cast< OutlinerView* >(pOLV)->PasteSpecial(); - SdrObject* pObj = GetTextEditObject(); - SdPage* pPage = (SdPage*)( pObj ? pObj->GetPage() : NULL ); - ::Outliner* pOutliner = pOLV->GetOutliner(); + SdrObject* pObj = GetTextEditObject(); + SdPage* pPage = (SdPage*)( pObj ? pObj->GetPage() : NULL ); + ::Outliner* pOutliner = pOLV->GetOutliner(); if( pOutliner) { @@ -378,7 +378,7 @@ void View::DoPaste (::Window* pWindow) { if( !InsertData( aDataHelper, aPos, nDnDAction, FALSE ) ) { - INetBookmark aINetBookmark( aEmptyStr, aEmptyStr ); + INetBookmark aINetBookmark( aEmptyStr, aEmptyStr ); if( ( aDataHelper.HasFormat( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK ) && aDataHelper.GetINetBookmark( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, aINetBookmark ) ) || @@ -472,7 +472,7 @@ void View::DragFinished( sal_Int8 nDropAction ) if( pObj && pObj->GetPage() ) { #ifdef DBG_UTIL - SdrObject* pChkObj = + SdrObject* pChkObj = #endif pObj->GetPage()->RemoveObject(nOrdNum); DBG_ASSERT(pChkObj==pObj,"pChkObj!=pObj beim RemoveObject()"); @@ -498,10 +498,10 @@ void View::DragFinished( sal_Int8 nDropAction ) sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window*, USHORT, USHORT nLayer ) { - String aLayerName( GetActiveLayer() ); - SdrPageView* pPV = GetSdrPageView(); - sal_Int8 nDropAction = rEvt.mnAction; - sal_Int8 nRet = DND_ACTION_NONE; + String aLayerName( GetActiveLayer() ); + SdrPageView* pPV = GetSdrPageView(); + sal_Int8 nDropAction = rEvt.mnAction; + sal_Int8 nRet = DND_ACTION_NONE; if( nLayer != SDRLAYER_NOTFOUND ) { @@ -512,7 +512,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge if( mbIsDropAllowed && !pPV->IsLayerLocked( aLayerName ) && pPV->IsLayerVisible( aLayerName ) ) { const OutlinerView* pOLV = GetTextEditOutlinerView(); - BOOL bIsInsideOutlinerView = FALSE; + BOOL bIsInsideOutlinerView = FALSE; if( pOLV ) { @@ -556,10 +556,10 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge { const BOOL bDrawing = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_DRAWING ); const BOOL bGraphic = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_SVXB ); - const BOOL bMtf = rTargetHelper.IsDropFormatSupported( FORMAT_GDIMETAFILE ); - const BOOL bBitmap = rTargetHelper.IsDropFormatSupported( FORMAT_BITMAP ); - BOOL bBookmark = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK ); - BOOL bXFillExchange = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_XFA ); + const BOOL bMtf = rTargetHelper.IsDropFormatSupported( FORMAT_GDIMETAFILE ); + const BOOL bBitmap = rTargetHelper.IsDropFormatSupported( FORMAT_BITMAP ); + BOOL bBookmark = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK ); + BOOL bXFillExchange = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_XFA ); // check handle insert if( !nRet && ( (bXFillExchange && ( SDRDRAG_GRADIENT == GetDragMode() )) || ( SDRDRAG_TRANSPARENCE == GetDragMode() ) ) ) @@ -588,11 +588,11 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge // check object insert if( !nRet && ( bXFillExchange || ( ( bDrawing || bGraphic || bMtf || bBitmap || bBookmark ) && ( nDropAction & DND_ACTION_LINK ) ) ) ) { - SdrObject* pPickObj = NULL; - SdrPageView* pPageView = NULL; + SdrObject* pPickObj = NULL; + SdrPageView* pPageView = NULL; ::sd::Window* pWindow = mpViewSh->GetActiveWindow(); - Point aPos( pWindow->PixelToLogic( rEvt.maPosPixel ) ); - const BOOL bHasPickObj = PickObj( aPos, getHitTolLog(), pPickObj, pPageView ); + Point aPos( pWindow->PixelToLogic( rEvt.maPosPixel ) ); + const BOOL bHasPickObj = PickObj( aPos, getHitTolLog(), pPickObj, pPageView ); BOOL bIsPresTarget = FALSE; if( bHasPickObj && pPickObj && ( pPickObj->IsEmptyPresObj() || pPickObj->GetUserCall() ) ) @@ -610,7 +610,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge { mpDropMarkerObj = pPickObj; ImplClearDrawDropMarker(); - + if(mpDropMarkerObj) { mpDropMarker = new SdrDropMarkerOverlay(*this, *mpDropMarkerObj); @@ -673,10 +673,10 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, USHORT nPage, USHORT nLayer ) { - SdrPageView* pPV = GetSdrPageView(); - String aActiveLayer = GetActiveLayer(); - sal_Int8 nDropAction = rEvt.mnAction; - sal_Int8 nRet = DND_ACTION_NONE; + SdrPageView* pPV = GetSdrPageView(); + String aActiveLayer = GetActiveLayer(); + sal_Int8 nDropAction = rEvt.mnAction; + sal_Int8 nRet = DND_ACTION_NONE; // destroy drop marker if it is shown if( mpDropMarker ) @@ -688,7 +688,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar if( !pPV->IsLayerLocked( aActiveLayer ) ) { const OutlinerView* pOLV = GetTextEditOutlinerView(); - BOOL bIsInsideOutlinerView = FALSE; + BOOL bIsInsideOutlinerView = FALSE; if( pOLV ) { @@ -711,8 +711,8 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar if( !bIsInsideOutlinerView ) { - Point aPos; - TransferableDataHelper aDataHelper( rEvt.maDropEvent.Transferable ); + Point aPos; + TransferableDataHelper aDataHelper( rEvt.maDropEvent.Transferable ); if( pTargetWindow ) aPos = pTargetWindow->PixelToLogic( rEvt.maPosPixel ); @@ -753,8 +753,8 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar // special insert? if( !nRet && mpViewSh ) { - String aTmpString1, aTmpString2; - INetBookmark aINetBookmark( aTmpString1, aTmpString2 ); + String aTmpString1, aTmpString2; + INetBookmark aINetBookmark( aTmpString1, aTmpString2 ); // insert bookmark if( aDataHelper.HasFormat( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK ) && @@ -774,15 +774,15 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar } else { - SdrObject* pPickObj = NULL; - SdrPageView* pPageView = NULL; + SdrObject* pPickObj = NULL; + SdrPageView* pPageView = NULL; if( PickObj( aPos, getHitTolLog(), pPickObj, pPageView ) ) { // insert as clip action => jump - rtl::OUString aBookmark( aINetBookmark.GetURL() ); - SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo( pPickObj ); - BOOL bCreated = FALSE; + rtl::OUString aBookmark( aINetBookmark.GetURL() ); + SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo( pPickObj ); + BOOL bCreated = FALSE; if( aBookmark.getLength() ) { @@ -822,7 +822,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar pAction->SetPathObj(pInfo->mpPathObj, pInfo->mpPathObj); pAction->SetClickAction(pInfo->meClickAction, eClickAction); pAction->SetBookmark(pInfo->GetBookmark(), aBookmark); -// pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, TRUE); +// pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, TRUE); pAction->SetVerb(pInfo->mnVerb, pInfo->mnVerb); pAction->SetSecondEffect(pInfo->meSecondEffect, pInfo->meSecondEffect); pAction->SetSecondSpeed(pInfo->meSecondSpeed, pInfo->meSecondSpeed); @@ -858,17 +858,17 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEvent ) { - TransferableDataHelper aDataHelper( pSdNavigatorDropEvent->maDropEvent.Transferable ); + TransferableDataHelper aDataHelper( pSdNavigatorDropEvent->maDropEvent.Transferable ); SdPageObjsTLB::SdPageObjsTransferable* pPageObjsTransferable = SdPageObjsTLB::SdPageObjsTransferable::getImplementation( aDataHelper.GetXTransferable() ); - INetBookmark aINetBookmark; + INetBookmark aINetBookmark; if( pPageObjsTransferable && aDataHelper.GetINetBookmark( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, aINetBookmark ) ) { - Point aPos; - List aBookmarkList; - String aBookmark; - SdPage* pPage = (SdPage*) GetSdrPageView()->GetPage(); - USHORT nPgPos = 0xFFFF; + Point aPos; + List aBookmarkList; + String aBookmark; + SdPage* pPage = (SdPage*) GetSdrPageView()->GetPage(); + USHORT nPgPos = 0xFFFF; if( pSdNavigatorDropEvent->mpTargetWindow ) aPos = pSdNavigatorDropEvent->mpTargetWindow->PixelToLogic( pSdNavigatorDropEvent->maPosPixel ); @@ -890,10 +890,10 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv // Um zu gewaehrleisten, dass alle Seitennamen eindeutig sind, werden // die einzufuegenden geprueft und gegebenenfalls in einer Ersatzliste // aufgenommen (bNameOK == FALSE -> Benutzer hat abgebrochen) - List* pExchangeList = NULL; - BOOL bLink = ( NAVIGATOR_DRAGTYPE_LINK == pPageObjsTransferable->GetDragType() ? TRUE : FALSE ); - BOOL bNameOK = GetExchangeList( pExchangeList, &aBookmarkList, 2 ); - BOOL bReplace = FALSE; + List* pExchangeList = NULL; + BOOL bLink = ( NAVIGATOR_DRAGTYPE_LINK == pPageObjsTransferable->GetDragType() ? TRUE : FALSE ); + BOOL bNameOK = GetExchangeList( pExchangeList, &aBookmarkList, 2 ); + BOOL bReplace = FALSE; // Da man hier nicht weiss, ob es sich um eine Seite oder ein Objekt handelt, // wird eine Liste sowohl mit Seiten, als auch mit Objekten gefuellt. @@ -937,7 +937,7 @@ BOOL View::GetExchangeList( List*& rpExchangeList, List* pBookmarkList, USHORT n DBG_ASSERT( !rpExchangeList, "ExchangeList muss NULL sein!"); BOOL bListIdentical = TRUE; // BookmarkList und ExchangeList sind gleich - BOOL bNameOK = TRUE; // Name ist eindeutig + BOOL bNameOK = TRUE; // Name ist eindeutig rpExchangeList = new List(); @@ -952,7 +952,7 @@ BOOL View::GetExchangeList( List*& rpExchangeList, List* pBookmarkList, USHORT n if( nType == 0 || nType == 2 ) bNameOK = mpDocSh->CheckPageName ( mpViewSh->GetActiveWindow(), *pNewName); - + if( bNameOK && ( nType == 1 || nType == 2 ) ) { if( mpDoc->GetObj( *pNewName ) ) diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 53c0d3636d82..19a532aa2feb 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -111,8 +111,8 @@ namespace sd { // #83525# struct ImpRememberOrigAndClone { - SdrObject* pOrig; - SdrObject* pClone; + SdrObject* pOrig; + SdrObject* pClone; }; SdrObject* ImpGetClone(Container& aConnectorContainer, SdrObject* pConnObj) @@ -165,9 +165,9 @@ bool View::InsertMetaFile( TransferableDataHelper& rDataHelper, const Point& rPo return false; /* -SvFileStream aSvOutputStream( String( RTL_CONSTASCII_USTRINGPARAM( "/tmp/test.png" ) ), STREAM_WRITE | STREAM_TRUNC ); -Graphic aMtfGraphic( aMtf ); -Size aPreviewSizePixel( OutputDevice::LogicToLogic( aMtf.GetPrefSize(), aMtf.GetPrefMapMode(), MAP_PIXEL ) ); +SvFileStream aSvOutputStream( String( RTL_CONSTASCII_USTRINGPARAM( "/tmp/test.png" ) ), STREAM_WRITE | STREAM_TRUNC ); +Graphic aMtfGraphic( aMtf ); +Size aPreviewSizePixel( OutputDevice::LogicToLogic( aMtf.GetPrefSize(), aMtf.GetPrefMapMode(), MAP_PIXEL ) ); if( aPreviewSizePixel.Width() && aPreviewSizePixel.Height() ) { @@ -298,14 +298,14 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, mnAction = rDnDAction; mbIsDropAllowed = FALSE; - TransferableDataHelper aDataHelper( rDataHelper ); - SdrObject* pPickObj = NULL; - SdPage* pPage = NULL; - ImageMap* pImageMap = NULL; - BOOL bReturn = FALSE; - BOOL bLink = ( ( mnAction & DND_ACTION_LINK ) != 0 ); - BOOL bCopy = ( ( ( mnAction & DND_ACTION_COPY ) != 0 ) || bLink ); - ULONG nPasteOptions = SDRINSERT_SETDEFLAYER; + TransferableDataHelper aDataHelper( rDataHelper ); + SdrObject* pPickObj = NULL; + SdPage* pPage = NULL; + ImageMap* pImageMap = NULL; + BOOL bReturn = FALSE; + BOOL bLink = ( ( mnAction & DND_ACTION_LINK ) != 0 ); + BOOL bCopy = ( ( ( mnAction & DND_ACTION_COPY ) != 0 ) || bLink ); + ULONG nPasteOptions = SDRINSERT_SETDEFLAYER; if (mpViewSh != NULL) { @@ -397,10 +397,10 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( nLayer != SDRLAYER_NOTFOUND ) { // drop on layer tab bar - SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin(); - SdrLayer* pLayer = rLayerAdmin.GetLayerPerID( nLayer ); - SdrPageView* pPV = GetSdrPageView(); - String aLayer( pLayer->GetName() ); + SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin(); + SdrLayer* pLayer = rLayerAdmin.GetLayerPerID( nLayer ); + SdrPageView* pPV = GetSdrPageView(); + String aLayer( pLayer->GetName() ); if( !pPV->IsLayerLocked( aLayer ) ) { @@ -409,8 +409,8 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, for( ULONG nM = 0; nM < GetMarkedObjectCount(); nM++ ) { - SdrMark* pM = GetSdrMarkByIndex( nM ); - SdrObject* pO = pM->GetMarkedSdrObj(); + SdrMark* pM = GetSdrMarkByIndex( nM ); + SdrObject* pO = pM->GetMarkedSdrObj(); if( pO ) { @@ -431,8 +431,8 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, } else { - SdrPageView* pPV = GetSdrPageView(); - BOOL bDropOnTabBar = TRUE; + SdrPageView* pPV = GetSdrPageView(); + BOOL bDropOnTabBar = TRUE; if( !pPage && pPV->GetPage()->GetPageNum() != mnDragSrcPgNum ) { @@ -464,9 +464,9 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, pMarkList->ForceSort(); // #83525# stuff to remember originals and clones - Container aConnectorContainer(0); - sal_uInt32 a, nConnectorCount(0L); - Point aCurPos; + Container aConnectorContainer(0); + sal_uInt32 a, nConnectorCount(0L); + Point aCurPos; // calculate real position of current // source objects, if necessary (#103207) @@ -649,8 +649,8 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, } else { - SdDrawDocument* pWorkModel = (SdDrawDocument*) pOwnData->GetWorkDocument(); - SdPage* pWorkPage = (SdPage*) pWorkModel->GetSdPage( 0, PK_STANDARD ); + SdDrawDocument* pWorkModel = (SdDrawDocument*) pOwnData->GetWorkDocument(); + SdPage* pWorkPage = (SdPage*) pWorkModel->GetSdPage( 0, PK_STANDARD ); pWorkPage->SetRectsDirty(); @@ -710,20 +710,20 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( pModel->GetSdPage( 0, PK_STANDARD )->GetObjCount() == 1 ) { // only one object - SdrObject* pObj = pModel->GetSdPage( 0, PK_STANDARD )->GetObj( 0 ); - SdrObject* pPickObj2 = NULL; - SdrPageView* pPV = NULL; + SdrObject* pObj = pModel->GetSdPage( 0, PK_STANDARD )->GetObj( 0 ); + SdrObject* pPickObj2 = NULL; + SdrPageView* pPV = NULL; PickObj( rPos, getHitTolLog(), pPickObj2, pPV ); if( ( mnAction & DND_ACTION_MOVE ) && pPickObj2 && pObj ) { // replace object - SdrObject* pNewObj = pObj->Clone(); - Rectangle aPickObjRect( pPickObj2->GetCurrentBoundRect() ); - Size aPickObjSize( aPickObjRect.GetSize() ); - Point aVec( aPickObjRect.TopLeft() ); - Rectangle aObjRect( pNewObj->GetCurrentBoundRect() ); - Size aObjSize( aObjRect.GetSize() ); + SdrObject* pNewObj = pObj->Clone(); + Rectangle aPickObjRect( pPickObj2->GetCurrentBoundRect() ); + Size aPickObjSize( aPickObjRect.GetSize() ); + Point aVec( aPickObjRect.TopLeft() ); + Rectangle aObjRect( pNewObj->GetCurrentBoundRect() ); + Size aObjSize( aObjRect.GetSize() ); Fraction aScaleWidth( aPickObjSize.Width(), aObjSize.Width() ); Fraction aScaleHeight( aPickObjSize.Height(), aObjSize.Height() ); @@ -831,8 +831,8 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( pObj ) { - Rectangle aRect( pObj->GetLogicRect() ); - Size aSize( aRect.GetSize() ); + Rectangle aRect( pObj->GetLogicRect() ); + Size aSize( aRect.GetSize() ); maDropPos.X() -= ( aSize.Width() >> 1 ); maDropPos.Y() -= ( aSize.Height() >> 1 ); @@ -851,7 +851,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, { //TODO/LATER: is it possible that this format is binary?! (from old versions of SO) uno::Reference < io::XInputStream > xStm; - TransferableObjectDescriptor aObjDesc; + TransferableObjectDescriptor aObjDesc; if( aDataHelper.GetTransferableObjectDescriptor( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR, aObjDesc ) && ( aDataHelper.GetInputStream( nFormat ? nFormat : SOT_FORMATSTR_ID_EMBED_SOURCE, xStm ) || @@ -866,8 +866,8 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, SfxMedium *pMedium = new SfxMedium( xStore, String() ); if( xDocShRef->DoLoad( pMedium ) ) { - SdDrawDocument* pModel = (SdDrawDocument*) xDocShRef->GetDoc(); - SdPage* pWorkPage = (SdPage*) pModel->GetSdPage( 0, PK_STANDARD ); + SdDrawDocument* pModel = (SdDrawDocument*) xDocShRef->GetDoc(); + SdPage* pWorkPage = (SdPage*) pModel->GetSdPage( 0, PK_STANDARD ); pWorkPage->SetRectsDirty(); @@ -1020,7 +1020,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( (nFormat != 0) || !aDataHelper.HasFormat( FORMAT_GDIMETAFILE ) ) { uno::Reference < io::XInputStream > xStm; - TransferableObjectDescriptor aObjDesc; + TransferableObjectDescriptor aObjDesc; if ( aDataHelper.GetTransferableObjectDescriptor( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE, aObjDesc ) ) { @@ -1181,8 +1181,8 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( pOwnData && pOwnData->GetWorkDocument() ) { - const SdDrawDocument* pWorkModel = pOwnData->GetWorkDocument(); - SdrPage* pWorkPage = (SdrPage*) ( ( pWorkModel->GetPageCount() > 1 ) ? + const SdDrawDocument* pWorkModel = pOwnData->GetWorkDocument(); + SdrPage* pWorkPage = (SdrPage*) ( ( pWorkModel->GetPageCount() > 1 ) ? pWorkModel->GetSdPage( 0, PK_STANDARD ) : pWorkModel->GetPage( 0 ) ); @@ -1212,8 +1212,8 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( pOwnData && pOwnData->GetWorkDocument() ) { - const SdDrawDocument* pWorkModel = pOwnData->GetWorkDocument(); - SdrPage* pWorkPage = (SdrPage*) ( ( pWorkModel->GetPageCount() > 1 ) ? + const SdDrawDocument* pWorkModel = pOwnData->GetWorkDocument(); + SdrPage* pWorkPage = (SdrPage*) ( ( pWorkModel->GetPageCount() > 1 ) ? pWorkModel->GetSdPage( 0, PK_STANDARD ) : pWorkModel->GetPage( 0 ) ); @@ -1238,8 +1238,8 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( pOwnData && pOwnData->GetWorkDocument() ) { - const SdDrawDocument* pWorkModel = pOwnData->GetWorkDocument(); - SdrPage* pWorkPage = (SdrPage*) ( ( pWorkModel->GetPageCount() > 1 ) ? + const SdDrawDocument* pWorkModel = pOwnData->GetWorkDocument(); + SdrPage* pWorkPage = (SdrPage*) ( ( pWorkModel->GetPageCount() > 1 ) ? pWorkModel->GetSdPage( 0, PK_STANDARD ) : pWorkModel->GetPage( 0 ) ); @@ -1277,26 +1277,26 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, EndUndo(); } - XFillAttrSetItem* pSetItem = aFillData.GetXFillAttrSetItem(); - SfxItemSet rSet = pSetItem->GetItemSet(); - XFillStyle eFill= ( (XFillStyleItem&) rSet.Get( XATTR_FILLSTYLE ) ).GetValue(); + XFillAttrSetItem* pSetItem = aFillData.GetXFillAttrSetItem(); + SfxItemSet rSet = pSetItem->GetItemSet(); + XFillStyle eFill= ( (XFillStyleItem&) rSet.Get( XATTR_FILLSTYLE ) ).GetValue(); if( eFill == XFILL_SOLID || eFill == XFILL_NONE ) { - const XFillColorItem& rColItem = (XFillColorItem&) rSet.Get( XATTR_FILLCOLOR ); - Color aColor( rColItem.GetColorValue() ); - String aName( rColItem.GetName() ); - SfxItemSet aSet( mpDoc->GetPool() ); - BOOL bClosed = pPickObj->IsClosedObj(); + const XFillColorItem& rColItem = (XFillColorItem&) rSet.Get( XATTR_FILLCOLOR ); + Color aColor( rColItem.GetColorValue() ); + String aName( rColItem.GetName() ); + SfxItemSet aSet( mpDoc->GetPool() ); + BOOL bClosed = pPickObj->IsClosedObj(); ::sd::Window* pWin = mpViewSh->GetActiveWindow(); USHORT nHitLog = (USHORT) pWin->PixelToLogic( Size(FuPoor::HITPIX, 0 ) ).Width(); - const long n2HitLog = nHitLog << 1; - Point aHitPosR( rPos ); - Point aHitPosL( rPos ); - Point aHitPosT( rPos ); - Point aHitPosB( rPos ); - const SetOfByte* pVisiLayer = &GetSdrPageView()->GetVisibleLayers(); + const long n2HitLog = nHitLog << 1; + Point aHitPosR( rPos ); + Point aHitPosL( rPos ); + Point aHitPosT( rPos ); + Point aHitPosB( rPos ); + const SetOfByte* pVisiLayer = &GetSdrPageView()->GetVisibleLayers(); aHitPosR.X() += n2HitLog; aHitPosL.X() -= n2HitLog; diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 70f276227899..9ec90c522e6c 100755 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -96,9 +96,9 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, mnAction = rAction; // Liegt ein Objekt an der Position rPos? - SdrGrafObj* pNewGrafObj = NULL; - SdrPageView* pPV = GetSdrPageView(); - SdrObject* pPickObj = pObj; + SdrGrafObj* pNewGrafObj = NULL; + SdrPageView* pPV = GetSdrPageView(); + SdrObject* pPickObj = pObj; if(pPV && this->ISA(::sd::slidesorter::view::SlideSorterView)) { @@ -118,7 +118,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, if( bIsGraphic || pObj->IsEmptyPresObj() ) { if( IsUndoEnabled() ) - BegUndo(String(SdResId(STR_INSERTGRAPHIC))); + BegUndo(String(SdResId(STR_INSERTGRAPHIC))); SdPage* pPage = (SdPage*) pPickObj->GetPage(); @@ -206,10 +206,10 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, aPageSize.Width() -= pPage->GetLftBorder() + pPage->GetRgtBorder(); aPageSize.Height() -= pPage->GetUppBorder() + pPage->GetLwrBorder(); pNewGrafObj->AdjustToMaxRect( Rectangle( Point(), aPageSize ), TRUE ); -// pNewGrafObj->AdjustToMaxRect( Rectangle( pPV->GetOffset(), aPageSize ), TRUE ); +// pNewGrafObj->AdjustToMaxRect( Rectangle( pPV->GetOffset(), aPageSize ), TRUE ); - ULONG nOptions = SDRINSERT_SETDEFLAYER; - BOOL bIsPresTarget = FALSE; + ULONG nOptions = SDRINSERT_SETDEFLAYER; + BOOL bIsPresTarget = FALSE; if ((mpViewSh && mpViewSh->GetViewShell()!=NULL @@ -290,9 +290,9 @@ SdrMediaObj* View::InsertMediaURL( const rtl::OUString& rMediaURL, sal_Int8& rAc SdrEndTextEdit(); mnAction = rAction; - SdrMediaObj* pNewMediaObj = NULL; - SdrPageView* pPV = GetSdrPageView(); - SdrObject* pPickObj = GetEmptyPresentationObject( PRESOBJ_MEDIA ); + SdrMediaObj* pNewMediaObj = NULL; + SdrPageView* pPV = GetSdrPageView(); + SdrObject* pPickObj = GetEmptyPresentationObject( PRESOBJ_MEDIA ); if(pPV && this->ISA(::sd::slidesorter::view::SlideSorterView )) { @@ -376,7 +376,7 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG ) { String aCurrentDropFile( *aIter ); INetURLObject aURL( aCurrentDropFile ); - BOOL bOK = FALSE; + BOOL bOK = FALSE; if( aURL.GetProtocol() == INET_PROT_NOT_VALID ) { @@ -386,7 +386,7 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG ) } GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter(); - Graphic aGraphic; + Graphic aGraphic; aCurrentDropFile = aURL.GetMainURL( INetURLObject::NO_DECODE ); @@ -406,14 +406,14 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG ) if( !bOK ) { const SfxFilter* pFoundFilter = NULL; - SfxMedium aSfxMedium( aCurrentDropFile, STREAM_READ | STREAM_SHARE_DENYNONE, FALSE ); - ErrCode nErr = SFX_APP()->GetFilterMatcher().GuessFilter( aSfxMedium, &pFoundFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE ); + SfxMedium aSfxMedium( aCurrentDropFile, STREAM_READ | STREAM_SHARE_DENYNONE, FALSE ); + ErrCode nErr = SFX_APP()->GetFilterMatcher().GuessFilter( aSfxMedium, &pFoundFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE ); if( pFoundFilter && !nErr ) { ::std::vector< String > aFilterVector; - const String aFilterName( pFoundFilter->GetFilterName() ); - String aLowerAsciiFileName( aCurrentDropFile ); + const String aFilterName( pFoundFilter->GetFilterName() ); + String aLowerAsciiFileName( aCurrentDropFile ); aLowerAsciiFileName.ToLowerAscii(); FuInsertFile::GetSupportedFilterVector( aFilterVector ); @@ -486,7 +486,7 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG ) { // TODO/LEAN: VisualArea access can switch the object to running state sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; - + xPersist->storeOwn(); awt::Size aSz; @@ -498,7 +498,7 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG ) { // the default size will be set later } - + Size aSize( aSz.Width, aSz.Height ); Rectangle aRect; diff --git a/sd/source/ui/view/sdview5.cxx b/sd/source/ui/view/sdview5.cxx index 156544c235ab..47882e459231 100755 --- a/sd/source/ui/view/sdview5.cxx +++ b/sd/source/ui/view/sdview5.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ namespace sd { static bool implIsMultiPresObj( PresObjKind eKind ) { switch( eKind ) - { + { case PRESOBJ_OUTLINE: case PRESOBJ_GRAPHIC: case PRESOBJ_OBJECT: @@ -56,7 +56,7 @@ SdrObject* View::GetEmptyPresentationObject( PresObjKind eKind ) { SdrObject* pEmptyObj = 0; - SdrPageView* pPV = GetSdrPageView(); + SdrPageView* pPV = GetSdrPageView(); if( pPV ) { SdPage* pPage = static_cast< SdPage* >( pPV->GetPage() ); @@ -95,7 +95,7 @@ SdrObject* View::GetEmptyPresentationObject( PresObjKind eKind ) if( !pEmptyObj ) { const std::list< SdrObject* >& rShapes = pPage->GetPresentationShapeList().getList(); - + for( std::list< SdrObject* >::const_iterator iter( rShapes.begin() ); iter != rShapes.end(); iter++ ) { if( (*iter)->IsEmptyPresObj() && implIsMultiPresObj(pPage->GetPresObjKind(*iter)) ) diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 28873b3946a3..9290bc6c1463 100755 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,8 +55,8 @@ namespace sd { #define SCROLL_PAGE_FACT 0.5 // Faktor fuer Seitenscrolling #define SCROLL_SENSITIVE 20 // Sensitiver Bereich (Pixel) #define ZOOM_MULTIPLICATOR 10000 // Multiplikator um Rundungsfehler zu vermeiden -#define MIN_ZOOM 5 // Minimaler Zoomfaktor -#define MAX_ZOOM 3000 // Maximaler Zoomfaktor +#define MIN_ZOOM 5 // Minimaler Zoomfaktor +#define MAX_ZOOM 3000 // Maximaler Zoomfaktor /************************************************************************* @@ -69,9 +69,9 @@ Window::Window(::Window* pParent) : ::Window(pParent, WinBits(WB_CLIPCHILDREN | WB_DIALOGCONTROL)), DropTargetHelper( this ), mpShareWin(NULL), - maWinPos(0, 0), // vorsichtshalber; die Werte sollten aber - maViewOrigin(0, 0), // vom Besitzer des Fensters neu gesetzt - maViewSize(1000, 1000), // werden + maWinPos(0, 0), // vorsichtshalber; die Werte sollten aber + maViewOrigin(0, 0), // vom Besitzer des Fensters neu gesetzt + maViewSize(1000, 1000), // werden mnMinZoom(MIN_ZOOM), mnMaxZoom(MAX_ZOOM), mbMinZoomAutoCalc(false), @@ -549,7 +549,7 @@ long Window::GetZoomForRect( const Rectangle& rZoomRect ) nRetZoom = GetZoom(); } else - { + { // Clip the zoom factor to the valid range marked by nMinZoom as // previously calculated by <member>CalcMinZoom()</member> and the // MAX_ZOOM constant. @@ -635,8 +635,8 @@ long Window::SetZoomRect (const Rectangle& rZoomRect) aWinSize.Height() = (long) ((double) aWinSize.Height() * (double) ZOOM_MULTIPLICATOR / (double) nFact); maWinPos.Y() += (rZoomRect.GetHeight() - aWinSize.Height()) / 2; - if ( maWinPos.X() < 0 ) maWinPos.X() = 0; - if ( maWinPos.Y() < 0 ) maWinPos.Y() = 0; + if ( maWinPos.X() < 0 ) maWinPos.X() = 0; + if ( maWinPos.Y() < 0 ) maWinPos.Y() = 0; // Adapt the window's map mode to the new zoom factor. nNewZoom = SetZoomFactor(nZoom); @@ -667,8 +667,8 @@ void Window::SetMinZoomAutoCalc (bool bAuto) void Window::UpdateMapOrigin(BOOL bInvalidate) { - BOOL bChanged = FALSE; - Size aWinSize = PixelToLogic(GetOutputSizePixel()); + BOOL bChanged = FALSE; + Size aWinSize = PixelToLogic(GetOutputSizePixel()); if ( mbCenterAllowed ) { @@ -719,7 +719,7 @@ void Window::UpdateMapMode (void) { Size aViewSizePixel = LogicToPixel(maViewSize); Size aWinSizePixel = LogicToPixel(aWinSize); - + // Seite soll nicht am Fensterrand "kleben" if (aPix.Width() == 0) { @@ -736,13 +736,13 @@ void Window::UpdateMapMode (void) aPix.Height() -= 8; } } - + aPix = PixelToLogic(aPix); maWinPos.X() = aPix.Width(); maWinPos.Y() = aPix.Height(); Point aNewOrigin (-maWinPos.X(), -maWinPos.Y()); maWinPos += maViewOrigin; - + MapMode aMap(GetMapMode()); aMap.SetOrigin(aNewOrigin); SetMapMode(aMap); @@ -793,8 +793,8 @@ void Window::SetVisibleXY(double fX, double fY) if ( fY >= 0 ) maWinPos.Y() = (long) (fY * maViewSize.Height()); UpdateMapOrigin(FALSE); - // Size sz(nOldX - aWinPos.X(), nOldY - aWinPos.Y()); - // sz = LogicToPixel(sz); + // Size sz(nOldX - aWinPos.X(), nOldY - aWinPos.Y()); + // sz = LogicToPixel(sz); Scroll(nOldX - maWinPos.X(), nOldY - maWinPos.Y(), SCROLL_CHILDREN); Update(); } @@ -897,7 +897,7 @@ void Window::LoseFocus() void Window::GrabFocus() { - mnTicks = 0; + mnTicks = 0; ::Window::GrabFocus (); } @@ -968,7 +968,7 @@ void Window::DataChanged( const DataChangedEvent& rDCEvt ) SetDrawMode( nOutputMode ); mpViewShell->GetFrameView()->SetDrawMode( nOutputMode ); // #110094#-7 -// mpViewShell->GetView()->ReleaseMasterPagePaintCache(); +// mpViewShell->GetView()->ReleaseMasterPagePaintCache(); Invalidate(); } @@ -1150,9 +1150,9 @@ void Window::DropScroll(const Point& rMousePos) if ( (nDx || nDy) && (rMousePos.X()!=0 || rMousePos.Y()!=0 ) ) { - if (mnTicks > 20) + if (mnTicks > 20) mpViewShell->ScrollLines(nDx, nDy); - else + else mnTicks ++; } } @@ -1165,11 +1165,11 @@ void Window::DropScroll(const Point& rMousePos) Window::CreateAccessible (void) { if (mpViewShell != NULL) - return mpViewShell->CreateAccessibleDocumentView (this); + return mpViewShell->CreateAccessibleDocumentView (this); else { OSL_TRACE ("::sd::Window::CreateAccessible: no view shell"); - return ::Window::CreateAccessible (); + return ::Window::CreateAccessible (); } } diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index d9d074eee395..3a4318a383cc 100644 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ namespace sd { -#define SWITCH_TIMEOUT 20 +#define SWITCH_TIMEOUT 20 // ----------------------------------------- // - SdTabControl::SdPageObjsTransferable - @@ -133,8 +133,8 @@ void TabControl::Select() void TabControl::MouseButtonDown(const MouseEvent& rMEvt) { if (rMEvt.IsLeft() - && !rMEvt.IsMod1() - && !rMEvt.IsMod2() + && !rMEvt.IsMod1() + && !rMEvt.IsMod2() && !rMEvt.IsShift()) { Point aPos = PixelToLogic( rMEvt.GetPosPixel() ); @@ -231,7 +231,7 @@ sal_Int8 TabControl::AcceptDrop( const AcceptDropEvent& rEvt ) if( !pDrViewSh->GetDocSh()->IsReadOnly() ) { SdDrawDocument* pDoc = pDrViewSh->GetDoc(); - Point aPos( rEvt.maPosPixel ); + Point aPos( rEvt.maPosPixel ); if( bInternalMove ) { @@ -269,8 +269,8 @@ sal_Int8 TabControl::AcceptDrop( const AcceptDropEvent& rEvt ) sal_Int8 TabControl::ExecuteDrop( const ExecuteDropEvent& rEvt ) { SdDrawDocument* pDoc = pDrViewSh->GetDoc(); - Point aPos( rEvt.maPosPixel ); - sal_Int8 nRet = DND_ACTION_NONE; + Point aPos( rEvt.maPosPixel ); + sal_Int8 nRet = DND_ACTION_NONE; if( bInternalMove ) { @@ -285,7 +285,7 @@ sal_Int8 TabControl::ExecuteDrop( const ExecuteDropEvent& rEvt ) pDispatcher->Execute(SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); } break; - + case DND_ACTION_COPY: { // Copying the selected page to the place that rEvt points diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx index 5a7f9830895e..5c0ecde0207b 100644 --- a/sd/source/ui/view/unmodpg.cxx +++ b/sd/source/ui/view/unmodpg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,21 +60,21 @@ ModifyPageUndoAction::ModifyPageUndoAction( SdDrawDocument* pTheDoc, SdPage* pThePage, String aTheNewName, - AutoLayout eTheNewAutoLayout, + AutoLayout eTheNewAutoLayout, BOOL bTheNewBckgrndVisible, BOOL bTheNewBckgrndObjsVisible) -: SdUndoAction(pTheDoc), +: SdUndoAction(pTheDoc), mpManager(pTheManager) { DBG_ASSERT(pThePage, "Undo ohne Seite ???"); - mpPage = pThePage; - maNewName = aTheNewName; - meNewAutoLayout = eTheNewAutoLayout; - mbNewBckgrndVisible = bTheNewBckgrndVisible; - mbNewBckgrndObjsVisible = bTheNewBckgrndObjsVisible; + mpPage = pThePage; + maNewName = aTheNewName; + meNewAutoLayout = eTheNewAutoLayout; + mbNewBckgrndVisible = bTheNewBckgrndVisible; + mbNewBckgrndObjsVisible = bTheNewBckgrndObjsVisible; - meOldAutoLayout = mpPage->GetAutoLayout(); + meOldAutoLayout = mpPage->GetAutoLayout(); if (!mpPage->IsMasterPage()) { @@ -104,7 +104,7 @@ void ModifyPageUndoAction::Undo() // which are no longer allowed to be selected then. SdrViewIter aIter(mpPage); SdrView* pView = aIter.FirstView(); - + while(pView) { if(pView->AreObjectsMarked()) @@ -153,7 +153,7 @@ void ModifyPageUndoAction::Redo() // which are no longer allowed to be selected then. SdrViewIter aIter(mpPage); SdrView* pView = aIter.FirstView(); - + while(pView) { if(pView->AreObjectsMarked()) @@ -244,6 +244,6 @@ void RenameLayoutTemplateUndoAction::Redo() String RenameLayoutTemplateUndoAction::GetComment() const { - return maComment; + return maComment; } diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index c1e1d9634844..9d292d5f87f4 100755 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -409,8 +409,8 @@ BitmapEx ChangePlaceholderTag::createOverlayImage( int nHighlight ) aRet = *(getButtonImage((nHighlight == 0) ? 4 : 0, bLarge)); aRet.Expand( aSize.Width(), aSize.Height(), NULL, TRUE ); - aRet.CopyPixel( Rectangle( Point( aSize.Width(), 0 ), aSize ), aRectSrc, getButtonImage((nHighlight == 1) ? 5 : 1, bLarge) ); - aRet.CopyPixel( Rectangle( Point( 0, aSize.Height() ), aSize ), aRectSrc, getButtonImage((nHighlight == 2) ? 6 : 2, bLarge) ); + aRet.CopyPixel( Rectangle( Point( aSize.Width(), 0 ), aSize ), aRectSrc, getButtonImage((nHighlight == 1) ? 5 : 1, bLarge) ); + aRet.CopyPixel( Rectangle( Point( 0, aSize.Height() ), aSize ), aRectSrc, getButtonImage((nHighlight == 2) ? 6 : 2, bLarge) ); aRet.CopyPixel( Rectangle( Point( aSize.Width(), aSize.Height() ), aSize ), aRectSrc, getButtonImage((nHighlight == 3) ? 7 : 3, bLarge) ); } @@ -434,7 +434,7 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) long nShapeSizePix = std::min(aShapeSizePix.Width(),aShapeSizePix.Height()); if( 50 > nShapeSizePix ) return; - + bool bLarge = nShapeSizePix > 250; Size aButtonSize( pDev->PixelToLogic( getButtonImage(0, bLarge )->GetSizePixel()) ); @@ -452,7 +452,7 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) ImageButtonHdl* pHdl = new ImageButtonHdl( xThis, aPoint ); pHdl->SetObjHdlNum( SMART_TAG_HDL_NUM ); pHdl->SetPageView( mrView.GetSdrPageView() ); - + pHdl->SetPos( aPos ); rHandlerList.AddHdl( pHdl ); @@ -493,7 +493,7 @@ ViewOverlayManager::ViewOverlayManager( ViewShellBase& rViewShellBase ) | tools::EventMultiplexerEvent::EID_BEGIN_TEXT_EDIT | tools::EventMultiplexerEvent::EID_END_TEXT_EDIT ); - StartListening( *mrBase.GetDocShell() ); + StartListening( *mrBase.GetDocShell() ); } // -------------------------------------------------------------------- @@ -547,22 +547,22 @@ IMPL_LINK(ViewOverlayManager,UpdateTagsHdl, void *, EMPTYARG) mnUpdateTagsEvent = 0; bool bChanges = DisposeTags(); bChanges |= CreateTags(); - + if( bChanges && mrBase.GetDrawView() ) - static_cast< ::sd::View* >( mrBase.GetDrawView() )->updateHandles(); + static_cast< ::sd::View* >( mrBase.GetDrawView() )->updateHandles(); return 0; } bool ViewOverlayManager::CreateTags() { bool bChanges = false; - + SdPage* pPage = mrBase.GetMainViewShell()->getCurrentPage(); - - if( pPage && !pPage->IsMasterPage() && (pPage->GetPageKind() == PK_STANDARD) ) + + if( pPage && !pPage->IsMasterPage() && (pPage->GetPageKind() == PK_STANDARD) ) { const std::list< SdrObject* >& rShapes = pPage->GetPresentationShapeList().getList(); - + for( std::list< SdrObject* >::const_iterator iter( rShapes.begin() ); iter != rShapes.end(); iter++ ) { if( (*iter)->IsEmptyPresObj() && ((*iter)->GetObjIdentifier() == OBJ_OUTLINETEXT) && (mrBase.GetDrawView()->GetTextEditObject() != (*iter)) ) @@ -573,7 +573,7 @@ bool ViewOverlayManager::CreateTags() } } } - + return bChanges; } @@ -585,7 +585,7 @@ bool ViewOverlayManager::DisposeTags() { ViewTagVector vec; vec.swap( maTagVector ); - + ViewTagVector::iterator iter = vec.begin(); do { @@ -594,7 +594,7 @@ bool ViewOverlayManager::DisposeTags() while( iter != vec.end() ); return true; } - + return false; } diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 616516782be3..10f204a20783 100755 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -348,9 +348,9 @@ void ViewShell::Scroll(long nScrollX, long nScrollY) long nNewThumb = mpVerticalScrollBar->GetThumbPos() + nScrollY; mpVerticalScrollBar->SetThumbPos(nNewThumb); } - double fX = (double) mpHorizontalScrollBar->GetThumbPos() / + double fX = (double) mpHorizontalScrollBar->GetThumbPos() / mpHorizontalScrollBar->GetRange().Len(); - double fY = (double) mpVerticalScrollBar->GetThumbPos() / + double fY = (double) mpVerticalScrollBar->GetThumbPos() / mpVerticalScrollBar->GetRange().Len(); GetActiveWindow()->SetVisibleXY(fX, fY); @@ -1096,7 +1096,7 @@ sal_Int8 ViewShell::ExecuteDrop ( USHORT nPage, USHORT nLayer) { - ::sd::View* pView = GetView(); + ::sd::View* pView = GetView(); return( pView ? pView->ExecuteDrop( rEvt, rTargetHelper, pTargetWindow, nPage, nLayer ) : DND_ACTION_NONE ); } diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 8bfdefd240da..e8ba00a04a05 100755 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -229,7 +229,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( SdPage* pTemplatePage = pPage; if (pTemplatePage == NULL) if (pDocument->GetSdPage(0, ePageKind) > 0) - pTemplatePage = pDocument->GetSdPage(0, ePageKind); + pTemplatePage = pDocument->GetSdPage(0, ePageKind); if (pTemplatePage != NULL && pTemplatePage->TRG_HasMasterPage()) aVisibleLayers = pTemplatePage->TRG_GetMasterPageVisibleLayers(); else @@ -313,12 +313,12 @@ SdPage* ViewShell::CreateOrDuplicatePage ( } bIsPageBack = pIsPageBack->GetValue (); - bIsPageObj = pIsPageObj->GetValue (); + bIsPageObj = pIsPageObj->GetValue (); } else { Cancel(); - + if(HasCurrentFunction( SID_BEZIER_EDIT ) ) GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); @@ -406,11 +406,11 @@ SdPage* ViewShell::CreateOrDuplicatePage ( // Duplication makes no sense when pPage is NULL. if (pPage != NULL) nNewPageIndex = pDocument->DuplicatePage ( - pPage, + pPage, ePageKind, - aStandardPageName, + aStandardPageName, aNotesPageName, - eStandardLayout, + eStandardLayout, eNotesLayout, bIsPageBack, bIsPageObj); diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index c1f4bc070bcf..7e3930bf50cb 100755 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -166,9 +166,9 @@ TYPEINIT1(ViewShell, SfxShell); ViewShell::ViewShell( SfxViewFrame*, ::Window* pParentWindow, ViewShellBase& rViewShellBase, bool bAllowCenter) -: SfxShell(&rViewShellBase) -, mbCenterAllowed(bAllowCenter) -, mpParentWindow(pParentWindow) +: SfxShell(&rViewShellBase) +, mbCenterAllowed(bAllowCenter) +, mpParentWindow(pParentWindow) { construct(); } @@ -365,7 +365,7 @@ void ViewShell::Activate(BOOL bIsMDIActivate) //HMHif (pView) //HMH{ - //HMH pView->ShowMarkHdl(); + //HMH pView->ShowMarkHdl(); //HMH} } @@ -536,7 +536,7 @@ void ViewShell::MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin) { pWin->GrabFocus(); SetActiveWindow(pWin); -// GetViewFrame()->GetWindow().GrabFocus(); +// GetViewFrame()->GetWindow().GrabFocus(); } // MouseEvent in E3dView eintragen @@ -661,7 +661,7 @@ void ViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) { bConsumed = GetView()->getSmartTags().Command(rCEvt); } - + if( !bConsumed && HasCurrentFunction()) { GetCurrentFunction()->Command(rCEvt); @@ -814,7 +814,7 @@ void ViewShell::Resize (void) if (mpParentWindow == NULL) return; - + // Make sure that the new size is not degenerate. const Size aSize (mpParentWindow->GetSizePixel()); if (aSize.Width()==0 || aSize.Height()==0) @@ -840,7 +840,7 @@ void ViewShell::Resize (void) // GetDocSh()->SetVisArea(aVisArea); } - // VisAreaChanged(aVisArea); + // VisAreaChanged(aVisArea); ::sd::View* pView = GetView(); diff --git a/sd/source/ui/view/zoomlist.cxx b/sd/source/ui/view/zoomlist.cxx index 9ae178e3d7a6..6de6005166bc 100755 --- a/sd/source/ui/view/zoomlist.cxx +++ b/sd/source/ui/view/zoomlist.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ namespace sd { -#define MAX_ENTRYS 10 +#define MAX_ENTRYS 10 /************************************************************************* |* diff --git a/sd/uiconfig/sdraw/toolbar/arrowshapes.xml b/sd/uiconfig/sdraw/toolbar/arrowshapes.xml index b1260e5410bc..801774af3a9d 100644 --- a/sd/uiconfig/sdraw/toolbar/arrowshapes.xml +++ b/sd/uiconfig/sdraw/toolbar/arrowshapes.xml @@ -18,17 +18,17 @@ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" /> <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" /> <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" /> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" /> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" /> </toolbar:toolbar>
\ No newline at end of file diff --git a/sd/uiconfig/sdraw/toolbar/basicshapes.xml b/sd/uiconfig/sdraw/toolbar/basicshapes.xml index e65778305788..bd4b96708264 100644 --- a/sd/uiconfig/sdraw/toolbar/basicshapes.xml +++ b/sd/uiconfig/sdraw/toolbar/basicshapes.xml @@ -18,12 +18,12 @@ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" /> <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" /> <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" /> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" /> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" /> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" /> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" /> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" /> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" /> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" /> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" /> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" /> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" /> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" /> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" /> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" /> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" /> </toolbar:toolbar>
\ No newline at end of file diff --git a/sd/uiconfig/sdraw/toolbar/flowchartshapes.xml b/sd/uiconfig/sdraw/toolbar/flowchartshapes.xml index 696a713424cd..a40eb066cefc 100644 --- a/sd/uiconfig/sdraw/toolbar/flowchartshapes.xml +++ b/sd/uiconfig/sdraw/toolbar/flowchartshapes.xml @@ -18,19 +18,19 @@ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector" toolbar:helpid="helpid:11005" /> <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector" toolbar:helpid="helpid:11005" /> <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" /> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" /> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" /> <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" /> </toolbar:toolbar>
\ No newline at end of file diff --git a/sd/uiconfig/sdraw/toolbar/symbolshapes.xml b/sd/uiconfig/sdraw/toolbar/symbolshapes.xml index 0e96bcf78134..764997e0fda2 100644 --- a/sd/uiconfig/sdraw/toolbar/symbolshapes.xml +++ b/sd/uiconfig/sdraw/toolbar/symbolshapes.xml @@ -18,7 +18,7 @@ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair" toolbar:helpid="helpid:11003" /> <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace" toolbar:helpid="helpid:11003" /> <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace" toolbar:helpid="helpid:11003" /> - <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" /> - <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" /> - <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" /> + <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" /> + <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" /> + <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" /> </toolbar:toolbar>
\ No newline at end of file diff --git a/sd/uiconfig/sdraw/toolbar/toolbar.xml b/sd/uiconfig/sdraw/toolbar/toolbar.xml index 34ebb18ad4e2..5ac55e4e9f8e 100644 --- a/sd/uiconfig/sdraw/toolbar/toolbar.xml +++ b/sd/uiconfig/sdraw/toolbar/toolbar.xml @@ -41,5 +41,5 @@ <toolbar:toolbaritem xlink:href=".uno:InsertToolbox" toolbar:helpid="helpid:27318" toolbar:style="radio dropdown" toolbar:visible="false" /> <toolbar:toolbaritem xlink:href=".uno:Config" toolbar:helpid="helpid:10593" toolbar:style="dropdown" toolbar:visible="false" /> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/> + <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/> </toolbar:toolbar>
\ No newline at end of file diff --git a/sd/uiconfig/simpress/toolbar/arrowshapes.xml b/sd/uiconfig/simpress/toolbar/arrowshapes.xml index 34f135283f50..ebe56b1c0fbd 100644 --- a/sd/uiconfig/simpress/toolbar/arrowshapes.xml +++ b/sd/uiconfig/simpress/toolbar/arrowshapes.xml @@ -18,17 +18,17 @@ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" /> <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" /> <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" /> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" /> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" /> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" /> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" /> </toolbar:toolbar>
\ No newline at end of file diff --git a/sd/uiconfig/simpress/toolbar/basicshapes.xml b/sd/uiconfig/simpress/toolbar/basicshapes.xml index a9e23fe67ed9..967246d9a2c9 100644 --- a/sd/uiconfig/simpress/toolbar/basicshapes.xml +++ b/sd/uiconfig/simpress/toolbar/basicshapes.xml @@ -18,12 +18,12 @@ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" /> <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" /> <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" /> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" /> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" /> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" /> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" /> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" /> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" /> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" /> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" /> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" /> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" /> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" /> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" /> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" /> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" /> </toolbar:toolbar>
\ No newline at end of file diff --git a/sd/uiconfig/simpress/toolbar/flowchartshapes.xml b/sd/uiconfig/simpress/toolbar/flowchartshapes.xml index 5eff42015672..2b0f759b2cb5 100644 --- a/sd/uiconfig/simpress/toolbar/flowchartshapes.xml +++ b/sd/uiconfig/simpress/toolbar/flowchartshapes.xml @@ -18,19 +18,19 @@ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector" toolbar:helpid="helpid:11005" /> <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector" toolbar:helpid="helpid:11005" /> <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" /> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" /> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" /> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" /> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" /> </toolbar:toolbar>
\ No newline at end of file diff --git a/sd/uiconfig/simpress/toolbar/symbolshapes.xml b/sd/uiconfig/simpress/toolbar/symbolshapes.xml index 0e96bcf78134..764997e0fda2 100644 --- a/sd/uiconfig/simpress/toolbar/symbolshapes.xml +++ b/sd/uiconfig/simpress/toolbar/symbolshapes.xml @@ -18,7 +18,7 @@ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair" toolbar:helpid="helpid:11003" /> <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace" toolbar:helpid="helpid:11003" /> <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace" toolbar:helpid="helpid:11003" /> - <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" /> - <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" /> - <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" /> + <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" /> + <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" /> + <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" /> </toolbar:toolbar>
\ No newline at end of file diff --git a/sd/util/hidother.hrc b/sd/util/hidother.hrc index 5169a3c2ed07..23a6fbe6d88d 100644 --- a/sd/util/hidother.hrc +++ b/sd/util/hidother.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,6 +38,6 @@ #define SD_IF_SDGRAPHICDOCSHELL 200 + 10 #define SD_IF_SDGRAPHICVIEWSHELL 200 + 11 #define SD_IF_SDGRAPHICSTDOBJECTBAR 200 + 12 -#define SD_IF_SDDRAWGRAFOBJECTBAR 200 + 13 -#define SD_IF_SDPRESVIEWSHELL 200 + 14 -#define SD_IF_SDDRAWMEDIAOBJECTBAR 200 + 15 +#define SD_IF_SDDRAWGRAFOBJECTBAR 200 + 13 +#define SD_IF_SDPRESVIEWSHELL 200 + 14 +#define SD_IF_SDDRAWMEDIAOBJECTBAR 200 + 15 diff --git a/sd/util/hidother.src b/sd/util/hidother.src index 1a15c421b419..0624a2755b47 100644 --- a/sd/util/hidother.src +++ b/sd/util/hidother.src @@ -1,7 +1,7 @@ /************************************************************************ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,8 +44,8 @@ hidspecial SD_IF_SDDRAWGLUEPOINTSOBJECTBAR { HelpId = SD_IF_SDDRAWGLUEPOINTSOBJE hidspecial SD_IF_SDGRAPHICDOCSHELL { HelpId = SD_IF_SDGRAPHICDOCSHELL; }; hidspecial SD_IF_SDGRAPHICVIEWSHELL { HelpId = SD_IF_SDGRAPHICVIEWSHELL; }; hidspecial SD_IF_SDGRAPHICSTDOBJECTBAR { HelpId = SD_IF_SDGRAPHICSTDOBJECTBAR; }; -hidspecial SD_IF_SDDRAWGRAFOBJECTBAR { HelpId = SD_IF_SDDRAWGRAFOBJECTBAR; }; -hidspecial SD_IF_SDPRESVIEWSHELL { HelpId = SD_IF_SDPRESVIEWSHELL; }; +hidspecial SD_IF_SDDRAWGRAFOBJECTBAR { HelpId = SD_IF_SDDRAWGRAFOBJECTBAR; }; +hidspecial SD_IF_SDPRESVIEWSHELL { HelpId = SD_IF_SDPRESVIEWSHELL; }; hidspecial HID_SD_PRINT_OPTIONS { HelpId = HID_SD_PRINT_OPTIONS; }; hidspecial HID_SD_OPTIONS_SNAP { HelpId = HID_SD_OPTIONS_SNAP; }; @@ -70,7 +70,7 @@ hidspecial HID_SD_BTN_SLIDE { HelpId = HID_SD_BTN_SLIDE; }; hidspecial HID_SD_BTN_OUTLINE { HelpId = HID_SD_BTN_OUTLINE; }; hidspecial HID_SD_BTN_NOTES { HelpId = HID_SD_BTN_NOTES; }; hidspecial HID_SD_BTN_HANDOUT { HelpId = HID_SD_BTN_HANDOUT; }; -hidspecial HID_SD_BTN_PRESENTATION { HelpId = HID_SD_BTN_PRESENTATION; }; +hidspecial HID_SD_BTN_PRESENTATION { HelpId = HID_SD_BTN_PRESENTATION; }; hidspecial HID_SD_WIN_DOCUMENT { HelpId = HID_SD_WIN_DOCUMENT; }; @@ -78,59 +78,59 @@ hidspecial HID_SD_OPTIONS_LAYOUT { HelpId = HID_SD_OPTIONS_LAYOUT; }; hidspecial HID_SD_OPTIONS_CONTENTS { HelpId = HID_SD_OPTIONS_CONTENTS; }; hidspecial HID_SD_OPTIONS_MISC { HelpId = HID_SD_OPTIONS_MISC; }; -hidspecial HID_SD_EFFECT_PREVIEW { HelpId = HID_SD_OPTIONS_MISC; }; -hidspecial HID_SD_CTL_NEWFOIL { HelpId = HID_SD_CTL_NEWFOIL; }; -hidspecial HID_SD_NAVIGATOR_TLB { HelpId = HID_SD_NAVIGATOR_TLB; }; -hidspecial HID_SD_NAVIGATOR { HelpId = HID_SD_NAVIGATOR; }; +hidspecial HID_SD_EFFECT_PREVIEW { HelpId = HID_SD_OPTIONS_MISC; }; +hidspecial HID_SD_CTL_NEWFOIL { HelpId = HID_SD_CTL_NEWFOIL; }; +hidspecial HID_SD_NAVIGATOR_TLB { HelpId = HID_SD_NAVIGATOR_TLB; }; +hidspecial HID_SD_NAVIGATOR { HelpId = HID_SD_NAVIGATOR; }; -hidspecial HID_SD_CTL_EFFECTS { HelpId = HID_SD_CTL_EFFECTS; }; -hidspecial HID_SD_CTL_TEXT_EFFECTS { HelpId = HID_SD_CTL_TEXT_EFFECTS; }; +hidspecial HID_SD_CTL_EFFECTS { HelpId = HID_SD_CTL_EFFECTS; }; +hidspecial HID_SD_CTL_TEXT_EFFECTS { HelpId = HID_SD_CTL_TEXT_EFFECTS; }; -hidspecial HID_SD_CTL_SLIDE_CHANGE { HelpId = HID_SD_CTL_SLIDE_CHANGE; }; +hidspecial HID_SD_CTL_SLIDE_CHANGE { HelpId = HID_SD_CTL_SLIDE_CHANGE; }; -hidspecial HID_SD_NAVIGATOR_TBX { HelpId = HID_SD_NAVIGATOR_TBX; }; -hidspecial HID_SD_NAVIGATOR_LB { HelpId = HID_SD_NAVIGATOR_LB; }; +hidspecial HID_SD_NAVIGATOR_TBX { HelpId = HID_SD_NAVIGATOR_TBX; }; +hidspecial HID_SD_NAVIGATOR_LB { HelpId = HID_SD_NAVIGATOR_LB; }; -hidspecial HID_SD_NAVIGATOR_TBI_PEN { HelpId = HID_SD_NAVIGATOR_TBI_PEN; }; -hidspecial HID_SD_NAVIGATOR_TBI_FIRST { HelpId = HID_SD_NAVIGATOR_TBI_FIRST; }; -hidspecial HID_SD_NAVIGATOR_TBI_PREV { HelpId = HID_SD_NAVIGATOR_TBI_PREV; }; -hidspecial HID_SD_NAVIGATOR_TBI_NEXT { HelpId = HID_SD_NAVIGATOR_TBI_NEXT; }; -hidspecial HID_SD_NAVIGATOR_TBI_LAST { HelpId = HID_SD_NAVIGATOR_TBI_LAST; }; +hidspecial HID_SD_NAVIGATOR_TBI_PEN { HelpId = HID_SD_NAVIGATOR_TBI_PEN; }; +hidspecial HID_SD_NAVIGATOR_TBI_FIRST { HelpId = HID_SD_NAVIGATOR_TBI_FIRST; }; +hidspecial HID_SD_NAVIGATOR_TBI_PREV { HelpId = HID_SD_NAVIGATOR_TBI_PREV; }; +hidspecial HID_SD_NAVIGATOR_TBI_NEXT { HelpId = HID_SD_NAVIGATOR_TBI_NEXT; }; +hidspecial HID_SD_NAVIGATOR_TBI_LAST { HelpId = HID_SD_NAVIGATOR_TBI_LAST; }; hidspecial HID_SD_NAVIGATOR_TBI_DRAGTYPE{ HelpId = HID_SD_NAVIGATOR_TBI_DRAGTYPE; }; -hidspecial HID_SD_HTMLEXPORT_PAGE1 { HelpId = HID_SD_HTMLEXPORT_PAGE1; }; -hidspecial HID_SD_HTMLEXPORT_PAGE2 { HelpId = HID_SD_HTMLEXPORT_PAGE2; }; -hidspecial HID_SD_HTMLEXPORT_PAGE3 { HelpId = HID_SD_HTMLEXPORT_PAGE3; }; -hidspecial HID_SD_HTMLEXPORT_PAGE4 { HelpId = HID_SD_HTMLEXPORT_PAGE4; }; -hidspecial HID_SD_HTMLEXPORT_PAGE5 { HelpId = HID_SD_HTMLEXPORT_PAGE5; }; -hidspecial HID_SD_HTMLEXPORT_PAGE6 { HelpId = HID_SD_HTMLEXPORT_PAGE6; }; -hidspecial HID_SD_HTMLEXPORT_DLG_DNAME { HelpId = HID_SD_HTMLEXPORT_DLG_DNAME; }; +hidspecial HID_SD_HTMLEXPORT_PAGE1 { HelpId = HID_SD_HTMLEXPORT_PAGE1; }; +hidspecial HID_SD_HTMLEXPORT_PAGE2 { HelpId = HID_SD_HTMLEXPORT_PAGE2; }; +hidspecial HID_SD_HTMLEXPORT_PAGE3 { HelpId = HID_SD_HTMLEXPORT_PAGE3; }; +hidspecial HID_SD_HTMLEXPORT_PAGE4 { HelpId = HID_SD_HTMLEXPORT_PAGE4; }; +hidspecial HID_SD_HTMLEXPORT_PAGE5 { HelpId = HID_SD_HTMLEXPORT_PAGE5; }; +hidspecial HID_SD_HTMLEXPORT_PAGE6 { HelpId = HID_SD_HTMLEXPORT_PAGE6; }; +hidspecial HID_SD_HTMLEXPORT_DLG_DNAME { HelpId = HID_SD_HTMLEXPORT_DLG_DNAME; }; -hidspecial HID_SD_CHGFOIL_LAYOUT { HelpId = HID_SD_CHGFOIL_LAYOUT; }; -hidspecial HID_SD_CHGFOIL_BACKGROUND { HelpId = HID_SD_CHGFOIL_BACKGROUND; }; -hidspecial HID_SD_CHGFOIL_OBJECTS { HelpId = HID_SD_CHGFOIL_OBJECTS; }; -hidspecial HID_SD_CHGFOIL_NAME { HelpId = HID_SD_CHGFOIL_NAME; }; +hidspecial HID_SD_CHGFOIL_LAYOUT { HelpId = HID_SD_CHGFOIL_LAYOUT; }; +hidspecial HID_SD_CHGFOIL_BACKGROUND { HelpId = HID_SD_CHGFOIL_BACKGROUND; }; +hidspecial HID_SD_CHGFOIL_OBJECTS { HelpId = HID_SD_CHGFOIL_OBJECTS; }; +hidspecial HID_SD_CHGFOIL_NAME { HelpId = HID_SD_CHGFOIL_NAME; }; -hidspecial HID_FM_CTL_SELECTION { HelpId = HID_FM_CTL_SELECTION; }; +hidspecial HID_FM_CTL_SELECTION { HelpId = HID_FM_CTL_SELECTION; }; -hidspecial HID_SD_WIN_PRESENTATION { HelpId = HID_SD_WIN_PRESENTATION; }; +hidspecial HID_SD_WIN_PRESENTATION { HelpId = HID_SD_WIN_PRESENTATION; }; -hidspecial HID_SD_TABBAR_PAGES { HelpId = HID_SD_TABBAR_PAGES; }; -hidspecial HID_SD_TABBAR_LAYERS { HelpId = HID_SD_TABBAR_LAYERS; }; +hidspecial HID_SD_TABBAR_PAGES { HelpId = HID_SD_TABBAR_PAGES; }; +hidspecial HID_SD_TABBAR_LAYERS { HelpId = HID_SD_TABBAR_LAYERS; }; hidspecial HID_SD_UNDODELETEWARNING_DLG { HelpId = HID_SD_UNDODELETEWARNING_DLG; }; hidspecial HID_SD_UNDODELETEWARNING_CBX { HelpId = HID_SD_UNDODELETEWARNING_CBX; }; -hidspecial HID_SD_PAGEOBJSTLB { HelpId = HID_SD_PAGEOBJSTLB; }; +hidspecial HID_SD_PAGEOBJSTLB { HelpId = HID_SD_PAGEOBJSTLB; }; -hidspecial HID_SD_NAMEDIALOG_OBJECT { HelpId = HID_SD_NAMEDIALOG_OBJECT; }; -hidspecial HID_SD_NAMEDIALOG_PAGE { HelpId = HID_SD_NAMEDIALOG_PAGE; }; -hidspecial HID_SD_NAMEDIALOG_LINEEND { HelpId = HID_SD_NAMEDIALOG_LINEEND; }; +hidspecial HID_SD_NAMEDIALOG_OBJECT { HelpId = HID_SD_NAMEDIALOG_OBJECT; }; +hidspecial HID_SD_NAMEDIALOG_PAGE { HelpId = HID_SD_NAMEDIALOG_PAGE; }; +hidspecial HID_SD_NAMEDIALOG_LINEEND { HelpId = HID_SD_NAMEDIALOG_LINEEND; }; hidspecial HID_SD_TABPAGE_HEADERFOOTER_SLIDE { HelpId = HID_SD_TABPAGE_HEADERFOOTER_SLIDE; }; hidspecial HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT { HelpId = HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT; }; -hidspecial SD_IF_SDDRAWMEDIAOBJECTBAR { HelpId = SD_IF_SDDRAWMEDIAOBJECTBAR; }; +hidspecial SD_IF_SDDRAWMEDIAOBJECTBAR { HelpId = SD_IF_SDDRAWMEDIAOBJECTBAR; }; hidspecial HID_SD_TASK_PANE { HelpId = HID_SD_TASK_PANE; }; hidspecial HID_SD_SLIDE_DESIGNS { HelpId = HID_SD_SLIDE_DESIGNS; }; @@ -140,7 +140,7 @@ hidspecial HID_SD_ALL_MASTERS { HelpId = HID_SD_ALL_MASTERS; }; hidspecial HID_SD_SLIDE_LAYOUTS { HelpId = HID_SD_SLIDE_LAYOUTS; }; hidspecial HID_SD_CUSTOM_ANIMATIONS { HelpId = HID_SD_CUSTOM_ANIMATIONS; }; hidspecial HID_SD_SLIDE_TRANSITIONS { HelpId = HID_SD_SLIDE_TRANSITIONS; }; -hidspecial HID_SD_ANNOTATIONS { HelpId = HID_SD_ANNOTATIONS; }; +hidspecial HID_SD_ANNOTATIONS { HelpId = HID_SD_ANNOTATIONS; }; hidspecial HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT { HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT; }; hidspecial HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT { HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT; }; @@ -177,30 +177,30 @@ hidspecial HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW { HelpId = HID_SD_SLI hidspecial HID_SD_TASK_PANE_VIEW_MENU { HelpId = HID_SD_TASK_PANE_VIEW_MENU; }; hidspecial HID_SD_TASK_PANE_PREVIEW_CURRENT { HelpId = HID_SD_TASK_PANE_PREVIEW_CURRENT; }; hidspecial HID_SD_TASK_PANE_PREVIEW_RECENT { HelpId = HID_SD_TASK_PANE_PREVIEW_RECENT; }; -hidspecial HID_SD_TASK_PANE_PREVIEW_ALL { HelpId = HID_SD_TASK_PANE_PREVIEW_ALL; }; +hidspecial HID_SD_TASK_PANE_PREVIEW_ALL { HelpId = HID_SD_TASK_PANE_PREVIEW_ALL; }; hidspecial HID_SD_TASK_PANE_PREVIEW_LAYOUTS { HelpId = HID_SD_TASK_PANE_PREVIEW_LAYOUTS; }; -hidspecial HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE { HelpId = HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE; }; -hidspecial HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS { HelpId = HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS; }; -hidspecial HID_SD_CUSTOMANIMATIONDIALOG_EXIT { HelpId = HID_SD_CUSTOMANIMATIONDIALOG_EXIT; }; -hidspecial HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH { HelpId = HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH; }; +hidspecial HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE { HelpId = HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE; }; +hidspecial HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS { HelpId = HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS; }; +hidspecial HID_SD_CUSTOMANIMATIONDIALOG_EXIT { HelpId = HID_SD_CUSTOMANIMATIONDIALOG_EXIT; }; +hidspecial HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH { HelpId = HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH; }; -hidspecial HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX { HelpId = HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX; }; -hidspecial HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX { HelpId = HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX; }; -hidspecial HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX { HelpId = HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX; }; -hidspecial HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX { HelpId = HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX; }; -hidspecial HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX { HelpId = HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX; }; -hidspecial HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX { HelpId = HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX; }; -hidspecial HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX { HelpId = HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX; }; -hidspecial HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX { HelpId = HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX; }; +hidspecial HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX { HelpId = HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX; }; +hidspecial HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX { HelpId = HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX; }; +hidspecial HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX { HelpId = HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX; }; +hidspecial HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX { HelpId = HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX; }; +hidspecial HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX { HelpId = HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX; }; +hidspecial HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX { HelpId = HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX; }; +hidspecial HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX { HelpId = HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX; }; +hidspecial HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX { HelpId = HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX; }; hidspecial SID_SAVEGRAPHIC { HelpId = SID_SAVEGRAPHIC; }; -hidspecial HID_SD_SLIDESHOW_DISPLAY { HelpId = HID_SD_SLIDESHOW_DISPLAY; }; +hidspecial HID_SD_SLIDESHOW_DISPLAY { HelpId = HID_SD_SLIDESHOW_DISPLAY; }; -hidspecial HID_SD_RULER_HORIZONTAL { HelpId = HID_SD_RULER_HORIZONTAL; }; -hidspecial HID_SD_RULER_VERTICAL { HelpId = HID_SD_RULER_VERTICAL; }; +hidspecial HID_SD_RULER_HORIZONTAL { HelpId = HID_SD_RULER_HORIZONTAL; }; +hidspecial HID_SD_RULER_VERTICAL { HelpId = HID_SD_RULER_VERTICAL; }; -hidspecial HID_SD_TABLE_DESIGN { HelpId = HID_SD_TABLE_DESIGN; }; -hidspecial HID_SD_ANNOTATIONS { HelpId = HID_SD_ANNOTATIONS; }; +hidspecial HID_SD_TABLE_DESIGN { HelpId = HID_SD_TABLE_DESIGN; }; +hidspecial HID_SD_ANNOTATIONS { HelpId = HID_SD_ANNOTATIONS; }; diff --git a/sd/workben/custompanel/ctp_panel.cxx b/sd/workben/custompanel/ctp_panel.cxx index f36dd897736c..3719816a9b17 100644 --- a/sd/workben/custompanel/ctp_panel.cxx +++ b/sd/workben/custompanel/ctp_panel.cxx @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -188,7 +188,7 @@ namespace sd { namespace colortoolpanel throw DisposedException( ::rtl::OUString(), *this ); return m_xResourceId; } - + //------------------------------------------------------------------------------------------------------------------ ::sal_Bool SAL_CALL SingleColorPanel::isAnchorOnly( ) throw (RuntimeException) { diff --git a/sd/workben/custompanel/ctp_panel.hxx b/sd/workben/custompanel/ctp_panel.hxx index e82d33ea1b4d..2aea52c0fab3 100644 --- a/sd/workben/custompanel/ctp_panel.hxx +++ b/sd/workben/custompanel/ctp_panel.hxx @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/xml/AccessibleDrawDocumentView.xml b/sd/xml/AccessibleDrawDocumentView.xml index c0ce59a8f122..f0604abf2ac8 100644 --- a/sd/xml/AccessibleDrawDocumentView.xml +++ b/sd/xml/AccessibleDrawDocumentView.xml @@ -11,7 +11,7 @@ document views and Impress document views with the view modes edit view, notes view, or handout view. For more detailed information see the documentation of the supported services and the link to the general -accessibility documentation.</description> +accessibility documentation.</description> <reference-docu xlink-href="http://ui.openoffice.org/accessibility" title="Link to a general description of UNO accessibility"/> diff --git a/sd/xml/DrawingView.xml b/sd/xml/DrawingView.xml index 15399fcab257..26285b0ee228 100644 --- a/sd/xml/DrawingView.xml +++ b/sd/xml/DrawingView.xml @@ -6,7 +6,7 @@ <author>Christian Lippka</author> <name>DrawController_DrawView</name> <description> -specifies a document which consists of multiple pages +specifies a document which consists of multiple pages with drawings. </description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> diff --git a/sd/xml/effects.xml b/sd/xml/effects.xml index be341ef5e229..c67e251b0538 100644 --- a/sd/xml/effects.xml +++ b/sd/xml/effects.xml @@ -660,7 +660,7 @@ <anim:animate smil:dur="0.5" smil:fill="hold" smil:attributeName="height" smil:values="0;height" smil:keyTimes="0;1"/> </anim:par> </anim:par> - </anim:par> + </anim:par> <anim:par smil:begin="indefinite" smil:fill="hold"> <anim:par smil:begin="0" smil:fill="hold"> <anim:par pres:preset-property="Direction" smil:begin="0" smil:fill="hold" pres:node-type="on-click" pres:preset-class="entrance" pres:preset-id="ooo-entrance-stretchy" pres:preset-sub-type="from-bottom"> @@ -748,7 +748,7 @@ <anim:animate smil:dur="0.5" smil:fill="hold" smil:attributeName="height" smil:values="0;height" smil:keyTimes="0;1"/> </anim:par> </anim:par> - </anim:par> + </anim:par> <anim:par smil:begin="indefinite" smil:fill="hold"> <anim:par smil:begin="0" smil:fill="hold"> <anim:iterate pres:text-only="true" smil:begin="0" smil:fill="hold" pres:node-type="on-click" pres:preset-class="entrance" pres:preset-id="ooo-entrance-unfold" anim:iterate-type="by-letter" anim:iterate-interval="0.1s"> diff --git a/sd/xml/transitions.xml b/sd/xml/transitions.xml index 1b77c3ec4732..a9a32ebf5d16 100644 --- a/sd/xml/transitions.xml +++ b/sd/xml/transitions.xml @@ -121,20 +121,20 @@ <anim:transitionFilter smil:type="slideWipe" smil:subtype="fromLeft"/> </anim:par> <anim:par pres:preset-id="cover-up"> - <anim:transitionFilter smil:type="slideWipe" smil:subtype="fromBottom"/> + <anim:transitionFilter smil:type="slideWipe" smil:subtype="fromBottom"/> </anim:par> <anim:par pres:preset-id="cover-left-down"> - <anim:transitionFilter smil:type="slideWipe" smil:subtype="fromTopRight"/> + <anim:transitionFilter smil:type="slideWipe" smil:subtype="fromTopRight"/> </anim:par> <anim:par pres:preset-id="cover-left-up"> - <anim:transitionFilter smil:type="slideWipe" smil:subtype="fromBottomRight"/> + <anim:transitionFilter smil:type="slideWipe" smil:subtype="fromBottomRight"/> </anim:par> <anim:par pres:preset-id="cover-right-down"> - <anim:transitionFilter smil:type="slideWipe" smil:subtype="fromTopLeft"/> + <anim:transitionFilter smil:type="slideWipe" smil:subtype="fromTopLeft"/> </anim:par> <anim:par pres:preset-id="cover-right-up"> - <anim:transitionFilter smil:type="slideWipe" smil:subtype="fromBottomLeft"/> - </anim:par> + <anim:transitionFilter smil:type="slideWipe" smil:subtype="fromBottomLeft"/> + </anim:par> <anim:par pres:preset-id="dissolve"> <anim:transitionFilter smil:type="dissolve" smil:subtype="default"/> </anim:par> diff --git a/slideshow/inc/pch/precompiled_slideshow.cxx b/slideshow/inc/pch/precompiled_slideshow.cxx index 18f2e1d138c2..e5eec9707830 100644 --- a/slideshow/inc/pch/precompiled_slideshow.cxx +++ b/slideshow/inc/pch/precompiled_slideshow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx b/slideshow/inc/pch/precompiled_slideshow.hxx index a8b7de738166..0d67d70acdf8 100644 --- a/slideshow/inc/pch/precompiled_slideshow.hxx +++ b/slideshow/inc/pch/precompiled_slideshow.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/qa/debug/nodetree.sh b/slideshow/qa/debug/nodetree.sh index e40078faaddd..a4ef1c107f7a 100644 --- a/slideshow/qa/debug/nodetree.sh +++ b/slideshow/qa/debug/nodetree.sh @@ -12,20 +12,20 @@ # First of all, you need to recompile modules slideshow and canvas # with VERBOSE=t set in the environment, and debug=t defined at the # build tool command line. Then run your slideshow and redirect stdout -# to a file. +# to a file. # # Then, call 'nodetree.sh trace-file > tree.ps' to generate a # PostScript file for the AnimationNode tree generated during the show. -# Since these easily get pretty huge, use only one page, and try to -# limit the slide content (which have effects assigned, that is) to +# Since these easily get pretty huge, use only one page, and try to +# limit the slide content (which have effects assigned, that is) to # the bare minimum (to reproduce your bug, or whatever you need this # for). # -# The generated output will have all nodes color-coded with their state -# at the point when the tree was dumped (see colors.sh for the color +# The generated output will have all nodes color-coded with their state +# at the point when the tree was dumped (see colors.sh for the color # codes) # -# When looking for the mechanics that generate the relevant output, +# When looking for the mechanics that generate the relevant output, # grep for the DEBUG_NODES_SHOWTREE macros in the slideshow source: # Each such place dumps the current node tree to the trace output. Thus, # if you need to check the tree state at other places or times, just add @@ -38,11 +38,11 @@ # ################################################### -egrep "Node connection|Node state" $1 | \ - sed -e '/Node state/ s/.*Node state.*: \(.*\)/\1/' \ - -e '/Node connection/ s/.*Node connection.*: \(n.*\)/\1/' | \ +egrep "Node connection|Node state" $1 | \ + sed -e '/Node state/ s/.*Node state.*: \(.*\)/\1/' \ + -e '/Node connection/ s/.*Node connection.*: \(n.*\)/\1/' | \ \ -awk 'BEGIN { print "digraph Event_network {" }; { print } END { print "}" }' | \ +awk 'BEGIN { print "digraph Event_network {" }; { print } END { print "}" }' | \ \ \ # fill a complete A1 page with graph output diff --git a/slideshow/qa/debug/timings.pl b/slideshow/qa/debug/timings.pl index 5af3e89761e9..a409b8d5f392 100644 --- a/slideshow/qa/debug/timings.pl +++ b/slideshow/qa/debug/timings.pl @@ -51,7 +51,7 @@ $record = 1; while( <> ) { if( $state == 0 && m|next position will be| ) - { + { ($posX) = m|.*\(([0-9]+.[0-9]+),|; ($posY) = m|.*,([0-9]+.[0-9]+)\)|; $state = 1; diff --git a/slideshow/qa/tools/mkeffects.pl b/slideshow/qa/tools/mkeffects.pl index 38673aea473d..954f9659f2c5 100755 --- a/slideshow/qa/tools/mkeffects.pl +++ b/slideshow/qa/tools/mkeffects.pl @@ -1,10 +1,10 @@ : eval 'exec perl -wS $0 ${1+"$@"}' - if 0; + if 0; -use IO::File; -use Cwd; +use IO::File; +use Cwd; use File::Spec; use File::Spec::Functions; use File::Temp; @@ -18,72 +18,72 @@ $TempDir = ""; ############################################################################### -# Open a file with the given name. -# First it is checked if the temporary directory, in which all files for -# the document are gathered, is already present and create it if it is not. -# Then create the path to the file inside the temporary directory. -# Finally open the file and return a file handle to it. +# Open a file with the given name. +# First it is checked if the temporary directory, in which all files for +# the document are gathered, is already present and create it if it is not. +# Then create the path to the file inside the temporary directory. +# Finally open the file and return a file handle to it. # -sub open_file +sub open_file { - my $filename = pop @_; - - # Create base directory of temporary directory tree if not alreay - # present. + my $filename = pop @_; + + # Create base directory of temporary directory tree if not alreay + # present. if ($TempDir eq "") { $TempDir = File::Temp::tempdir (CLEANUP => 1); } - - # Create the path to the file. + + # Create the path to the file. my $fullname = File::Spec->catfile ($TempDir, $filename); my ($volume,$directories,$file) = File::Spec->splitpath ($fullname); mkpath (File::Spec->catpath ($volume,$directories,"")); - - # Open the file and return a file handle to it. + + # Open the file and return a file handle to it. return new IO::File ($fullname, "w"); } ############################################################################### -# Zip the files in the directory tree into the given file. +# Zip the files in the directory tree into the given file. # -sub zip_dirtree +sub zip_dirtree { - my $filename = pop @_; - - my $cwd = getcwd; - my $zip_name = $filename; - - # We are about to change the directory. - # Therefore create an absolute pathname for the zip archive. - - # First transfer the drive from $cwd to $zip_name. This is a - # workaround for a bug in file_name_is_absolute which thinks - # the the path \bla is an absolute path under DOS. + my $filename = pop @_; + + my $cwd = getcwd; + my $zip_name = $filename; + + # We are about to change the directory. + # Therefore create an absolute pathname for the zip archive. + + # First transfer the drive from $cwd to $zip_name. This is a + # workaround for a bug in file_name_is_absolute which thinks + # the the path \bla is an absolute path under DOS. my ($volume,$directories,$file) = File::Spec->splitpath ($zip_name); my ($volume_cwd,$directories_cwd,$file_cwd) = File::Spec->splitpath ($cwd); $volume = $volume_cwd if ($volume eq ""); $zip_name = File::Spec->catpath ($volume,$directories,$file); - - # Add the current working directory to a relative path. + + # Add the current working directory to a relative path. if ( ! file_name_is_absolute ($zip_name)) { $zip_name = File::Spec->catfile ($cwd, $zip_name); - - # Try everything to clean up the name. + + # Try everything to clean up the name. $zip_name = File::Spec->rel2abs ($filename); $zip_name = File::Spec->canonpath ($zip_name); - - # Remove .. directories from the middle of the path. + + # Remove .. directories from the middle of the path. while ($zip_name =~ /\/[^\/][^\.\/][^\/]*\/\.\.\//) { $zip_name = $` . "/" . $'; } } - # Just in case the zip program gets confused by an existing file with the - # same name as the one to be written that file is removed first. + # Just in case the zip program gets confused by an existing file with the + # same name as the one to be written that file is removed first. if ( -e $filename) { if (unlink ($filename) == 0) @@ -93,9 +93,9 @@ sub zip_dirtree return; } } - - # Finally create the zip file. First change into the temporary directory - # so that the resulting zip file contains only paths relative to it. + + # Finally create the zip file. First change into the temporary directory + # so that the resulting zip file contains only paths relative to it. print "zipping [$ZipCmd $ZipFlags $zip_name *]\n"; chdir ($TempDir); system ("$ZipCmd $ZipFlags $zip_name *"); @@ -220,9 +220,9 @@ sub writeTransitionAnimation print $OUT " <anim:par smil:begin=\"0s\" smil:fill=\"remove\">\n"; print $OUT " <anim:set smil:begin=\"0s\" smil:dur=\"0.001s\" smil:fill=\"hold\" smil:targetElement=\"textid$slideNum\" smil:attributeName=\"visibility\" smil:to=\"visible\"/>\n"; - print $OUT " <anim:transitionFilter smil:dur=\"1s\" smil:targetElement=\"textid$slideNum\" smil:type=\"$transitionType\" smil:subtype=\"$transitionSubtype\"/>\n"; + print $OUT " <anim:transitionFilter smil:dur=\"1s\" smil:targetElement=\"textid$slideNum\" smil:type=\"$transitionType\" smil:subtype=\"$transitionSubtype\"/>\n"; print $OUT " <anim:set smil:begin=\"0.3s\" smil:dur=\"0.001s\" smil:fill=\"hold\" smil:targetElement=\"id$slideNum\" smil:attributeName=\"visibility\" smil:to=\"visible\"/>\n"; - print $OUT " <anim:transitionFilter smil:begin=\"0.3s\" smil:dur=\"1s\" smil:targetElement=\"id$slideNum\" smil:type=\"$transitionType\" smil:subtype=\"$transitionSubtype\"/>\n"; + print $OUT " <anim:transitionFilter smil:begin=\"0.3s\" smil:dur=\"1s\" smil:targetElement=\"id$slideNum\" smil:type=\"$transitionType\" smil:subtype=\"$transitionSubtype\"/>\n"; print $OUT " </anim:par>\n"; } @@ -235,9 +235,9 @@ sub writePropertyAnimation print $OUT " <anim:par smil:begin=\"0s\" smil:dur=\"3s\" smil:fill=\"remove\">\n"; print $OUT " <anim:set smil:begin=\"0s\" smil:dur=\"0.001s\" smil:fill=\"hold\" smil:targetElement=\"id$slideNum\" smil:attributeName=\"visibility\" smil:to=\"visible\"/>\n"; - print $OUT " <anim:animate smil:begin=\"0s\" smil:dur=\"1s\" smil:fill=\"hold\" smil:targetElement=\"id$slideNum\" smil:attributeName=\"$propertyName\" smil:values=\"$propertyStart;$propertyEnd\" smil:keyTimes=\"0;1\" presentation:additive=\"base\"/>\n"; + print $OUT " <anim:animate smil:begin=\"0s\" smil:dur=\"1s\" smil:fill=\"hold\" smil:targetElement=\"id$slideNum\" smil:attributeName=\"$propertyName\" smil:values=\"$propertyStart;$propertyEnd\" smil:keyTimes=\"0;1\" presentation:additive=\"base\"/>\n"; print $OUT " <anim:set smil:begin=\"0.6s\" smil:dur=\"0.001s\" smil:fill=\"hold\" smil:targetElement=\"textid$slideNum\" smil:attributeName=\"visibility\" smil:to=\"visible\"/>\n"; - print $OUT " <anim:animate smil:begin=\"0.6s\" smil:dur=\"1s\" smil:fill=\"hold\" smil:targetElement=\"textid$slideNum\" smil:attributeName=\"$propertyName\" smil:values=\"$propertyStart;$propertyEnd\" smil:keyTimes=\"0;1\" presentation:additive=\"base\"/>\n"; + print $OUT " <anim:animate smil:begin=\"0.6s\" smil:dur=\"1s\" smil:fill=\"hold\" smil:targetElement=\"textid$slideNum\" smil:attributeName=\"$propertyName\" smil:values=\"$propertyStart;$propertyEnd\" smil:keyTimes=\"0;1\" presentation:additive=\"base\"/>\n"; print $OUT " </anim:par>\n"; } @@ -284,9 +284,9 @@ sub writeManifest ############################################################################### -# Print usage information. +# Print usage information. # -sub usage () +sub usage () { print <<END_OF_USAGE; usage: $0 <option>* [<output-file-name>] @@ -300,9 +300,9 @@ END_OF_USAGE } ############################################################################### -# Process the command line. +# Process the command line. # -sub process_command_line +sub process_command_line { foreach (@ARGV) { @@ -312,11 +312,11 @@ sub process_command_line exit 0; } } - + $global_gen_all=0; $global_output_name = "alltransitions.odp"; - my $j = 0; + my $j = 0; for (my $i=0; $i<=$#ARGV; $i++) { if ($ARGV[$i] eq "-a") @@ -331,7 +331,7 @@ sub process_command_line } elsif ($#ARGV == $i ) { - $global_output_name = $ARGV[$i]; + $global_output_name = $ARGV[$i]; } } @@ -341,41 +341,41 @@ sub process_command_line $transitionsRef = [ ["barWipe", - ["leftToRight", + ["leftToRight", "topToBottom"]], ["blindsWipe", - ["vertical", + ["vertical", "horizontal"]], - + ["boxWipe", - ["topLeft", - "topRight", - "bottomRight", - "bottomLeft", - "topCenter", - "rightCenter", - "bottomCenter", - "leftCenter"]], + ["topLeft", + "topRight", + "bottomRight", + "bottomLeft", + "topCenter", + "rightCenter", + "bottomCenter", + "leftCenter"]], ["fourBoxWipe", - ["cornersIn", + ["cornersIn", "cornersOut"]], ["barnDoorWipe", - ["vertical", - "horizontal", - "diagonalBottomLeft", - "diagonalTopLeft"]], + ["vertical", + "horizontal", + "diagonalBottomLeft", + "diagonalTopLeft"]], ["bowTieWipe", - ["vertical", - "horizontal"]], - + ["vertical", + "horizontal"]], + ["miscDiagonalWipe", ["doubleBarnDoor", "doubleDiamond"]], - + ["veeWipe", ["down", "left", @@ -395,11 +395,11 @@ $transitionsRef = [ ["barnZigZagWipe", ["vertical", "horizontal"]], - + ["irisWipe", ["rectangle", "diamond"]], - + ["triangleWipe", ["up", "right", @@ -411,11 +411,11 @@ $transitionsRef = [ "right", "down", "left"]], - + ["pentagonWipe", ["up", "down"]], - + ["hexagonWipe", ["horizontal", "vertical"]], @@ -437,7 +437,7 @@ $transitionsRef = [ ["fourPoint", "fivePoint", "sixPoint"]], - + ["miscShapeWipe", ["heart", "keyhole"]], @@ -447,7 +447,7 @@ $transitionsRef = [ "clockwiseThree", "clockwiseSix", "clockwiseNine"]], - + ["pinWheelWipe", ["oneBlade", "twoBladeVertical", @@ -479,7 +479,7 @@ $transitionsRef = [ "fanOutHorizontal", "fanInVertical", "fanInHorizontal"]], - + ["doubleSweepWipe", ["parallelVertical", "parallelDiagonal", @@ -487,7 +487,7 @@ $transitionsRef = [ "oppositeHorizontal", "parallelDiagonalTopLeft", "parallelDiagonalBottomLeft"]], - + ["saloonDoorWipe", ["top", "left", @@ -507,7 +507,7 @@ $transitionsRef = [ "topRightDiagonal", "bottomRightDiagonal", "bottomLeftDiagonal"]], - + ["spiralWipe", ["topLeftClockwise", "topRightClockwise", @@ -517,7 +517,7 @@ $transitionsRef = [ "topRightCounterClockwise", "bottomRightCounterClockwise", "bottomLeftCounterClockwise"]], - + ["parallelSnakesWipe", ["verticalTopSame", "verticalBottomSame", @@ -529,7 +529,7 @@ $transitionsRef = [ "horizontalTopRightOpposite", "diagonalBottomLeftOpposite", "diagonalTopLeftOpposite"]], - + ["boxSnakesWipe", ["twoBoxTop", "twoBoxLeft", @@ -619,7 +619,7 @@ $propertiesRef = [ [ "value", "y", "y-0.1", "y+0.1" ] ]; -$transformsRef = [ +$transformsRef = [ ["translate", "0.5*width,0.5*height"], ["scale", "0.5*width,0.5*height"], ["rotate", "270"], @@ -629,12 +629,12 @@ $transformsRef = [ ############################################################################### -# Main +# Main ############################################################################### $ZipCmd = $ENV{LOG_FILE_ZIP_CMD}; $ZipFlags = $ENV{LOG_FILE_ZIP_FLAGS}; -# Provide default values for the zip command and it's flags. +# Provide default values for the zip command and it's flags. if ( ! defined $ZipCmd) { $ZipCmd = "zip" unless defined $ZipCmd; @@ -719,23 +719,23 @@ writeSlideFooter(); <anim:par smil:begin="0s" smil:fill="remove"> <anim:set smil:begin="0s" smil:dur="0.001s" smil:fill="hold" smil:targetElement="textid10001" smil:attributeName="visibility" smil:to="visible"/> - <anim:animate smil:begin="0s" smil:dur="10s" smil:fill="hold" smil:targetElement="textid10001" smil:accelerate="0.5" smil:attributeName="x" smil:by="0.3" presentation:additive="base"/> + <anim:animate smil:begin="0s" smil:dur="10s" smil:fill="hold" smil:targetElement="textid10001" smil:accelerate="0.5" smil:attributeName="x" smil:by="0.3" presentation:additive="base"/> </anim:par> <anim:par smil:begin="0s" smil:fill="remove"> <anim:set smil:begin="0s" smil:dur="0.001s" smil:fill="hold" smil:targetElement="textid10002" smil:attributeName="visibility" smil:to="visible"/> - <anim:animate smil:begin="0s" smil:dur="10s" smil:fill="hold" smil:targetElement="textid10002" smil:decelerate="0.5" smil:attributeName="x" smil:by="0.3" presentation:additive="base"/> + <anim:animate smil:begin="0s" smil:dur="10s" smil:fill="hold" smil:targetElement="textid10002" smil:decelerate="0.5" smil:attributeName="x" smil:by="0.3" presentation:additive="base"/> </anim:par> <anim:par smil:begin="0s" smil:fill="remove"> <anim:set smil:begin="0s" smil:dur="0.001s" smil:fill="hold" smil:targetElement="textid10003" smil:attributeName="visibility" smil:to="visible"/> - <anim:animate smil:begin="0s" smil:dur="3s" smil:fill="hold" smil:targetElement="textid10003" smil:attributeName="x" smil:to="0.3" presentation:additive="sum"/> - <anim:animate smil:begin="0s" smil:dur="6s" smil:fill="hold" smil:targetElement="textid10003" smil:attributeName="x" smil:to="0.3" presentation:additive="sum"/> + <anim:animate smil:begin="0s" smil:dur="3s" smil:fill="hold" smil:targetElement="textid10003" smil:attributeName="x" smil:to="0.3" presentation:additive="sum"/> + <anim:animate smil:begin="0s" smil:dur="6s" smil:fill="hold" smil:targetElement="textid10003" smil:attributeName="x" smil:to="0.3" presentation:additive="sum"/> </anim:par> <anim:par smil:begin="0s" smil:fill="remove"> <anim:set smil:begin="0s" smil:dur="0.001s" smil:fill="hold" smil:targetElement="textid10004" smil:attributeName="visibility" smil:to="visible"/> - <anim:animate smil:begin="0s" smil:dur="5s" smil:fill="hold" smil:targetElement="textid10004" smil:attributeName="y" smil:from="0.3" smil:to="0.8" smil:autoReverse="true" presentation:additive="base"/> + <anim:animate smil:begin="0s" smil:dur="5s" smil:fill="hold" smil:targetElement="textid10004" smil:attributeName="y" smil:from="0.3" smil:to="0.8" smil:autoReverse="true" presentation:additive="base"/> </anim:par> <anim:par smil:begin="0s" smil:fill="remove"> @@ -750,7 +750,7 @@ writeSlideFooter(); <anim:par smil:begin="0s" smil:fill="remove"> <anim:set smil:begin="0s" smil:dur="0.001s" smil:fill="hold" smil:targetElement="textid10007" smil:attributeName="visibility" smil:to="visible"/> - <anim:animate smil:begin="0s" smil:dur="3s" smil:fill="hold" smil:targetElement="textid10007" smil:attributeName="y" smil:values="0;1" smil:keyTimes="0;1" anim:formula="y+0.3*height*sin(5*pi*\$)" presentation:additive="base"/> + <anim:animate smil:begin="0s" smil:dur="3s" smil:fill="hold" smil:targetElement="textid10007" smil:attributeName="y" smil:values="0;1" smil:keyTimes="0;1" anim:formula="y+0.3*height*sin(5*pi*\$)" presentation:additive="base"/> </anim:par> ~; @@ -764,7 +764,7 @@ writeSlideFooter(); <draw:rect draw:style-name="gr1" draw:text-style-name="P1" draw:id="id20000" draw:layer="layout" svg:width="17.5cm" svg:height="13cm" svg:x="5cm" svg:y="4cm"> <text:p text:style-name="P2">Slide: 5</text:p> <text:p text:style-name="P2">Topic: Text effects</text:p> - <text:p text:id="textid20001" text:style-name="P2">Some text to show iterated single paragraph</text:p> + <text:p text:id="textid20001" text:style-name="P2">Some text to show iterated single paragraph</text:p> <text:p text:id="textid20002" text:style-name="P2">Some text to show iterated word-by-word effects</text:p> <text:p text:id="textid20003" text:style-name="P2">Some text to show iterated letter-by-letter effects</text:p> <text:p text:id="textid20004" text:style-name="P2">Some more text</text:p> @@ -779,7 +779,7 @@ writeSlideFooter(); <anim:par smil:begin="0s" smil:fill="remove"> <anim:iterate smil:begin="0s" smil:fill="hold" smil:targetElement="id20000" anim:iterate-type="by-paragraph" anim:iterate-interval="0.2s"> <anim:set smil:begin="0s" smil:dur="0.001s" smil:fill="hold" smil:attributeName="visibility" smil:to="visible"/> - <anim:animate smil:begin="0s" smil:dur="2s" smil:fill="hold" smil:decelerate="0.5" smil:attributeName="x" smil:from="1.0" smil:to="x" presentation:additive="base"/> + <anim:animate smil:begin="0s" smil:dur="2s" smil:fill="hold" smil:decelerate="0.5" smil:attributeName="x" smil:from="1.0" smil:to="x" presentation:additive="base"/> </anim:iterate> </anim:par> @@ -787,7 +787,7 @@ writeSlideFooter(); <anim:set smil:begin="0s" smil:dur="0.001s" smil:targetElement="id20000" smil:fill="hold" smil:attributeName="visibility" smil:to="visible"/> <anim:iterate smil:begin="0s" smil:fill="hold" smil:targetElement="textid20002" anim:iterate-type="by-word" anim:iterate-interval="0.2s"> <anim:set smil:begin="0s" smil:dur="0.001s" smil:fill="hold" smil:attributeName="visibility" smil:to="visible"/> - <anim:animate smil:begin="0s" smil:dur="2s" smil:fill="hold" smil:decelerate="0.5" smil:attributeName="x" smil:from="1.0" smil:to="x" presentation:additive="base"/> + <anim:animate smil:begin="0s" smil:dur="2s" smil:fill="hold" smil:decelerate="0.5" smil:attributeName="x" smil:from="1.0" smil:to="x" presentation:additive="base"/> </anim:iterate> </anim:par> @@ -795,7 +795,7 @@ writeSlideFooter(); <anim:set smil:begin="0s" smil:dur="0.001s" smil:targetElement="id20000" smil:fill="hold" smil:attributeName="visibility" smil:to="visible"/> <anim:iterate smil:begin="0s" smil:fill="hold" smil:targetElement="textid20003" anim:iterate-type="by-letter" anim:iterate-interval="0.2s"> <anim:set smil:begin="0s" smil:dur="0.001s" smil:fill="hold" smil:attributeName="visibility" smil:to="visible"/> - <anim:animate smil:begin="0s" smil:dur="2s" smil:fill="hold" smil:decelerate="0.5" smil:attributeName="x" smil:from="1.0" smil:to="x" presentation:additive="base"/> + <anim:animate smil:begin="0s" smil:dur="2s" smil:fill="hold" smil:decelerate="0.5" smil:attributeName="x" smil:from="1.0" smil:to="x" presentation:additive="base"/> </anim:iterate> </anim:par> ~; diff --git a/slideshow/qa/tools/mktransitions.pl b/slideshow/qa/tools/mktransitions.pl index fd14cfab334f..4ba637774798 100644 --- a/slideshow/qa/tools/mktransitions.pl +++ b/slideshow/qa/tools/mktransitions.pl @@ -1,10 +1,10 @@ : eval 'exec perl -wS $0 ${1+"$@"}' - if 0; + if 0; -use IO::File; -use Cwd; +use IO::File; +use Cwd; use File::Spec; use File::Spec::Functions; use File::Temp; @@ -18,72 +18,72 @@ $TempDir = ""; ############################################################################### -# Open a file with the given name. -# First it is checked if the temporary directory, in which all files for -# the document are gathered, is already present and create it if it is not. -# Then create the path to the file inside the temporary directory. -# Finally open the file and return a file handle to it. +# Open a file with the given name. +# First it is checked if the temporary directory, in which all files for +# the document are gathered, is already present and create it if it is not. +# Then create the path to the file inside the temporary directory. +# Finally open the file and return a file handle to it. # -sub open_file +sub open_file { - my $filename = pop @_; - - # Create base directory of temporary directory tree if not alreay - # present. + my $filename = pop @_; + + # Create base directory of temporary directory tree if not alreay + # present. if ($TempDir eq "") { $TempDir = File::Temp::tempdir (CLEANUP => 1); } - - # Create the path to the file. + + # Create the path to the file. my $fullname = File::Spec->catfile ($TempDir, $filename); my ($volume,$directories,$file) = File::Spec->splitpath ($fullname); mkpath (File::Spec->catpath ($volume,$directories,"")); - - # Open the file and return a file handle to it. + + # Open the file and return a file handle to it. return new IO::File ($fullname, "w"); } ############################################################################### -# Zip the files in the directory tree into the given file. +# Zip the files in the directory tree into the given file. # -sub zip_dirtree +sub zip_dirtree { - my $filename = pop @_; - - my $cwd = getcwd; - my $zip_name = $filename; - - # We are about to change the directory. - # Therefore create an absolute pathname for the zip archive. - - # First transfer the drive from $cwd to $zip_name. This is a - # workaround for a bug in file_name_is_absolute which thinks - # the the path \bla is an absolute path under DOS. + my $filename = pop @_; + + my $cwd = getcwd; + my $zip_name = $filename; + + # We are about to change the directory. + # Therefore create an absolute pathname for the zip archive. + + # First transfer the drive from $cwd to $zip_name. This is a + # workaround for a bug in file_name_is_absolute which thinks + # the the path \bla is an absolute path under DOS. my ($volume,$directories,$file) = File::Spec->splitpath ($zip_name); my ($volume_cwd,$directories_cwd,$file_cwd) = File::Spec->splitpath ($cwd); $volume = $volume_cwd if ($volume eq ""); $zip_name = File::Spec->catpath ($volume,$directories,$file); - - # Add the current working directory to a relative path. + + # Add the current working directory to a relative path. if ( ! file_name_is_absolute ($zip_name)) { $zip_name = File::Spec->catfile ($cwd, $zip_name); - - # Try everything to clean up the name. + + # Try everything to clean up the name. $zip_name = File::Spec->rel2abs ($filename); $zip_name = File::Spec->canonpath ($zip_name); - - # Remove .. directories from the middle of the path. + + # Remove .. directories from the middle of the path. while ($zip_name =~ /\/[^\/][^\.\/][^\/]*\/\.\.\//) { $zip_name = $` . "/" . $'; } } - # Just in case the zip program gets confused by an existing file with the - # same name as the one to be written that file is removed first. + # Just in case the zip program gets confused by an existing file with the + # same name as the one to be written that file is removed first. if ( -e $filename) { if (unlink ($filename) == 0) @@ -93,14 +93,14 @@ sub zip_dirtree return; } } - - # Finally create the zip file. First change into the temporary directory - # so that the resulting zip file contains only paths relative to it. + + # Finally create the zip file. First change into the temporary directory + # so that the resulting zip file contains only paths relative to it. print "zipping [$ZipCmd $ZipFlags $zip_name *]\n"; chdir ($TempDir); system ("$ZipCmd $ZipFlags $zip_name *"); chdir ($cwd); - + } @@ -279,41 +279,41 @@ sub writeManifest $transitionsRef = [ ["barWipe", - ["leftToRight", + ["leftToRight", "topToBottom"]], ["blindsWipe", - ["vertical", + ["vertical", "horizontal"]], - + ["boxWipe", - ["topLeft", - "topRight", - "bottomRight", - "bottomLeft", - "topCenter", - "rightCenter", - "bottomCenter", - "leftCenter"]], + ["topLeft", + "topRight", + "bottomRight", + "bottomLeft", + "topCenter", + "rightCenter", + "bottomCenter", + "leftCenter"]], ["fourBoxWipe", - ["cornersIn", + ["cornersIn", "cornersOut"]], ["barnDoorWipe", - ["vertical", - "horizontal", - "diagonalBottomLeft", - "diagonalTopLeft"]], + ["vertical", + "horizontal", + "diagonalBottomLeft", + "diagonalTopLeft"]], ["bowTieWipe", - ["vertical", - "horizontal"]], - + ["vertical", + "horizontal"]], + ["miscDiagonalWipe", ["doubleBarnDoor", "doubleDiamond"]], - + ["veeWipe", ["down", "left", @@ -333,11 +333,11 @@ $transitionsRef = [ ["barnZigZagWipe", ["vertical", "horizontal"]], - + ["irisWipe", ["rectangle", "diamond"]], - + ["triangleWipe", ["up", "right", @@ -349,11 +349,11 @@ $transitionsRef = [ "right", "down", "left"]], - + ["pentagonWipe", ["up", "down"]], - + ["hexagonWipe", ["horizontal", "vertical"]], @@ -375,7 +375,7 @@ $transitionsRef = [ ["fourPoint", "fivePoint", "sixPoint"]], - + ["miscShapeWipe", ["heart", "keyhole"]], @@ -385,7 +385,7 @@ $transitionsRef = [ "clockwiseThree", "clockwiseSix", "clockwiseNine"]], - + ["pinWheelWipe", ["oneBlade", "twoBladeVertical", @@ -417,7 +417,7 @@ $transitionsRef = [ "fanOutHorizontal", "fanInVertical", "fanInHorizontal"]], - + ["doubleSweepWipe", ["parallelVertical", "parallelDiagonal", @@ -425,7 +425,7 @@ $transitionsRef = [ "oppositeHorizontal", "parallelDiagonalTopLeft", "parallelDiagonalBottomLeft"]], - + ["saloonDoorWipe", ["top", "left", @@ -445,7 +445,7 @@ $transitionsRef = [ "topRightDiagonal", "bottomRightDiagonal", "bottomLeftDiagonal"]], - + ["spiralWipe", ["topLeftClockwise", "topRightClockwise", @@ -455,7 +455,7 @@ $transitionsRef = [ "topRightCounterClockwise", "bottomRightCounterClockwise", "bottomLeftCounterClockwise"]], - + ["parallelSnakesWipe", ["verticalTopSame", "verticalBottomSame", @@ -467,7 +467,7 @@ $transitionsRef = [ "horizontalTopRightOpposite", "diagonalBottomLeftOpposite", "diagonalTopLeftOpposite"]], - + ["boxSnakesWipe", ["twoBoxTop", "twoBoxLeft", @@ -523,9 +523,9 @@ $transitionsRef = [ ############################################################################### -# Print usage information. +# Print usage information. # -sub usage () +sub usage () { print <<END_OF_USAGE; usage: $0 <option>* [<output-file-name>] @@ -539,9 +539,9 @@ END_OF_USAGE } ############################################################################### -# Process the command line. +# Process the command line. # -sub process_command_line +sub process_command_line { foreach (@ARGV) { @@ -551,11 +551,11 @@ sub process_command_line exit 0; } } - + $global_gen_all=0; $global_output_name = "alltransitions.odp"; - my $j = 0; + my $j = 0; for (my $i=0; $i<=$#ARGV; $i++) { if ($ARGV[$i] eq "-a") @@ -570,7 +570,7 @@ sub process_command_line } elsif ($#ARGV == $i ) { - $global_output_name = $ARGV[$i]; + $global_output_name = $ARGV[$i]; } } @@ -579,12 +579,12 @@ sub process_command_line ############################################################################### -# Main +# Main ############################################################################### $ZipCmd = $ENV{LOG_FILE_ZIP_CMD}; $ZipFlags = $ENV{LOG_FILE_ZIP_FLAGS}; -# Provide default values for the zip command and it's flags. +# Provide default values for the zip command and it's flags. if ( ! defined $ZipCmd) { $ZipCmd = "zip" unless defined $ZipCmd; diff --git a/slideshow/source/engine/OGLTrans/OGLTrans_Shaders.cxx b/slideshow/source/engine/OGLTrans/OGLTrans_Shaders.cxx index 8c47f2f730b3..0ca2d291a2e4 100644 --- a/slideshow/source/engine/OGLTrans/OGLTrans_Shaders.cxx +++ b/slideshow/source/engine/OGLTrans/OGLTrans_Shaders.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/OGLTrans/OGLTrans_Shaders.hxx b/slideshow/source/engine/OGLTrans/OGLTrans_Shaders.hxx index 67afb397f58e..1586e9ef7e0c 100644 --- a/slideshow/source/engine/OGLTrans/OGLTrans_Shaders.hxx +++ b/slideshow/source/engine/OGLTrans/OGLTrans_Shaders.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ class OGLShaders { static bool Initialize(); static bool cbInitialized; -public: +public: static GLuint LinkProgram( const char *vertexShader, const char *fragmentShader ); diff --git a/slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx index 082aea75c537..722920d99a32 100644 --- a/slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx +++ b/slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -285,7 +285,7 @@ void Iris::display(double nTime, double SlideWidth, double SlideHeight, double D void Iris::prepare() { static GLubyte img[3] = { 80, 80, 80 }; - + glGenTextures(1, &maTexture); glBindTexture(GL_TEXTURE_2D, maTexture); glTexImage2D(GL_TEXTURE_2D, 0, 3, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, img); @@ -304,7 +304,7 @@ void OGLTransitionImpl::makeOutsideCubeFaceToLeft() { clear(); Primitive Slide; - + Slide.pushTriangle(basegfx::B2DVector(0,0),basegfx::B2DVector(1,0),basegfx::B2DVector(0,1)); Slide.pushTriangle(basegfx::B2DVector(1,0),basegfx::B2DVector(0,1),basegfx::B2DVector(1,1)); @@ -321,7 +321,7 @@ void OGLTransitionImpl::makeInsideCubeFaceToLeft() { clear(); Primitive Slide; - + Slide.pushTriangle(basegfx::B2DVector(0,0),basegfx::B2DVector(1,0),basegfx::B2DVector(0,1)); Slide.pushTriangle(basegfx::B2DVector(1,0),basegfx::B2DVector(0,1),basegfx::B2DVector(1,1)); @@ -330,7 +330,7 @@ void OGLTransitionImpl::makeInsideCubeFaceToLeft() Slide.Operations.push_back(new RotateAndScaleDepthByWidth(basegfx::B3DVector(0,1,0),basegfx::B3DVector(0,0,1),-90,false,0.0,1.0)); maEnteringSlidePrimitives.push_back(Slide); - + OverallOperations.push_back(new RotateAndScaleDepthByWidth(basegfx::B3DVector(0,1,0),basegfx::B3DVector(0,0,1),90,true,0.0,1.0)); } @@ -338,7 +338,7 @@ void OGLTransitionImpl::makeFallLeaving() { clear(); Primitive Slide; - + Slide.pushTriangle(basegfx::B2DVector(0,0),basegfx::B2DVector(1,0),basegfx::B2DVector(0,1)); Slide.pushTriangle(basegfx::B2DVector(1,0),basegfx::B2DVector(0,1),basegfx::B2DVector(1,1)); maEnteringSlidePrimitives.push_back(Slide); @@ -355,7 +355,7 @@ void OGLTransitionImpl::makeTurnAround() Primitive Slide; mbReflectSlides = true; - + Slide.pushTriangle(basegfx::B2DVector(0,0),basegfx::B2DVector(1,0),basegfx::B2DVector(0,1)); Slide.pushTriangle(basegfx::B2DVector(1,0),basegfx::B2DVector(0,1),basegfx::B2DVector(1,1)); maLeavingSlidePrimitives.push_back(Slide); @@ -372,7 +372,7 @@ void OGLTransitionImpl::makeTurnDown() { clear(); Primitive Slide; - + Slide.pushTriangle(basegfx::B2DVector(0,0),basegfx::B2DVector(1,0),basegfx::B2DVector(0,1)); Slide.pushTriangle(basegfx::B2DVector(1,0),basegfx::B2DVector(0,1),basegfx::B2DVector(1,1)); maLeavingSlidePrimitives.push_back(Slide); @@ -389,7 +389,7 @@ void OGLTransitionImpl::makeIris() { clear(); Primitive Slide; - + Slide.pushTriangle (basegfx::B2DVector (0,0), basegfx::B2DVector (1,0), basegfx::B2DVector (0,1)); Slide.pushTriangle (basegfx::B2DVector (1,0), basegfx::B2DVector (0,1), basegfx::B2DVector (1,1)); maEnteringSlidePrimitives.push_back (Slide); @@ -472,7 +472,7 @@ void OGLTransitionImpl::makeRochade() { clear(); Primitive Slide; - + mbReflectSlides = true; mmDisplaySlides = &OGLTransitionImpl::displaySlidesRochade; @@ -554,7 +554,7 @@ void OGLTransitionImpl::makeRevolvingCircles( ::sal_uInt16 nCircles , ::sal_uInt TempAngle += dAngle; } - + { //double angle(0.0); Primitive EnteringSlide; @@ -566,46 +566,46 @@ void OGLTransitionImpl::makeRevolvingCircles( ::sal_uInt16 nCircles , ::sal_uInt } EnteringSlide.pushTriangle( basegfx::B2DVector(0.5,0.5) , Radius * unScaledTexCoords[ 0 ] / 2.0 + basegfx::B2DVector( 0.5 , 0.5 ) , Radius * unScaledTexCoords[ nPointsOnCircles - 1 ] / 2.0 + basegfx::B2DVector( 0.5 , 0.5 ) ); LeavingSlide.pushTriangle( basegfx::B2DVector(0.5,0.5) , Radius*unScaledTexCoords[0]/2.0 + basegfx::B2DVector(0.5,0.5) , Radius*unScaledTexCoords[nPointsOnCircles - 1]/2.0 + basegfx::B2DVector(0.5,0.5) ); - + basegfx::B3DVector axis(randNormVectorInXYPlane()); EnteringSlide.Operations.push_back( new SRotate( axis , basegfx::B3DVector(0,0,0) , 180, true, Radius/2.0 , (NextRadius + 1)/2.0 ) ); LeavingSlide.Operations.push_back( new SRotate( axis , basegfx::B3DVector(0,0,0) , 180, true, Radius/2.0 , (NextRadius + 1)/2.0 ) ); EnteringSlide.Operations.push_back( new SRotate( axis , basegfx::B3DVector(0,0,0) , -180, false,0.0,1.0) ); - + maEnteringSlidePrimitives.push_back(EnteringSlide); maLeavingSlidePrimitives.push_back(LeavingSlide); LastRadius = Radius; Radius = NextRadius; NextRadius += dRadius; - } - + } + for(int i(1); i < nCircles - 1; ++i) { Primitive LeavingSlide; Primitive EnteringSlide; for(int Side(0); Side < nPointsOnCircles - 1; ++Side) - { + { EnteringSlide.pushTriangle(Radius*unScaledTexCoords[Side]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side + 1]/2.0 + basegfx::B2DVector(0.5,0.5) ); EnteringSlide.pushTriangle(Radius*unScaledTexCoords[Side]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side + 1]/2.0 + basegfx::B2DVector(0.5,0.5) , Radius*unScaledTexCoords[Side + 1]/2.0 + basegfx::B2DVector(0.5,0.5) ); - + LeavingSlide.pushTriangle(Radius*unScaledTexCoords[Side]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side + 1]/2.0 + basegfx::B2DVector(0.5,0.5) ); LeavingSlide.pushTriangle(Radius*unScaledTexCoords[Side]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side + 1]/2.0 + basegfx::B2DVector(0.5,0.5) , Radius*unScaledTexCoords[Side + 1]/2.0 + basegfx::B2DVector(0.5,0.5) ); } - + EnteringSlide.pushTriangle(Radius*unScaledTexCoords[nPointsOnCircles - 1]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[nPointsOnCircles - 1]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[0]/2.0 + basegfx::B2DVector(0.5,0.5) ); EnteringSlide.pushTriangle(Radius*unScaledTexCoords[nPointsOnCircles - 1]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[0]/2.0 + basegfx::B2DVector(0.5,0.5) , Radius*unScaledTexCoords[0]/2.0 + basegfx::B2DVector(0.5,0.5) ); - + LeavingSlide.pushTriangle(Radius*unScaledTexCoords[nPointsOnCircles - 1]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[nPointsOnCircles - 1]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[0]/2.0 + basegfx::B2DVector(0.5,0.5) ); LeavingSlide.pushTriangle(Radius*unScaledTexCoords[nPointsOnCircles - 1]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[0]/2.0 + basegfx::B2DVector(0.5,0.5) , Radius*unScaledTexCoords[0]/2.0 + basegfx::B2DVector(0.5,0.5) ); - + basegfx::B3DVector axis(randNormVectorInXYPlane()); EnteringSlide.Operations.push_back( new SRotate( axis , basegfx::B3DVector(0,0,0) , 180, true, Radius/2.0 , (NextRadius + 1)/2.0 ) ); LeavingSlide.Operations.push_back( new SRotate( axis , basegfx::B3DVector(0,0,0) , 180, true, Radius/2.0 , (NextRadius + 1)/2.0 ) ); EnteringSlide.Operations.push_back( new SRotate( axis , basegfx::B3DVector(0,0,0) , -180, false,0.0,1.0) ); - + maEnteringSlidePrimitives.push_back(EnteringSlide); maLeavingSlidePrimitives.push_back(LeavingSlide); - + LastRadius = Radius; Radius = NextRadius; NextRadius += dRadius; @@ -616,25 +616,25 @@ void OGLTransitionImpl::makeRevolvingCircles( ::sal_uInt16 nCircles , ::sal_uInt Primitive EnteringSlide; for(int Side(0); Side < nPointsOnCircles - 1; ++Side) { - + EnteringSlide.pushTriangle(clamp(Radius*unScaledTexCoords[Side])/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side + 1]/2.0 + basegfx::B2DVector(0.5,0.5) ); EnteringSlide.pushTriangle(clamp(Radius*unScaledTexCoords[Side])/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side + 1]/2.0 + basegfx::B2DVector(0.5,0.5) , clamp(Radius*unScaledTexCoords[Side + 1])/2.0 + basegfx::B2DVector(0.5,0.5) ); - + LeavingSlide.pushTriangle(clamp(Radius*unScaledTexCoords[Side])/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side + 1]/2.0 + basegfx::B2DVector(0.5,0.5) ); LeavingSlide.pushTriangle(clamp(Radius*unScaledTexCoords[Side])/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side + 1]/2.0 + basegfx::B2DVector(0.5,0.5) , clamp(Radius*unScaledTexCoords[Side + 1])/2.0 + basegfx::B2DVector(0.5,0.5) ); } - + EnteringSlide.pushTriangle(clamp(Radius*unScaledTexCoords[nPointsOnCircles - 1])/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[nPointsOnCircles - 1]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[0]/2.0 + basegfx::B2DVector(0.5,0.5) ); EnteringSlide.pushTriangle(clamp(Radius*unScaledTexCoords[nPointsOnCircles - 1])/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[0]/2.0 + basegfx::B2DVector(0.5,0.5) , clamp(Radius*unScaledTexCoords[0])/2.0 + basegfx::B2DVector(0.5,0.5) ); - + LeavingSlide.pushTriangle(clamp(Radius*unScaledTexCoords[nPointsOnCircles - 1])/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[nPointsOnCircles - 1]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[0]/2.0 + basegfx::B2DVector(0.5,0.5) ); LeavingSlide.pushTriangle(clamp(Radius*unScaledTexCoords[nPointsOnCircles - 1])/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[0]/2.0 + basegfx::B2DVector(0.5,0.5) , clamp(Radius*unScaledTexCoords[0])/2.0 + basegfx::B2DVector(0.5,0.5) ); - + basegfx::B3DVector axis(randNormVectorInXYPlane()); EnteringSlide.Operations.push_back( new SRotate( axis , basegfx::B3DVector(0,0,0) , 180, true, (LastRadius + dRadius)/2.0 , 1.0 ) ); LeavingSlide.Operations.push_back( new SRotate( axis , basegfx::B3DVector(0,0,0) , 180, true, (LastRadius + dRadius)/2.0 , 1.0 ) ); EnteringSlide.Operations.push_back( new SRotate( axis , basegfx::B3DVector(0,0,0) , -180, false,0.0,1.0) ); - + maEnteringSlidePrimitives.push_back(EnteringSlide); maLeavingSlidePrimitives.push_back(LeavingSlide); } @@ -649,21 +649,21 @@ void OGLTransitionImpl::makeHelix( ::sal_uInt16 nRows ) for(unsigned int i(0); i < nRows; ++i) { Primitive Tile; - + Tile.pushTriangle(basegfx::B2DVector( 1.0 , iDn ) , basegfx::B2DVector( 0.0 , iDn ) , basegfx::B2DVector( 0.0 , iPDn )); - + Tile.pushTriangle(basegfx::B2DVector( 1.0 , iPDn ) , basegfx::B2DVector( 1.0 , iDn ) , basegfx::B2DVector( 0.0 , iPDn )); - - Tile.Operations.push_back( new SRotate( basegfx::B3DVector( 0 , 1 , 0 ) , ( Tile.getVertices()[1] + Tile.getVertices()[3] )/2.0 , 180 , + + Tile.Operations.push_back( new SRotate( basegfx::B3DVector( 0 , 1 , 0 ) , ( Tile.getVertices()[1] + Tile.getVertices()[3] )/2.0 , 180 , true,min(max(static_cast<double>(i - nRows/2.0)*invN/2.0,0.0),1.0), min(max(static_cast<double>(i + nRows/2.0)*invN/2.0,0.0),1.0) ) ); - + maLeavingSlidePrimitives.push_back(Tile); - + Tile.Operations.push_back( new SRotate( basegfx::B3DVector( 0 , 1 , 0 ) , ( Tile.getVertices()[1] + Tile.getVertices()[3] )/2.0 , -180 , false,0.0,1.0) ); - + maEnteringSlidePrimitives.push_back(Tile); - + iDn += invN; iPDn += invN; } @@ -686,7 +686,7 @@ void OGLTransitionImpl::makeNByMTileFlip( ::sal_uInt16 n, ::sal_uInt16 m ) Tile.pushTriangle(basegfx::B2DVector( iPDn , jDm ) , basegfx::B2DVector( iDn , jDm ) , basegfx::B2DVector( iDn , jPDm )); - Tile.pushTriangle(basegfx::B2DVector( iPDn , jPDm ) , basegfx::B2DVector( iPDn , jDm ) , basegfx::B2DVector( iDn , jPDm ));//bottom left corner of tile + Tile.pushTriangle(basegfx::B2DVector( iPDn , jPDm ) , basegfx::B2DVector( iPDn , jDm ) , basegfx::B2DVector( iDn , jPDm ));//bottom left corner of tile Tile.Operations.push_back( new SRotate( basegfx::B3DVector( 1 , 1 , 0 ) , ( Tile.getVertices()[1] + Tile.getVertices()[3] )/2.0 , 180 , true, iDn*jDm/2.0 , ((iPDn*jPDm)+1.0)/2.0 ) ); maLeavingSlidePrimitives.push_back(Tile); @@ -869,10 +869,10 @@ const Primitive& Primitive::operator=(const Primitive& rvalue) for(unsigned int i( 0 ); i < rvalue.TexCoords.size(); ++i)//SPEED! use copy or something. this is slow. TexCoords.push_back(rvalue.TexCoords[i]); for(unsigned int i( 0 ); i < rvalue.Normals.size(); ++i)//SPEED! use copy or something. this is slow. - Normals.push_back(rvalue.Normals[i]); - return *this; + Normals.push_back(rvalue.Normals[i]); + return *this; } - + Primitive::Primitive(const Primitive& rvalue) { for(unsigned int i( 0 ); i < rvalue.Operations.size(); ++i) @@ -922,7 +922,7 @@ void Primitive::pushTriangle(const basegfx::B2DVector& SlideLocation0,const base TexCoords.push_back(Texs[0]); TexCoords.push_back(Texs[1]); TexCoords.push_back(Texs[2]); - + Normals.push_back(basegfx::B3DVector(0,0,1));//all normals always face the screen when untransformed. Normals.push_back(basegfx::B3DVector(0,0,1));//all normals always face the screen when untransformed. Normals.push_back(basegfx::B3DVector(0,0,1));//all normals always face the screen when untransformed. @@ -942,7 +942,7 @@ void OGLTransitionImpl::prepareDiamond( double nTime, double /* SlideWidth */, d Slide1.pushTriangle (basegfx::B2DVector (1,0), basegfx::B2DVector (0,1), basegfx::B2DVector (1,1)); maEnteringSlidePrimitives.push_back (Slide1); - + if( nTime >= 0.5 ) { double m = 1 - nTime; @@ -1021,7 +1021,7 @@ void OGLTransitionImpl::displaySlidesFadeSmoothly( double nTime, ::sal_Int32 glL } void OGLTransitionImpl::makeFadeSmoothly() -{ +{ Primitive Slide; Slide.pushTriangle (basegfx::B2DVector (0,0), basegfx::B2DVector (1,0), basegfx::B2DVector (0,1)); @@ -1058,7 +1058,7 @@ void OGLTransitionImpl::displaySlidesFadeThroughBlack( double nTime, ::sal_Int32 } void OGLTransitionImpl::makeFadeThroughBlack() -{ +{ Primitive Slide; Slide.pushTriangle (basegfx::B2DVector (0,0), basegfx::B2DVector (1,0), basegfx::B2DVector (0,1)); @@ -1139,37 +1139,37 @@ void main() {\n\ "; int permutation256 [256]= { -215, 100, 200, 204, 233, 50, 85, 196, - 71, 141, 122, 160, 93, 131, 243, 234, -162, 183, 36, 155, 4, 62, 35, 205, - 40, 102, 33, 27, 255, 55, 214, 156, - 75, 163, 134, 126, 249, 74, 197, 228, - 72, 90, 206, 235, 17, 22, 49, 169, -227, 89, 16, 5, 117, 60, 248, 230, -217, 68, 138, 96, 194, 170, 136, 10, -112, 238, 184, 189, 176, 42, 225, 212, - 84, 58, 175, 244, 150, 168, 219, 236, -101, 208, 123, 37, 164, 110, 158, 201, - 78, 114, 57, 48, 70, 142, 106, 43, -232, 26, 32, 252, 239, 98, 191, 94, - 59, 149, 39, 187, 203, 190, 19, 13, -133, 45, 61, 247, 23, 34, 20, 52, -118, 209, 146, 193, 222, 18, 1, 152, - 46, 41, 91, 148, 115, 25, 135, 77, -254, 147, 224, 161, 9, 213, 223, 250, -231, 251, 127, 166, 63, 179, 81, 130, -139, 28, 120, 151, 241, 86, 111, 0, - 88, 153, 172, 182, 159, 105, 178, 47, - 51, 167, 65, 66, 92, 73, 198, 211, -245, 195, 31, 220, 140, 76, 221, 186, -154, 185, 56, 83, 38, 165, 109, 67, -124, 226, 132, 53, 229, 29, 12, 181, -121, 24, 207, 199, 177, 113, 30, 80, - 3, 97, 188, 79, 216, 173, 8, 145, - 87, 128, 180, 237, 240, 137, 125, 104, - 15, 242, 119, 246, 103, 143, 95, 144, - 2, 44, 69, 157, 192, 174, 14, 54, -218, 82, 64, 210, 11, 6, 129, 21, +215, 100, 200, 204, 233, 50, 85, 196, + 71, 141, 122, 160, 93, 131, 243, 234, +162, 183, 36, 155, 4, 62, 35, 205, + 40, 102, 33, 27, 255, 55, 214, 156, + 75, 163, 134, 126, 249, 74, 197, 228, + 72, 90, 206, 235, 17, 22, 49, 169, +227, 89, 16, 5, 117, 60, 248, 230, +217, 68, 138, 96, 194, 170, 136, 10, +112, 238, 184, 189, 176, 42, 225, 212, + 84, 58, 175, 244, 150, 168, 219, 236, +101, 208, 123, 37, 164, 110, 158, 201, + 78, 114, 57, 48, 70, 142, 106, 43, +232, 26, 32, 252, 239, 98, 191, 94, + 59, 149, 39, 187, 203, 190, 19, 13, +133, 45, 61, 247, 23, 34, 20, 52, +118, 209, 146, 193, 222, 18, 1, 152, + 46, 41, 91, 148, 115, 25, 135, 77, +254, 147, 224, 161, 9, 213, 223, 250, +231, 251, 127, 166, 63, 179, 81, 130, +139, 28, 120, 151, 241, 86, 111, 0, + 88, 153, 172, 182, 159, 105, 178, 47, + 51, 167, 65, 66, 92, 73, 198, 211, +245, 195, 31, 220, 140, 76, 221, 186, +154, 185, 56, 83, 38, 165, 109, 67, +124, 226, 132, 53, 229, 29, 12, 181, +121, 24, 207, 199, 177, 113, 30, 80, + 3, 97, 188, 79, 216, 173, 8, 145, + 87, 128, 180, 237, 240, 137, 125, 104, + 15, 242, 119, 246, 103, 143, 95, 144, + 2, 44, 69, 157, 192, 174, 14, 54, +218, 82, 64, 210, 11, 6, 129, 21, 116, 171, 99, 202, 7, 107, 253, 108 }; @@ -1294,7 +1294,7 @@ void OGLTransitionImpl::makeDissolve() void OGLTransitionImpl::makeNewsflash() { Primitive Slide; - + Slide.pushTriangle(basegfx::B2DVector(0,0),basegfx::B2DVector(1,0),basegfx::B2DVector(0,1)); Slide.pushTriangle(basegfx::B2DVector(1,0),basegfx::B2DVector(0,1),basegfx::B2DVector(1,1)); Slide.Operations.push_back(new SRotate(basegfx::B3DVector(0,0,1),basegfx::B3DVector(0,0,0),3000,true,0,0.5)); diff --git a/slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx index fde24e1e2699..f0e95f5b7b00 100644 --- a/slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx +++ b/slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,13 +33,13 @@ #include <tools/prewin.h> #include <tools/postwin.h> -#if defined( WNT ) +#if defined( WNT ) #include <tools/prewin.h> #include <tools/postwin.h> #elif defined( OS2 ) #elif defined( QUARTZ ) #elif defined( UNX ) -#endif +#endif #include <vector> #include <GL/gl.h> @@ -77,7 +77,7 @@ public: {} ~OGLTransitionImpl(); - + void prepare( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex ); void display( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight ); void finish(); @@ -116,15 +116,15 @@ private: /** clears all the primitives and operations */ void clear(); - + /** All the primitives that use the leaving slide texture */ vector<Primitive> maLeavingSlidePrimitives; - + /** All the primitives that use the leaving slide texture */ vector<Primitive> maEnteringSlidePrimitives; - + /** All the surrounding scene objects */ vector<SceneObject*> maSceneObjects; @@ -213,7 +213,7 @@ private: GLuint maTexture; }; -/** This class is a list of Triangles that will share Operations, and could possibly share +/** This class is a list of Triangles that will share Operations, and could possibly share */ class Primitive { @@ -226,61 +226,61 @@ public: void applyOperations(double nTime, double SlideWidthScale, double SlideHeightScale); void display(double nTime, double SlideWidthScale, double SlideHeightScale); const Primitive& operator=(const Primitive& rvalue); - + /** PushBack a vertex,normal, and tex coord. Each SlideLocation is where on the slide is mapped to this location ( from (0,0) to (1,1) ). This will make sure the correct aspect ratio is used, and helps to make slides begin and end at the correct position. (0,0) is the top left of the slide, and (1,1) is the bottom right. - + @param SlideLocation0 Location of first Vertex on slide - + @param SlideLocation1 Location of second Vertex on slide - + @param SlideLocation2 Location of third Vertex on slide - + */ void pushTriangle(const basegfx::B2DVector& SlideLocation0,const basegfx::B2DVector& SlideLocation1,const basegfx::B2DVector& SlideLocation2); - + /** clear all the vertices, normals, tex coordinates, and normals */ void clearTriangles(); - + /** guards against directly changing the vertices - - @return + + @return the list of vertices */ const vector<basegfx::B3DVector>& getVertices() const {return Vertices;} - + /** guards against directly changing the vertices */ const vector<basegfx::B3DVector>& getNormals() const {return Normals;} - + /** guards against directly changing the vertices - - @return + + @return the list of Texture Coordinates - + */ const vector<basegfx::B2DVector>& getTexCoords() const {return TexCoords;} /** list of Operations to be performed on this primitive.These operations will be called in the order they were pushed back in. In OpenGL this effectively uses the operations in the opposite order they were pushed back. - - @return + + @return the list of Operations - - */ + + */ vector<Operation*> Operations; private: /** list of vertices */ vector<basegfx::B3DVector> Vertices; - + /** list of Normals */ vector<basegfx::B3DVector> Normals; - + /** list of Texture Coordinates */ vector<basegfx::B2DVector> TexCoords; @@ -293,33 +293,33 @@ class Operation public: Operation(){} virtual ~Operation(){} - - /** Should this operation be interpolated . If TRUE, the transform will smoothly move from making no difference from t = 0.0 to nT0 to being completely transformed from t = nT1 to 1. If FALSE, the transform will be inneffectual from t = 0 to nT0, and completely transformed from t = nT0 to 1. + + /** Should this operation be interpolated . If TRUE, the transform will smoothly move from making no difference from t = 0.0 to nT0 to being completely transformed from t = nT1 to 1. If FALSE, the transform will be inneffectual from t = 0 to nT0, and completely transformed from t = nT0 to 1. */ bool bInterpolate; - + /** time to begin the transformation */ double nT0; - + /** time to finish the transformation */ double nT1; public: /** this is the function that is called to give the Operation to OpenGL. - + @param t time from t = 0 to t = 1 - + @param SlideWidthScale width of slide divided by width of window - + @param SlideHeightScale height of slide divided by height of window - + */ virtual void interpolate(double t,double SlideWidthScale,double SlideHeightScale) = 0; - + /** return a copy of this operation */ virtual Operation* clone() = 0; @@ -332,27 +332,27 @@ class SRotate: public Operation public: void interpolate(double t,double SlideWidthScale,double SlideHeightScale); virtual SRotate* clone(); - + /** Constructor - + @param Axis axis to rotate about - + @param Origin position that rotation axis runs through - + @param Angle angle in radians of CCW rotation - + @param bInter see Operation - + @param T0 transformation starting time - + @param T1 transformation ending time - + */ SRotate(const basegfx::B3DVector& Axis,const basegfx::B3DVector& Origin,double Angle,bool bInter, double T0, double T1); ~SRotate(){} @@ -360,11 +360,11 @@ private: /** axis to rotate CCW about */ basegfx::B3DVector axis; - + /** position that rotation axis runs through */ basegfx::B3DVector origin; - + /** angle in radians of CCW rotation */ double angle; @@ -377,24 +377,24 @@ class SScale: public Operation public: void interpolate(double t,double SlideWidthScale,double SlideHeightScale); SScale* clone(); - + /** Constructor - + @param Scale - amount to scale by - + amount to scale by + @param Origin position that rotation axis runs through - + @param bInter see Operation - + @param T0 transformation starting time - + @param T1 transformation ending time - + */ SScale(const basegfx::B3DVector& Scale, const basegfx::B3DVector& Origin,bool bInter, double T0, double T1); ~SScale(){} @@ -410,21 +410,21 @@ class STranslate: public Operation public: void interpolate(double t,double SlideWidthScale,double SlideHeightScale); STranslate* clone(); - + /** Constructor - + @param Vector vector to translate - + @param bInter see Operation - + @param T0 transformation starting time - + @param T1 transformation ending time - + */ STranslate(const basegfx::B3DVector& Vector,bool bInter, double T0, double T1); ~STranslate(){} @@ -441,21 +441,21 @@ class SEllipseTranslate: public Operation public: void interpolate(double t,double SlideWidthScale,double SlideHeightScale); SEllipseTranslate* clone(); - + /** Constructor - + @param Vector vector to translate - + @param bInter see Operation - + @param T0 transformation starting time - + @param T1 transformation ending time - + */ SEllipseTranslate(double dWidth, double dHeight, double dStartPosition, double dEndPosition, bool bInter, double T0, double T1); ~SEllipseTranslate(){} diff --git a/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx index 0d650b3b8f29..7d5e1c78c730 100644 --- a/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ #include <GL/glu.h> -#if defined( WNT ) +#if defined( WNT ) #include <tools/prewin.h> #include <windows.h> #include <tools/postwin.h> @@ -115,7 +115,7 @@ namespace GLenum eType; }; - /* channel ordering: (0:rgba, 1:bgra, 2:argb, 3:abgr) + /* channel ordering: (0:rgba, 1:bgra, 2:argb, 3:abgr) */ int calcComponentOrderIndex(const uno::Sequence<sal_Int8>& rTags) { @@ -126,7 +126,7 @@ namespace RGB_RED, RGB_GREEN, RGB_BLUE, ALPHA, RGB_BLUE, RGB_GREEN, RGB_RED, ALPHA, ALPHA, RGB_RED, RGB_GREEN, RGB_BLUE, - ALPHA, RGB_BLUE, RGB_GREEN, RGB_RED, + ALPHA, RGB_BLUE, RGB_GREEN, RGB_RED, }; const sal_Int32 nNumComps(rTags.getLength()); @@ -176,14 +176,14 @@ public: const Reference< rendering::XBitmap >& rLeavingBitmap, const Reference< rendering::XBitmap >& rEnteringBitmap ) throw (uno::RuntimeException); - + protected: void disposeContextAndWindow(); void disposeTextures(); // WeakComponentImplHelperBase virtual void SAL_CALL disposing(); - + bool isDisposed() const { return (rBHelper.bDisposed || rBHelper.bInDispose); @@ -201,7 +201,7 @@ protected: void prepareEnvironment (); const OGLFormat* chooseFormats(); -private: +private: /** After the window has been created, and the slides have been set, we'll initialize the slides with OpenGL. */ void GLInitSlides(); @@ -210,10 +210,10 @@ private: /// Holds the information of our new child window struct GLWindow { -#if defined( WNT ) - HWND hWnd; - HDC hDC; - HGLRC hRC; +#if defined( WNT ) + HWND hWnd; + HDC hDC; + HGLRC hRC; #elif defined( OS2 ) #elif defined( QUARTZ ) #elif defined( UNX ) @@ -235,14 +235,14 @@ private: bool HasGLXExtension( const char* name ) { return gluCheckExtension( (const GLubyte*) name, (const GLubyte*) GLXExtensions ); } bool HasGLExtension( const char* name ) { return gluCheckExtension( (const GLubyte*) name, GLExtensions ); } } GLWin; - + /** OpenGL handle to the leaving slide's texture */ unsigned int GLleavingSlide; /** OpenGL handle to the entering slide's texture */ unsigned int GLenteringSlide; - + /** pointer to our window which we MIGHT create. */ class SystemChildWindow* pWindow; @@ -250,11 +250,11 @@ private: Reference< presentation::XSlideShowView > mxView; Reference< rendering::XIntegerBitmap > mxLeavingBitmap; Reference< rendering::XIntegerBitmap > mxEnteringBitmap; - + /** raw bytes of the entering bitmap */ uno::Sequence<sal_Int8> EnteringBytes; - + /** raw bytes of the leaving bitmap */ uno::Sequence<sal_Int8> LeavingBytes; @@ -270,17 +270,17 @@ private: bool mbFreeEnteringPixmap; unx::Pixmap maLeavingPixmap; unx::Pixmap maEnteringPixmap; - + /** the form the raw bytes are in for the bitmaps */ - rendering::IntegerBitmapLayout SlideBitmapLayout; - + rendering::IntegerBitmapLayout SlideBitmapLayout; + /** the size of the slides - */ + */ geometry::IntegerSize2D SlideSize; - + /** Our Transition to be used. - */ + */ OGLTransitionImpl* pTransition; public: @@ -375,7 +375,7 @@ bool OGLTransitionerImpl::initialize( const Reference< presentation::XSlideShowV bool OGLTransitionerImpl::createWindow( Window* pPWindow ) { const SystemEnvData* sysData(pPWindow->GetSystemData()); -#if defined( WNT ) +#if defined( WNT ) GLWin.hWnd = sysData->hWnd; #elif defined( UNX ) GLWin.dpy = reinterpret_cast<unx::Display*>(sysData->pDisplay); @@ -407,7 +407,7 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow ) GLX_DEPTH_SIZE,0,//no depth buffer None }; - static int attrList2[] = + static int attrList2[] = { GLX_RGBA,//only TrueColor or DirectColor /// single buffered @@ -436,8 +436,8 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow ) GLX_BLUE_SIZE,4,/// use the maximum blue bits, with a minimum of 4 bits GLX_DEPTH_SIZE,1,/// use the maximum depth bits, making sure there is a depth buffer None - }; - static int* attrTable[] = + }; + static int* attrTable[] = { attrList0, attrList1, @@ -533,13 +533,13 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow ) } #endif -#if defined( WNT ) +#if defined( WNT ) const SystemEnvData* pChildSysData = NULL; SystemWindowData winData; winData.nSize = sizeof(winData); pWindow=new SystemChildWindow(pPWindow, 0, &winData, FALSE); pChildSysData = pWindow->GetSystemData(); -#endif +#endif if( pWindow ) { @@ -549,7 +549,7 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow ) pWindow->SetControlForeground(); pWindow->SetControlBackground(); pWindow->EnablePaint(FALSE); -#if defined( WNT ) +#if defined( WNT ) GLWin.hWnd = sysData->hWnd; #elif defined( UNX ) GLWin.dpy = reinterpret_cast<unx::Display*>(pChildSysData->pDisplay); @@ -599,7 +599,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta GLWin.Height = aCanvasArea.Height; OSL_TRACE("canvas area: %d,%d - %dx%d", aCanvasArea.X, aCanvasArea.Y, aCanvasArea.Width, aCanvasArea.Height); -#if defined( WNT ) +#if defined( WNT ) GLWin.hDC = GetDC(GLWin.hWnd); #elif defined( UNX ) GLWin.ctx = glXCreateContext(GLWin.dpy, @@ -612,27 +612,27 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta } #endif -#if defined( WNT ) - PIXELFORMATDESCRIPTOR PixelFormatFront = // PixelFormat Tells Windows How We Want Things To Be +#if defined( WNT ) + PIXELFORMATDESCRIPTOR PixelFormatFront = // PixelFormat Tells Windows How We Want Things To Be { sizeof(PIXELFORMATDESCRIPTOR), - 1, // Version Number + 1, // Version Number PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER, - PFD_TYPE_RGBA, // Request An RGBA Format - (BYTE)32, // Select Our Color Depth - 0, 0, 0, 0, 0, 0, // Color Bits Ignored - 0, // No Alpha Buffer - 0, // Shift Bit Ignored - 0, // No Accumulation Buffer - 0, 0, 0, 0, // Accumulation Bits Ignored - 64, // 32 bit Z-BUFFER - 0, // 0 bit stencil buffer - 0, // No Auxiliary Buffer - 0, // now ignored - 0, // Reserved - 0, 0, 0 // Layer Masks Ignored + PFD_TYPE_RGBA, // Request An RGBA Format + (BYTE)32, // Select Our Color Depth + 0, 0, 0, 0, 0, 0, // Color Bits Ignored + 0, // No Alpha Buffer + 0, // Shift Bit Ignored + 0, // No Accumulation Buffer + 0, 0, 0, 0, // Accumulation Bits Ignored + 64, // 32 bit Z-BUFFER + 0, // 0 bit stencil buffer + 0, // No Auxiliary Buffer + 0, // now ignored + 0, // Reserved + 0, 0, 0 // Layer Masks Ignored }; int WindowPix = ChoosePixelFormat(GLWin.hDC,&PixelFormatFront); SetPixelFormat(GLWin.hDC,WindowPix,&PixelFormatFront); @@ -689,12 +689,12 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta glCullFace(GL_BACK); glClearColor (0, 0, 0, 0); glClear(GL_COLOR_BUFFER_BIT); -#if defined( WNT ) +#if defined( WNT ) SwapBuffers(GLWin.hDC); #elif defined( UNX ) unx::glXSwapBuffers(GLWin.dpy, GLWin.win); #endif - + glEnable(GL_LIGHTING); GLfloat light_direction[] = { 0.0 , 0.0 , 1.0 }; GLfloat materialDiffuse[] = { 1.0 , 1.0 , 1.0 , 1.0}; @@ -704,7 +704,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta glEnable(GL_NORMALIZE); if( LeavingBytes.hasElements() && EnteringBytes.hasElements()) - GLInitSlides();//we already have uninitialized slides, let's initialize + GLInitSlides();//we already have uninitialized slides, let's initialize if( pTransition && pTransition->mnRequiredGLVersion <= cnGLVersion ) pTransition->prepare( GLleavingSlide, GLenteringSlide ); @@ -712,14 +712,14 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta return true; } -void OGLTransitionerImpl::setSlides( const uno::Reference< rendering::XBitmap >& xLeavingSlide, +void OGLTransitionerImpl::setSlides( const uno::Reference< rendering::XBitmap >& xLeavingSlide, const uno::Reference< rendering::XBitmap >& xEnteringSlide ) { osl::MutexGuard const guard( m_aMutex ); if (isDisposed()) return; - + mxLeavingBitmap.set( xLeavingSlide , UNO_QUERY_THROW ); mxEnteringBitmap.set( xEnteringSlide , UNO_QUERY_THROW ); Reference< XFastPropertySet > xLeavingSet( xLeavingSlide , UNO_QUERY ); @@ -799,7 +799,7 @@ void OGLTransitionerImpl::setSlides( const uno::Reference< rendering::XBitmap >& } errorTriggered = false; } - + EnteringPixmap = glXCreatePixmap( GLWin.dpy, GLWin.fbc, maEnteringPixmap, pixmapAttribs ); // sync so that we possibly get an XError @@ -829,7 +829,7 @@ void OGLTransitionerImpl::setSlides( const uno::Reference< rendering::XBitmap >& if( !mbUseEnteringPixmap ) EnteringBytes = mxEnteringBitmap->getData(SlideBitmapLayout,SlideRect); -// TODO +// TODO #ifdef UNX if(GLWin.ctx)//if we have a rendering context, let's init the slides #endif @@ -884,16 +884,16 @@ void OGLTransitionerImpl::createTexture( unsigned int* texID, #endif if( !pFormat ) { - // force-convert color to ARGB8888 int color space + // force-convert color to ARGB8888 int color space uno::Sequence<sal_Int8> tempBytes( SlideBitmapLayout.ColorSpace->convertToIntegerColorSpace( data, canvas::tools::getStdColorSpace())); - gluBuild2DMipmaps(GL_TEXTURE_2D, - 4, - SlideSize.Width, - SlideSize.Height, - GL_RGBA, + gluBuild2DMipmaps(GL_TEXTURE_2D, + 4, + SlideSize.Width, + SlideSize.Height, + GL_RGBA, GL_UNSIGNED_BYTE, &tempBytes[0]); glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR); @@ -966,7 +966,7 @@ const OGLFormat* OGLTransitionerImpl::chooseFormats() (0:16, 1:24, 2:32), then channel ordering: (0:rgba, 1:bgra, 2:argb, 3:abgr) */ - static const OGLFormat lcl_RGB24[] = + static const OGLFormat lcl_RGB24[] = { // 24 bit RGB {3, GL_BGR, GL_UNSIGNED_BYTE}, @@ -977,7 +977,7 @@ const OGLFormat* OGLTransitionerImpl::chooseFormats() #if defined(GL_VERSION_1_2) && defined(GLU_VERSION_1_3) // more format constants available - static const OGLFormat lcl_RGB16[] = + static const OGLFormat lcl_RGB16[] = { // 16 bit RGB {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5_REV}, @@ -986,7 +986,7 @@ const OGLFormat* OGLTransitionerImpl::chooseFormats() {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5} }; - static const OGLFormat lcl_ARGB16_4[] = + static const OGLFormat lcl_ARGB16_4[] = { // 16 bit ARGB {4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4_REV}, @@ -995,7 +995,7 @@ const OGLFormat* OGLTransitionerImpl::chooseFormats() {4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4} }; - static const OGLFormat lcl_ARGB16_5[] = + static const OGLFormat lcl_ARGB16_5[] = { // 16 bit ARGB {4, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV}, @@ -1004,7 +1004,7 @@ const OGLFormat* OGLTransitionerImpl::chooseFormats() {4, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1} }; - static const OGLFormat lcl_ARGB32[] = + static const OGLFormat lcl_ARGB32[] = { // 32 bit ARGB {4, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV}, @@ -1023,7 +1023,7 @@ const OGLFormat* OGLTransitionerImpl::chooseFormats() // supported component ordering? const int nComponentOrderIndex( calcComponentOrderIndex(aComponentTags)); - if( nComponentOrderIndex != -1 ) + if( nComponentOrderIndex != -1 ) { switch( nBitsPerPixel ) { @@ -1059,8 +1059,8 @@ const OGLFormat* OGLTransitionerImpl::chooseFormats() const uno::Sequence<sal_Int8> aComponentTags( xIntColorSpace->getComponentTags()); const int nComponentOrderIndex(calcComponentOrderIndex(aComponentTags)); - if( aComponentTags.getLength() == 3 && - nComponentOrderIndex != -1 && + if( aComponentTags.getLength() == 3 && + nComponentOrderIndex != -1 && xIntColorSpace->getBitsPerPixel() == 24 ) { pDetectedFormat = &lcl_RGB24[nComponentOrderIndex]; @@ -1139,12 +1139,12 @@ void SAL_CALL OGLTransitionerImpl::update( double nTime ) throw (uno::RuntimeExc glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); if(pTransition) - pTransition->display( nTime, GLleavingSlide, GLenteringSlide, + pTransition->display( nTime, GLleavingSlide, GLenteringSlide, SlideSize.Width, SlideSize.Height, static_cast<double>(GLWin.Width), static_cast<double>(GLWin.Height) ); -#if defined( WNT ) +#if defined( WNT ) SwapBuffers(GLWin.hDC); #elif defined( UNX ) unx::glXSwapBuffers(GLWin.dpy, GLWin.win); @@ -1186,8 +1186,8 @@ void OGLTransitionerImpl::disposeContextAndWindow() #if defined( WNT ) if (GLWin.hRC) { - wglMakeCurrent( GLWin.hDC, 0 ); // kill Device Context - wglDeleteContext( GLWin.hRC ); // Kill Render Context + wglMakeCurrent( GLWin.hDC, 0 ); // kill Device Context + wglDeleteContext( GLWin.hRC ); // Kill Render Context ReleaseDC( GLWin.hWnd, GLWin.hDC ); // Release Window } #elif defined( UNX ) @@ -1300,12 +1300,12 @@ void OGLTransitionerImpl::disposing() mxView.clear(); } -OGLTransitionerImpl::OGLTransitionerImpl(OGLTransitionImpl* pOGLTransition) : - OGLTransitionerImplBase(m_aMutex), +OGLTransitionerImpl::OGLTransitionerImpl(OGLTransitionImpl* pOGLTransition) : + OGLTransitionerImplBase(m_aMutex), GLWin(), - GLleavingSlide( 0 ), - GLenteringSlide( 0 ), - pWindow( NULL ), + GLleavingSlide( 0 ), + GLenteringSlide( 0 ), + pWindow( NULL ), mxView(), EnteringBytes(), LeavingBytes(), @@ -1344,7 +1344,7 @@ public: case animations::TransitionSubType::CORNERSOUT: case animations::TransitionSubType::CIRCLE: case animations::TransitionSubType::FANOUTHORIZONTAL: - case animations::TransitionSubType::CORNERSIN: + case animations::TransitionSubType::CORNERSIN: case animations::TransitionSubType::LEFTTORIGHT: case animations::TransitionSubType::TOPTOBOTTOM: case animations::TransitionSubType::TOPRIGHT: @@ -1371,11 +1371,11 @@ public: return sal_False; } - virtual uno::Reference< presentation::XTransition > SAL_CALL createTransition( - ::sal_Int16 transitionType, - ::sal_Int16 transitionSubType, - const uno::Reference< presentation::XSlideShowView >& view, - const uno::Reference< rendering::XBitmap >& leavingBitmap, + virtual uno::Reference< presentation::XTransition > SAL_CALL createTransition( + ::sal_Int16 transitionType, + ::sal_Int16 transitionSubType, + const uno::Reference< presentation::XSlideShowView >& view, + const uno::Reference< rendering::XBitmap >& leavingBitmap, const uno::Reference< rendering::XBitmap >& enteringBitmap ) throw (uno::RuntimeException) { @@ -1389,7 +1389,7 @@ public: ( transitionType == animations::TransitionType::FADE && transitionSubType == animations::TransitionSubType::FADEOVERCOLOR ) || ( transitionType == animations::TransitionType::IRISWIPE && transitionSubType == animations::TransitionSubType::DIAMOND ) ) ) return uno::Reference< presentation::XTransition >(); - + OGLTransitionImpl* pTransition = NULL; @@ -1399,17 +1399,17 @@ public: { case animations::TransitionSubType::ACROSS: pTransition->makeNByMTileFlip(8,6); - break; + break; case animations::TransitionSubType::CORNERSOUT: pTransition->makeOutsideCubeFaceToLeft(); - break; + break; case animations::TransitionSubType::CIRCLE: pTransition->makeRevolvingCircles(8,128); break; case animations::TransitionSubType::FANOUTHORIZONTAL: pTransition->makeHelix(20); break; - case animations::TransitionSubType::CORNERSIN: + case animations::TransitionSubType::CORNERSIN: pTransition->makeInsideCubeFaceToLeft(); break; case animations::TransitionSubType::LEFTTORIGHT: diff --git a/slideshow/source/engine/activities/accumulation.hxx b/slideshow/source/engine/activities/accumulation.hxx index 40257f347f24..b5b24c44509d 100644 --- a/slideshow/source/engine/activities/accumulation.hxx +++ b/slideshow/source/engine/activities/accumulation.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace slideshow This template handles value accumulation across repeated effect runs: returned is the end value times the repeat count, plus the current value. - + @param rEndValue End value of the simple animation. @@ -52,35 +52,35 @@ namespace slideshow @param rCurrValue Current animation value */ - template< typename ValueType > ValueType accumulate( const ValueType& rEndValue, - sal_uInt32 nRepeatCount, - const ValueType& rCurrValue ) + template< typename ValueType > ValueType accumulate( const ValueType& rEndValue, + sal_uInt32 nRepeatCount, + const ValueType& rCurrValue ) { return nRepeatCount*rEndValue + rCurrValue; } /// Specialization for non-addable enums/constant values - template<> sal_Int16 accumulate< sal_Int16 >( const sal_Int16&, - sal_uInt32, - const sal_Int16& rCurrValue ) + template<> sal_Int16 accumulate< sal_Int16 >( const sal_Int16&, + sal_uInt32, + const sal_Int16& rCurrValue ) { // always return rCurrValue, it's forbidden to add enums/constant values... return rCurrValue; } /// Specialization for non-addable strings - template<> ::rtl::OUString accumulate< ::rtl::OUString >( const ::rtl::OUString&, + template<> ::rtl::OUString accumulate< ::rtl::OUString >( const ::rtl::OUString&, sal_uInt32, - const ::rtl::OUString& rCurrValue ) + const ::rtl::OUString& rCurrValue ) { // always return rCurrValue, it's impossible to add strings... return rCurrValue; } /// Specialization for non-addable bools - template<> bool accumulate< bool >( const bool&, - sal_uInt32, - const bool& bCurrValue ) + template<> bool accumulate< bool >( const bool&, + sal_uInt32, + const bool& bCurrValue ) { // always return bCurrValue, SMIL spec requires to ignore // cumulative behaviour for bools. diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx index cb8ba6a1063b..a4a670dd8320 100644 --- a/slideshow/source/engine/activities/activitiesfactory.cxx +++ b/slideshow/source/engine/activities/activitiesfactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,14 +86,14 @@ template<> struct FormulaTraits<double> // ================================================================= /** FromToBy handler - + Provides the Activity specializations for FromToBy animations (e.g. those without a values list). - + This template makes heavy use of SFINAE, only one of the perform*() methods will compile for each of the base classes. - + Note that we omit the virtual keyword on the perform() overrides on purpose; those that actually do override baseclass virtual methods inherit the property, and @@ -101,14 +101,14 @@ template<> struct FormulaTraits<double> having all perform() method in the vtable actually creates POIs for them, which breaks the whole SFINAE concept (IOW, this template won't compile any longer). - + @tpl BaseType Base class to use for this activity. Only ContinuousActivityBase and DiscreteActivityBase are supported here. - + @tpl AnimationType - Type of the Animation to call. + Type of the Animation to call. */ template<class BaseType, typename AnimationType> class FromToByActivity : public BaseType @@ -116,39 +116,39 @@ class FromToByActivity : public BaseType public: typedef typename AnimationType::ValueType ValueType; typedef boost::optional<ValueType> OptionalValueType; - + private: - // some compilers don't inline whose definition they haven't + // some compilers don't inline whose definition they haven't // seen before the call site... ValueType getPresentationValue( const ValueType& rVal ) const { return FormulaTraits<ValueType>::getPresentationValue( rVal, mpFormula); } - + public: /** Create FromToByActivity. - + @param rFrom From this value, the animation starts - + @param rTo With this value, the animation ends - + @param rBy With this value, the animation increments the start value - + @param rParms Standard Activity parameter struct - + @param rAnim Shared ptr to AnimationType - + @param rInterpolator Interpolator object to be used for lerping between start and end value (need to be passed, since it might contain state, e.g. interpolation direction for HSL color space). - + @param bCumulative Whether repeated animations should cumulate the value, or start fresh each time. @@ -174,60 +174,60 @@ public: mbCumulative( bCumulative ) { ENSURE_OR_THROW( mpAnim, "Invalid animation object" ); - + ENSURE_OR_THROW( rTo || rBy, "From and one of To or By, or To or By alone must be valid" ); } - - virtual void startAnimation() + + virtual void startAnimation() { if (this->isDisposed() || !mpAnim) return; BaseType::startAnimation(); - - // start animation + + // start animation mpAnim->start( BaseType::getShape(), BaseType::getShapeAttributeLayer() ); - + // setup start and end value. Determine animation // start value only when animation actually // started up (this order is part of the Animation // interface contract) const ValueType aAnimationStartValue( mpAnim->getUnderlyingValue() ); - + // first of all, determine general type of // animation, by inspecting which of the FromToBy values // are actually valid. // See http://www.w3.org/TR/smil20/animation.html#AnimationNS-FromToBy // for a definition - if( maFrom ) + if( maFrom ) { // From-to or From-by animation. According to // SMIL spec, the To value takes precedence // over the By value, if both are specified - if( maTo ) + if( maTo ) { // From-To animation maStartValue = *maFrom; maEndValue = *maTo; } - else if( maBy ) + else if( maBy ) { // From-By animation maStartValue = *maFrom; maEndValue = maStartValue + *maBy; } } - else + else { // By or To animation. According to SMIL spec, // the To value takes precedence over the By // value, if both are specified - if( maTo ) + if( maTo ) { // To animation - + // According to the SMIL spec // (http://www.w3.org/TR/smil20/animation.html#animationNS-ToAnimation), // the to animation interpolates between @@ -235,7 +235,7 @@ public: mbDynamicStartValue = true; maEndValue = *maTo; } - else if( maBy ) + else if( maBy ) { // By animation maStartValue = aAnimationStartValue; @@ -243,14 +243,14 @@ public: } } } - + virtual void endAnimation() { // end animation if (mpAnim) mpAnim->end(); } - + /// perform override for ContinuousActivityBase void perform( double nModifiedTime, sal_uInt32 nRepeatCount ) const { @@ -258,7 +258,7 @@ public: return; (*mpAnim)( getPresentationValue( - accumulate( maEndValue, + accumulate( maEndValue, mbCumulative * nRepeatCount, // means: mbCumulative ? nRepeatCount : 0, maInterpolator( (mbDynamicStartValue ? mpAnim->getUnderlyingValue() @@ -274,7 +274,7 @@ public: { if (this->isDisposed() || !mpAnim) return; - (*mpAnim)( + (*mpAnim)( getPresentationValue( accumulate( maEndValue, mbCumulative ? nRepeatCount : 0, lerp( maInterpolator, @@ -282,12 +282,12 @@ public: ? mpAnim->getUnderlyingValue() : maStartValue), maEndValue, - nFrame, + nFrame, BaseType::getNumberOfKeyTimes() ) ) ) ); } using BaseType::isAutoReverse; - + virtual void performEnd() { // xxx todo: good guess @@ -299,7 +299,7 @@ public: (*mpAnim)( getPresentationValue( maEndValue ) ); } } - + /// Disposable: virtual void dispose() { @@ -311,12 +311,12 @@ private: const OptionalValueType maFrom; const OptionalValueType maTo; const OptionalValueType maBy; - + ExpressionNodeSharedPtr mpFormula; - + ValueType maStartValue; ValueType maEndValue; - + ::boost::shared_ptr< AnimationType > mpAnim; Interpolator< ValueType > maInterpolator; bool mbDynamicStartValue; @@ -325,10 +325,10 @@ private: /** Generate Activity corresponding to given FromToBy values - + @tpl BaseType BaseType to use for deriving the Activity from - + @tpl AnimationType Subtype of the Animation object (e.g. NumberAnimation) */ @@ -346,35 +346,35 @@ AnimationActivitySharedPtr createFromToByActivity( { typedef typename AnimationType::ValueType ValueType; typedef boost::optional<ValueType> OptionalValueType; - + OptionalValueType aFrom; OptionalValueType aTo; OptionalValueType aBy; - + ValueType aTmpValue; - - if( rFromAny.hasValue() ) + + if( rFromAny.hasValue() ) { ENSURE_OR_THROW( extractValue( aTmpValue, rFromAny, rShape, rSlideBounds ), "createFromToByActivity(): Could not extract from value" ); aFrom.reset(aTmpValue); } - if( rToAny.hasValue() ) + if( rToAny.hasValue() ) { ENSURE_OR_THROW( extractValue( aTmpValue, rToAny, rShape, rSlideBounds ), "createFromToByActivity(): Could not extract to value" ); aTo.reset(aTmpValue); } - if( rByAny.hasValue() ) + if( rByAny.hasValue() ) { ENSURE_OR_THROW( extractValue( aTmpValue, rByAny, rShape, rSlideBounds ), "createFromToByActivity(): Could not extract by value" ); aBy.reset(aTmpValue); } - + return AnimationActivitySharedPtr( new FromToByActivity<BaseType, AnimationType>( aFrom, @@ -388,7 +388,7 @@ AnimationActivitySharedPtr createFromToByActivity( /* The following table shows which animator combines with which Activity type: - + NumberAnimator: all PairAnimation: all ColorAnimation: all @@ -397,14 +397,14 @@ AnimationActivitySharedPtr createFromToByActivity( */ /** Values handler - + Provides the Activity specializations for value lists animations. - + This template makes heavy use of SFINAE, only one of the perform*() methods will compile for each of the base classes. - + Note that we omit the virtual keyword on the perform() overrides on purpose; those that actually do override baseclass virtual methods inherit the property, and @@ -412,7 +412,7 @@ AnimationActivitySharedPtr createFromToByActivity( having all perform() method in the vtable actually creates POIs for them, which breaks the whole SFINAE concept (IOW, this template won't compile any longer). - + @tpl BaseType Base class to use for this activity. Only ContinuousKeyTimeActivityBase and DiscreteActivityBase @@ -420,9 +420,9 @@ AnimationActivitySharedPtr createFromToByActivity( times, the client must emulate key times by providing a vector of equally spaced values between 0 and 1, with the same number of entries as the values vector. - + @tpl AnimationType - Type of the Animation to call. + Type of the Animation to call. */ template<class BaseType, typename AnimationType> class ValuesActivity : public BaseType @@ -430,34 +430,34 @@ class ValuesActivity : public BaseType public: typedef typename AnimationType::ValueType ValueType; typedef std::vector<ValueType> ValueVectorType; - + private: - // some compilers don't inline methods whose definition they haven't + // some compilers don't inline methods whose definition they haven't // seen before the call site... ValueType getPresentationValue( const ValueType& rVal ) const { return FormulaTraits<ValueType>::getPresentationValue( rVal, mpFormula ); } - + public: /** Create ValuesActivity. - + @param rValues Value vector to cycle animation through - + @param rParms Standard Activity parameter struct - + @param rAnim Shared ptr to AnimationType - + @param rInterpolator Interpolator object to be used for lerping between start and end value (need to be passed, since it might contain state, e.g. interpolation direction for HSL color space). - + @param bCumulative Whether repeated animations should cumulate the value, or start afresh each time. @@ -478,25 +478,25 @@ public: ENSURE_OR_THROW( mpAnim, "Invalid animation object" ); ENSURE_OR_THROW( !rValues.empty(), "Empty value vector" ); } - + virtual void startAnimation() { if (this->isDisposed() || !mpAnim) return; BaseType::startAnimation(); - + // start animation mpAnim->start( BaseType::getShape(), BaseType::getShapeAttributeLayer() ); } - + virtual void endAnimation() { // end animation if (mpAnim) mpAnim->end(); } - + /// perform override for ContinuousKeyTimeActivityBase base void perform( sal_uInt32 nIndex, double nFractionalIndex, @@ -506,14 +506,14 @@ public: return; ENSURE_OR_THROW( nIndex+1 < maValues.size(), "ValuesActivity::perform(): index out of range" ); - + // interpolate between nIndex and nIndex+1 values - (*mpAnim)( + (*mpAnim)( getPresentationValue( accumulate( maValues.back(), mbCumulative ? nRepeatCount : 0, - maInterpolator( maValues[ nIndex ], - maValues[ nIndex+1 ], + maInterpolator( maValues[ nIndex ], + maValues[ nIndex+1 ], nFractionalIndex ) ) ) ); } @@ -526,44 +526,44 @@ public: return; ENSURE_OR_THROW( nFrame < maValues.size(), "ValuesActivity::perform(): index out of range" ); - + // this is discrete, thus no lerp here. - (*mpAnim)( + (*mpAnim)( getPresentationValue( accumulate( maValues.back(), mbCumulative ? nRepeatCount : 0, maValues[ nFrame ] ) ) ); } - + virtual void performEnd() { // xxx todo: good guess if (mpAnim) (*mpAnim)( getPresentationValue( maValues.back() ) ); } - + /// Disposable: virtual void dispose() { mpAnim.reset(); BaseType::dispose(); } - + private: ValueVectorType maValues; - + ExpressionNodeSharedPtr mpFormula; - + boost::shared_ptr<AnimationType> mpAnim; Interpolator< ValueType > maInterpolator; bool mbCumulative; }; /** Generate Activity corresponding to given Value vector - + @tpl BaseType BaseType to use for deriving the Activity from - + @tpl AnimationType Subtype of the Animation object (e.g. NumberAnimation) */ @@ -579,19 +579,19 @@ AnimationActivitySharedPtr createValueListActivity( { typedef typename AnimationType::ValueType ValueType; typedef std::vector<ValueType> ValueVectorType; - - ValueVectorType aValueVector; + + ValueVectorType aValueVector; aValueVector.reserve( rValues.getLength() ); - + for( ::std::size_t i=0, nLen=rValues.getLength(); i<nLen; ++i ) { - ValueType aValue; + ValueType aValue; ENSURE_OR_THROW( extractValue( aValue, rValues[i], rShape, rSlideBounds ), "createValueListActivity(): Could not extract values" ); aValueVector.push_back( aValue ); } - + return AnimationActivitySharedPtr( new ValuesActivity<BaseType, AnimationType>( aValueVector, @@ -602,20 +602,20 @@ AnimationActivitySharedPtr createValueListActivity( } /** Generate Activity for given XAnimate, corresponding to given Value vector - + @tpl AnimationType Subtype of the Animation object (e.g. NumberAnimation) - + @param rParms Common activity parameters - + @param xNode XAnimate node, to retrieve animation values from - + @param rAnim Actual animation to operate with (gets called with the time-dependent values) - + @param rInterpolator Interpolator object to be used for lerping between start and end values (need to be passed, since it @@ -632,7 +632,7 @@ AnimationActivitySharedPtr createActivity( { // setup common parameters // ======================= - + ActivityParameters aActivityParms( rParms.mpEndEvent, rParms.mrEventQueue, rParms.mrActivitiesQueue, @@ -642,75 +642,75 @@ AnimationActivitySharedPtr createActivity( rParms.mnDeceleration, rParms.mnMinNumberOfFrames, rParms.mbAutoReverse ); - - // is a formula given? + + // is a formula given? const ::rtl::OUString& rFormulaString( xNode->getFormula() ); if( rFormulaString.getLength() ) { // yep, parse and pass to ActivityParameters - try + try { - aActivityParms.mpFormula = + aActivityParms.mpFormula = SmilFunctionParser::parseSmilFunction( rFormulaString, calcRelativeShapeBounds( rParms.maSlideBounds, rParms.mpShape->getBounds() ) ); } - catch( ParseError& ) + catch( ParseError& ) { // parse error, thus no formula OSL_ENSURE( false, "createActivity(): Error parsing formula string" ); } } - + // are key times given? const uno::Sequence< double >& aKeyTimes( xNode->getKeyTimes() ); - if( aKeyTimes.hasElements() ) + if( aKeyTimes.hasElements() ) { // yes, convert them from Sequence< double > aActivityParms.maDiscreteTimes.resize( aKeyTimes.getLength() ); comphelper::sequenceToArray( - &aActivityParms.maDiscreteTimes[0], + &aActivityParms.maDiscreteTimes[0], aKeyTimes ); // saves us some temporary vectors } - + // values sequence given? const sal_Int32 nValueLen( xNode->getValues().getLength() ); - if( nValueLen ) + if( nValueLen ) { // Value list activity // =================== - + // fake keytimes, if necessary - if( !aKeyTimes.hasElements() ) + if( !aKeyTimes.hasElements() ) { // create a dummy vector of key times, // with aValues.getLength equally spaced entries. for( sal_Int32 i=0; i<nValueLen; ++i ) aActivityParms.maDiscreteTimes.push_back( double(i)/nValueLen ); } - + // determine type of animation needed here: // Value list activities are possible with // ContinuousKeyTimeActivityBase and DiscreteActivityBase // specializations const sal_Int16 nCalcMode( xNode->getCalcMode() ); - - switch( nCalcMode ) + + switch( nCalcMode ) { - case animations::AnimationCalcMode::DISCRETE: + case animations::AnimationCalcMode::DISCRETE: { // since DiscreteActivityBase suspends itself // between the frames, create a WakeupEvent for it. - aActivityParms.mpWakeupEvent.reset( + aActivityParms.mpWakeupEvent.reset( new WakeupEvent( rParms.mrEventQueue.getTimer(), rParms.mrActivitiesQueue ) ); - + AnimationActivitySharedPtr pActivity( - createValueListActivity< DiscreteActivityBase >( + createValueListActivity< DiscreteActivityBase >( xNode->getValues(), aActivityParms, rAnim, @@ -718,23 +718,23 @@ AnimationActivitySharedPtr createActivity( xNode->getAccumulate(), rParms.mpShape, rParms.maSlideBounds ) ); - + // WakeupEvent and DiscreteActivityBase need circular // references to the corresponding other object. aActivityParms.mpWakeupEvent->setActivity( pActivity ); - + return pActivity; } - + default: OSL_ENSURE( false, "createActivity(): unexpected case" ); - // FALLTHROUGH intended + // FALLTHROUGH intended case animations::AnimationCalcMode::PACED: // FALLTHROUGH intended case animations::AnimationCalcMode::SPLINE: // FALLTHROUGH intended case animations::AnimationCalcMode::LINEAR: - return createValueListActivity< ContinuousKeyTimeActivityBase >( + return createValueListActivity< ContinuousKeyTimeActivityBase >( xNode->getValues(), aActivityParms, rAnim, @@ -744,39 +744,39 @@ AnimationActivitySharedPtr createActivity( rParms.maSlideBounds ); } } - else + else { // FromToBy activity // ================= - + // determine type of animation needed here: // FromToBy activities are possible with // ContinuousActivityBase and DiscreteActivityBase // specializations const sal_Int16 nCalcMode( xNode->getCalcMode() ); - - switch( nCalcMode ) + + switch( nCalcMode ) { - case animations::AnimationCalcMode::DISCRETE: + case animations::AnimationCalcMode::DISCRETE: { // fake keytimes, if necessary - if( !aKeyTimes.hasElements() ) + if( !aKeyTimes.hasElements() ) { // create a dummy vector of 2 key times const ::std::size_t nLen( 2 ); for( ::std::size_t i=0; i<nLen; ++i ) aActivityParms.maDiscreteTimes.push_back( double(i)/nLen ); } - + // since DiscreteActivityBase suspends itself // between the frames, create a WakeupEvent for it. - aActivityParms.mpWakeupEvent.reset( + aActivityParms.mpWakeupEvent.reset( new WakeupEvent( rParms.mrEventQueue.getTimer(), rParms.mrActivitiesQueue ) ); - + AnimationActivitySharedPtr pActivity( - createFromToByActivity< DiscreteActivityBase >( + createFromToByActivity< DiscreteActivityBase >( xNode->getFrom(), xNode->getTo(), xNode->getBy(), @@ -786,23 +786,23 @@ AnimationActivitySharedPtr createActivity( xNode->getAccumulate(), rParms.mpShape, rParms.maSlideBounds ) ); - + // WakeupEvent and DiscreteActivityBase need circular // references to the corresponding other object. aActivityParms.mpWakeupEvent->setActivity( pActivity ); - + return pActivity; } - + default: OSL_ENSURE( false, "createActivity(): unexpected case" ); - // FALLTHROUGH intended + // FALLTHROUGH intended case animations::AnimationCalcMode::PACED: // FALLTHROUGH intended case animations::AnimationCalcMode::SPLINE: // FALLTHROUGH intended case animations::AnimationCalcMode::LINEAR: - return createFromToByActivity< ContinuousActivityBase >( + return createFromToByActivity< ContinuousActivityBase >( xNode->getFrom(), xNode->getTo(), xNode->getBy(), @@ -817,7 +817,7 @@ AnimationActivitySharedPtr createActivity( } /** Simple activity for ActivitiesFactory::createSimpleActivity - + @tpl Direction Determines direction of value generator. A 1 yields a forward direction, starting with 0.0 and ending with @@ -829,7 +829,7 @@ class SimpleActivity : public ContinuousActivityBase { public: /** Create SimpleActivity. - + @param rParms Standard Activity parameter struct */ @@ -840,18 +840,18 @@ public: { ENSURE_OR_THROW( mpAnim, "Invalid animation object" ); } - + virtual void startAnimation() { if (this->isDisposed() || !mpAnim) return; ContinuousActivityBase::startAnimation(); - + // start animation mpAnim->start( getShape(), getShapeAttributeLayer() ); } - + virtual void endAnimation() { // end animation @@ -869,21 +869,21 @@ public: // no cumulation, simple [0,1] range (*mpAnim)( 1.0 - Direction + nModifiedTime*(2.0*Direction - 1.0) ); } - + virtual void performEnd() { // xxx todo: review if (mpAnim) (*mpAnim)( 1.0*Direction ); } - + /// Disposable: virtual void dispose() { mpAnim.reset(); ContinuousActivityBase::dispose(); } - + private: NumberAnimationSharedPtr mpAnim; }; @@ -893,7 +893,7 @@ private: AnimationActivitySharedPtr ActivitiesFactory::createAnimateActivity( const CommonParameters& rParms, - const NumberAnimationSharedPtr& rAnim, + const NumberAnimationSharedPtr& rAnim, const uno::Reference< animations::XAnimate >& xNode ) { // forward to appropriate template instantiation @@ -902,7 +902,7 @@ AnimationActivitySharedPtr ActivitiesFactory::createAnimateActivity( AnimationActivitySharedPtr ActivitiesFactory::createAnimateActivity( const CommonParameters& rParms, - const EnumAnimationSharedPtr& rAnim, + const EnumAnimationSharedPtr& rAnim, const uno::Reference< animations::XAnimate >& xNode ) { // forward to appropriate template instantiation @@ -911,7 +911,7 @@ AnimationActivitySharedPtr ActivitiesFactory::createAnimateActivity( AnimationActivitySharedPtr ActivitiesFactory::createAnimateActivity( const CommonParameters& rParms, - const ColorAnimationSharedPtr& rAnim, + const ColorAnimationSharedPtr& rAnim, const uno::Reference< animations::XAnimate >& xNode ) { // forward to appropriate template instantiation @@ -920,7 +920,7 @@ AnimationActivitySharedPtr ActivitiesFactory::createAnimateActivity( AnimationActivitySharedPtr ActivitiesFactory::createAnimateActivity( const CommonParameters& rParms, - const HSLColorAnimationSharedPtr& rAnim, + const HSLColorAnimationSharedPtr& rAnim, const uno::Reference< animations::XAnimateColor >& xNode ) { // forward to appropriate template instantiation @@ -934,7 +934,7 @@ AnimationActivitySharedPtr ActivitiesFactory::createAnimateActivity( AnimationActivitySharedPtr ActivitiesFactory::createAnimateActivity( const CommonParameters& rParms, - const PairAnimationSharedPtr& rAnim, + const PairAnimationSharedPtr& rAnim, const uno::Reference< animations::XAnimate >& xNode ) { // forward to appropriate template instantiation @@ -943,7 +943,7 @@ AnimationActivitySharedPtr ActivitiesFactory::createAnimateActivity( AnimationActivitySharedPtr ActivitiesFactory::createAnimateActivity( const CommonParameters& rParms, - const StringAnimationSharedPtr& rAnim, + const StringAnimationSharedPtr& rAnim, const uno::Reference< animations::XAnimate >& xNode ) { // forward to appropriate template instantiation @@ -952,7 +952,7 @@ AnimationActivitySharedPtr ActivitiesFactory::createAnimateActivity( AnimationActivitySharedPtr ActivitiesFactory::createAnimateActivity( const CommonParameters& rParms, - const BoolAnimationSharedPtr& rAnim, + const BoolAnimationSharedPtr& rAnim, const uno::Reference< animations::XAnimate >& xNode ) { // forward to appropriate template instantiation @@ -973,7 +973,7 @@ AnimationActivitySharedPtr ActivitiesFactory::createSimpleActivity( rParms.mnDeceleration, rParms.mnMinNumberOfFrames, rParms.mbAutoReverse ); - + if( bDirectionForward ) return AnimationActivitySharedPtr( new SimpleActivity<1>( aActivityParms, rAnim ) ); diff --git a/slideshow/source/engine/activities/activitybase.cxx b/slideshow/source/engine/activities/activitybase.cxx index 479715b5ccd8..b1d326e52794 100644 --- a/slideshow/source/engine/activities/activitybase.cxx +++ b/slideshow/source/engine/activities/activitybase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,10 +40,10 @@ namespace slideshow { namespace internal - { + { // TODO(P1): Elide some virtual function calls, by templifying this // static hierarchy - + ActivityBase::ActivityBase( const ActivityParameters& rParms ) : mpEndEvent( rParms.mrEndEvent ), mrEventQueue( rParms.mrEventQueue ), @@ -55,16 +55,16 @@ namespace slideshow mbAutoReverse( rParms.mbAutoReverse ), mbFirstPerformCall( true ), mbIsActive( true ) {} - + void ActivityBase::dispose() { // deactivate mbIsActive = false; - + // dispose event if( mpEndEvent ) mpEndEvent->dispose(); - + // release references mpEndEvent.reset(); mpShape.reset(); @@ -73,26 +73,26 @@ namespace slideshow double ActivityBase::calcTimeLag() const { - // TODO(Q1): implement different init process! + // TODO(Q1): implement different init process! if (isActive() && mbFirstPerformCall) { mbFirstPerformCall = false; - - // notify derived classes that we're + + // notify derived classes that we're // starting now const_cast<ActivityBase *>(this)->startAnimation(); } return 0.0; } - + bool ActivityBase::perform() { // still active? if( !isActive() ) return false; // no, early exit. - + OSL_ASSERT( ! mbFirstPerformCall ); - + return true; } @@ -100,9 +100,9 @@ namespace slideshow { return mbIsActive; } - - void ActivityBase::setTargets( const AnimatableShapeSharedPtr& rShape, - const ShapeAttributeLayerSharedPtr& rAttrLayer ) + + void ActivityBase::setTargets( const AnimatableShapeSharedPtr& rShape, + const ShapeAttributeLayerSharedPtr& rAttrLayer ) { ENSURE_OR_THROW( rShape, "ActivityBase::setTargets(): Invalid shape" ); @@ -136,7 +136,7 @@ namespace slideshow if( !isActive() ) endAnimation(); } - + void ActivityBase::end() { if (!isActive() || isDisposed()) @@ -147,12 +147,12 @@ namespace slideshow // notify derived classes that we're starting now this->startAnimation(); } - + performEnd(); // calling private virtual endAnimation(); endActivity(); } - + double ActivityBase::calcAcceleratedTime( double nT ) const { // Handle acceleration/deceleration @@ -169,12 +169,12 @@ namespace slideshow mnAccelerationFraction + mnDecelerationFraction <= 1.0 ) { /* - // calc accelerated/decelerated time. + // calc accelerated/decelerated time. // // We have three intervals: // 1 [0,a] // 2 [a,d] - // 3 [d,1] (with a and d being acceleration/deceleration + // 3 [d,1] (with a and d being acceleration/deceleration // fraction, resp.) // // The change rate during interval 1 is constantly @@ -201,10 +201,10 @@ namespace slideshow // The graph of the change rate is a trapezoid: // // | - // 1| /--------------\ - // | / \ - // | / \ - // | / \ + // 1| /--------------\ + // | / \ + // | / \ + // | / \ // ----------------------------- // 0 a d 1 // @@ -220,8 +220,8 @@ namespace slideshow } else { - nTPrime += 0.5*mnAccelerationFraction; // full first interval - + nTPrime += 0.5*mnAccelerationFraction; // full first interval + if( nT <= 1.0-mnDecelerationFraction ) { nTPrime += nT-mnAccelerationFraction; // partial second interval @@ -231,7 +231,7 @@ namespace slideshow nTPrime += 1.0 - mnAccelerationFraction - mnDecelerationFraction; // full second interval const double nTRelative( nT - 1.0 + mnDecelerationFraction ); - + nTPrime += nTRelative - 0.5*nTRelative*nTRelative / mnDecelerationFraction; } } diff --git a/slideshow/source/engine/activities/activitybase.hxx b/slideshow/source/engine/activities/activitybase.hxx index dfe8d107b155..17479d4afd35 100644 --- a/slideshow/source/engine/activities/activitybase.hxx +++ b/slideshow/source/engine/activities/activitybase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ namespace slideshow { namespace internal { /** Base class for animation activities. - + This whole class hierarchy is only for code sharing between the various specializations (with or without key times, fully discrete, etc.). @@ -46,39 +46,39 @@ class ActivityBase : public AnimationActivity { public: ActivityBase( const ActivityParameters& rParms ); - + /// From Disposable interface virtual void dispose(); protected: /** From Activity interface - + Derived classes should override, call this first and then perform their work. */ virtual bool perform(); virtual double calcTimeLag() const; virtual bool isActive() const; - + private: virtual void dequeued(); - + // From AnimationActivity interface virtual void setTargets( const AnimatableShapeSharedPtr& rShape, const ShapeAttributeLayerSharedPtr& rAttrLayer ); - + private: /** Hook for derived classes - + This method will be called from the first perform() invocation, to signal the start of the activity. */ virtual void startAnimation() = 0; - + /** Hook for derived classes - + This method will be called after the last perform() invocation, and after the potential changes of that perform() call are committed to screen. That is, in @@ -87,38 +87,38 @@ private: visible artifacts on screen. */ virtual void endAnimation() = 0; - + protected: - + /** End this activity, in a regular way. - + This method is for derived classes needing to signal a regular activity end (i.e. because the regular duration is over) */ void endActivity(); - + /** Modify fractional time. - + This method modifies the fractional time (total duration mapped to the [0,1] range) to the effective simple time, but only according to acceleration/deceleration. */ double calcAcceleratedTime( double nT ) const; - + bool isDisposed() const { return (!mbIsActive && !mpEndEvent && !mpShape && !mpAttributeLayer); } - + EventQueue& getEventQueue() const { return mrEventQueue; } - + AnimatableShapeSharedPtr getShape() const { return mpShape; } - + ShapeAttributeLayerSharedPtr getShapeAttributeLayer() const { return mpAttributeLayer; } - + bool isRepeatCountValid() const { return maRepeats; } double getRepeatCount() const { return *maRepeats; } bool isAutoReverse() const { return mbAutoReverse; } @@ -127,19 +127,19 @@ private: /// Activity: virtual void end(); virtual void performEnd() = 0; - + private: EventSharedPtr mpEndEvent; EventQueue& mrEventQueue; AnimatableShapeSharedPtr mpShape; // only to pass on to animation ShapeAttributeLayerSharedPtr mpAttributeLayer; // only to pass on to anim - + ::boost::optional<double> const maRepeats; const double mnAccelerationFraction; const double mnDecelerationFraction; - + const bool mbAutoReverse; - + // true, if perform() has not yet been called: mutable bool mbFirstPerformCall; bool mbIsActive; diff --git a/slideshow/source/engine/activities/activityparameters.hxx b/slideshow/source/engine/activities/activityparameters.hxx index e0b38d4d8d73..3bd47e4bca55 100644 --- a/slideshow/source/engine/activities/activityparameters.hxx +++ b/slideshow/source/engine/activities/activityparameters.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,42 +40,42 @@ namespace slideshow { namespace internal { /** Parameter struct for animation activities - + This struct contains all common parameters needed to initialize the activities generated by the ActivityFactory. */ struct ActivityParameters -{ - /** Create - +{ + /** Create + @param rEndEvent Event to be fired, when the activity ends. - + @param rEventQueue Queue to add end event to - + @param nMinDuration Minimal duration of the activity (might actually be longer because of nMinNumberOfFrames). Note that this duration must always be the <em>simple</em> duration, i.e. without any repeat. - + @param rRepeats Number of repeats. If this parameter is invalid, infinite repeat is assumed. - + @param nAccelerationFraction Value between 0 and 1, denoting the fraction of the total simple duration, which the animation should accelerate. - - @param nDecelerationFraction + + @param nDecelerationFraction Value between 0 and 1, denoting the fraction of the total simple duration, which the animation should decelerate. Note that the ranges [0,nAccelerationFraction] and [nDecelerationFraction,1] must be non-overlapping! - + @param bAutoReverse When true, at the end of the simple duration, the animation plays reversed to the start value. Note that @@ -105,33 +105,33 @@ struct ActivityParameters mnDecelerationFraction( nDecelerationFraction ), mnMinNumberOfFrames( nMinNumberOfFrames ), mbAutoReverse( bAutoReverse ) {} - + /// End event to fire, when activity is over const EventSharedPtr& mrEndEvent; /// Wakeup event to use for discrete activities WakeupEventSharedPtr mpWakeupEvent; - + /// EventQueue to add events to EventQueue& mrEventQueue; - + /// ActivitiesQueue to add events to ActivitiesQueue& mrActivitiesQueue; - + /// Optional formula ExpressionNodeSharedPtr mpFormula; - + /// Key times, for discrete and key time activities ::std::vector< double > maDiscreteTimes; - + /// Total duration of activity (including all repeats) const double mnMinDuration; ::boost::optional<double> const& mrRepeats; const double mnAccelerationFraction; const double mnDecelerationFraction; - + /// Minimal number of frames this activity must render const sal_uInt32 mnMinNumberOfFrames; - + /// When true, activity is played reversed after mnDuration. const bool mbAutoReverse; }; diff --git a/slideshow/source/engine/activities/continuousactivitybase.cxx b/slideshow/source/engine/activities/continuousactivitybase.cxx index f5a16ac7533e..c11dc98f62f4 100644 --- a/slideshow/source/engine/activities/continuousactivitybase.cxx +++ b/slideshow/source/engine/activities/continuousactivitybase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,10 +44,10 @@ namespace slideshow { } - void ContinuousActivityBase::simplePerform( double nSimpleTime, - sal_uInt32 nRepeatCount ) const + void ContinuousActivityBase::simplePerform( double nSimpleTime, + sal_uInt32 nRepeatCount ) const { - perform( calcAcceleratedTime( nSimpleTime ), + perform( calcAcceleratedTime( nSimpleTime ), nRepeatCount ); } } diff --git a/slideshow/source/engine/activities/continuousactivitybase.hxx b/slideshow/source/engine/activities/continuousactivitybase.hxx index 8d1a7c037792..dac552f5c80a 100644 --- a/slideshow/source/engine/activities/continuousactivitybase.hxx +++ b/slideshow/source/engine/activities/continuousactivitybase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,19 +53,19 @@ namespace slideshow This method will be called from perform(), already equipped with the modified time (nMinNumberOfFrames, repeat, acceleration and deceleration taken into account). - + @param nModifiedTime Already accelerated/decelerated and repeated time, always in the [0,1] range. - + @param nRepeatCount Number of full repeats already performed */ virtual void perform( double nModifiedTime, sal_uInt32 nRepeatCount ) const = 0; /// From SimpleContinuousActivityBase class - virtual void simplePerform( double nSimpleTime, - sal_uInt32 nRepeatCount ) const; + virtual void simplePerform( double nSimpleTime, + sal_uInt32 nRepeatCount ) const; }; } } diff --git a/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx b/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx index 5c6943614437..facfedec5ffa 100644 --- a/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx +++ b/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ namespace slideshow SimpleContinuousActivityBase( rParms ), maLerper( rParms.maDiscreteTimes ) { - ENSURE_OR_THROW( rParms.maDiscreteTimes.size() > 1, + ENSURE_OR_THROW( rParms.maDiscreteTimes.size() > 1, "ContinuousKeyTimeActivityBase::ContinuousKeyTimeActivityBase(): key times vector must have two entries or more" ); ENSURE_OR_THROW( rParms.maDiscreteTimes.front() == 0.0, "ContinuousKeyTimeActivityBase::ContinuousKeyTimeActivityBase(): key times vector first entry must be zero" ); @@ -56,18 +56,18 @@ namespace slideshow "ContinuousKeyTimeActivityBase::ContinuousKeyTimeActivityBase(): key times vector last entry must be less or equal 1" ); } - void ContinuousKeyTimeActivityBase::simplePerform( double nSimpleTime, - sal_uInt32 nRepeatCount ) const + void ContinuousKeyTimeActivityBase::simplePerform( double nSimpleTime, + sal_uInt32 nRepeatCount ) const { // calc simple time from global time - sweep through the - // array multiple times for repeated animations (according to + // array multiple times for repeated animations (according to // SMIL spec). double fAlpha( calcAcceleratedTime( nSimpleTime ) ); std::ptrdiff_t nIndex; boost::tuples::tie(nIndex,fAlpha) = maLerper.lerp(fAlpha); - perform( + perform( nIndex, fAlpha, nRepeatCount ); diff --git a/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx b/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx index cb851bab3730..5d133e857f12 100644 --- a/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx +++ b/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,24 +55,24 @@ namespace slideshow This method will be called from perform(), already equipped with the modified time (nMinNumberOfFrames, repeat, acceleration and deceleration taken into account). - + @param nIndex Current index of the key times/key values. - + @param nFractionalIndex Fractional value from the [0,1] range, specifying the position between nIndex and nIndex+1. - + @param nRepeatCount Number of full repeats already performed */ - virtual void perform( sal_uInt32 nIndex, - double nFractionalIndex, - sal_uInt32 nRepeatCount ) const = 0; + virtual void perform( sal_uInt32 nIndex, + double nFractionalIndex, + sal_uInt32 nRepeatCount ) const = 0; /// From SimpleContinuousActivityBase class - virtual void simplePerform( double nSimpleTime, - sal_uInt32 nRepeatCount ) const; + virtual void simplePerform( double nSimpleTime, + sal_uInt32 nRepeatCount ) const; private: const ::basegfx::tools::KeyStopLerp maLerper; diff --git a/slideshow/source/engine/activities/discreteactivitybase.cxx b/slideshow/source/engine/activities/discreteactivitybase.cxx index 34f3fe285207..32bf0494d737 100644 --- a/slideshow/source/engine/activities/discreteactivitybase.cxx +++ b/slideshow/source/engine/activities/discreteactivitybase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ namespace slideshow ENSURE_OR_THROW( mpWakeupEvent, "DiscreteActivityBase::DiscreteActivityBase(): Invalid wakeup event" ); - ENSURE_OR_THROW( !maDiscreteTimes.empty(), + ENSURE_OR_THROW( !maDiscreteTimes.empty(), "DiscreteActivityBase::DiscreteActivityBase(): time vector is empty, why do you create me?" ); #ifdef DBG_UTIL @@ -60,7 +60,7 @@ namespace slideshow for( ::std::size_t i=1, len=maDiscreteTimes.size(); i<len; ++i ) { if( maDiscreteTimes[i] < 0.0 || - maDiscreteTimes[i] > 1.0 || + maDiscreteTimes[i] > 1.0 || maDiscreteTimes[i-1] < 0.0 || maDiscreteTimes[i-1] > 1.0 ) { @@ -81,8 +81,8 @@ namespace slideshow mpWakeupEvent->start(); } - sal_uInt32 DiscreteActivityBase::calcFrameIndex( sal_uInt32 nCurrCalls, - ::std::size_t nVectorSize ) const + sal_uInt32 DiscreteActivityBase::calcFrameIndex( sal_uInt32 nCurrCalls, + ::std::size_t nVectorSize ) const { if( isAutoReverse() ) { @@ -103,8 +103,8 @@ namespace slideshow } } - sal_uInt32 DiscreteActivityBase::calcRepeatCount( sal_uInt32 nCurrCalls, - ::std::size_t nVectorSize ) const + sal_uInt32 DiscreteActivityBase::calcRepeatCount( sal_uInt32 nCurrCalls, + ::std::size_t nVectorSize ) const { if( isAutoReverse() ) return nCurrCalls / (2*nVectorSize); // we've got 2 cycles per repeat @@ -125,11 +125,11 @@ namespace slideshow // TODO(Q3): Refactor this mess - // call derived class with current frame index (modulo + // call derived class with current frame index (modulo // vector size, to cope with repeats) - perform( calcFrameIndex( mnCurrPerformCalls, nVectorSize ), + perform( calcFrameIndex( mnCurrPerformCalls, nVectorSize ), calcRepeatCount( mnCurrPerformCalls, nVectorSize ) ); - + // calc next index ++mnCurrPerformCalls; @@ -142,21 +142,21 @@ namespace slideshow if( isAutoReverse() ) nCurrRepeat /= 2.0; - // schedule next frame, if either repeat is indefinite + // schedule next frame, if either repeat is indefinite // (repeat forever), or we've not yet reached the requested // repeat count if( !isRepeatCountValid() || nCurrRepeat < getRepeatCount() ) { - // add wake-up event to queue (modulo + // add wake-up event to queue (modulo // vector size, to cope with repeats). // repeat is handled locally, only apply acceleration/deceleration. - // Scale time vector with simple duration, offset with full repeat + // Scale time vector with simple duration, offset with full repeat // times. // // Somewhat condensed, the argument for setNextTimeout below could - // be written as + // be written as // // mnSimpleDuration*(nFullRepeats + calcAcceleratedTime( currentRepeatTime )), // @@ -165,15 +165,15 @@ namespace slideshow // Note that calcAcceleratedTime() is only applied to the current repeat's value, // not to the total resulting time. This is in accordance with the SMIL spec. // - mpWakeupEvent->setNextTimeout( + mpWakeupEvent->setNextTimeout( mnSimpleDuration*( - calcRepeatCount( - mnCurrPerformCalls, - nVectorSize ) + - calcAcceleratedTime( + calcRepeatCount( + mnCurrPerformCalls, + nVectorSize ) + + calcAcceleratedTime( maDiscreteTimes[ - calcFrameIndex( - mnCurrPerformCalls, + calcFrameIndex( + mnCurrPerformCalls, nVectorSize ) ] ) ) ); getEventQueue().addEvent( mpWakeupEvent ); @@ -196,7 +196,7 @@ namespace slideshow // dispose event if( mpWakeupEvent ) mpWakeupEvent->dispose(); - + // release references mpWakeupEvent.reset(); diff --git a/slideshow/source/engine/activities/discreteactivitybase.hxx b/slideshow/source/engine/activities/discreteactivitybase.hxx index 189f19e2355e..d728335b9205 100644 --- a/slideshow/source/engine/activities/discreteactivitybase.hxx +++ b/slideshow/source/engine/activities/discreteactivitybase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,10 +53,10 @@ namespace slideshow This method is called for each discrete time instant, with nFrame denoting the frame number (starting with 0) - + @param nFrame Current frame number. - + @param nRepeatCount Number of full repeats already performed */ @@ -67,19 +67,19 @@ namespace slideshow protected: virtual void startAnimation(); - sal_uInt32 calcFrameIndex( sal_uInt32 nCurrCalls, - ::std::size_t nVectorSize ) const; + sal_uInt32 calcFrameIndex( sal_uInt32 nCurrCalls, + ::std::size_t nVectorSize ) const; - sal_uInt32 calcRepeatCount( sal_uInt32 nCurrCalls, - ::std::size_t nVectorSize ) const; + sal_uInt32 calcRepeatCount( sal_uInt32 nCurrCalls, + ::std::size_t nVectorSize ) const; ::std::size_t getNumberOfKeyTimes() const { return maDiscreteTimes.size(); } private: - WakeupEventSharedPtr mpWakeupEvent; - const ::std::vector< double > maDiscreteTimes; - const double mnSimpleDuration; - sal_uInt32 mnCurrPerformCalls; + WakeupEventSharedPtr mpWakeupEvent; + const ::std::vector< double > maDiscreteTimes; + const double mnSimpleDuration; + sal_uInt32 mnCurrPerformCalls; }; } } diff --git a/slideshow/source/engine/activities/interpolation.hxx b/slideshow/source/engine/activities/interpolation.hxx index 9409965c8846..c51998bd6bbb 100644 --- a/slideshow/source/engine/activities/interpolation.hxx +++ b/slideshow/source/engine/activities/interpolation.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,38 +42,38 @@ namespace basegfx // not-straight-forward-interpolatable types /// Specialization for RGBColor, to employ color-specific interpolator - template<> ::slideshow::internal::RGBColor lerp< ::slideshow::internal::RGBColor >( - const ::slideshow::internal::RGBColor& rFrom, - const ::slideshow::internal::RGBColor& rTo, - double t ) + template<> ::slideshow::internal::RGBColor lerp< ::slideshow::internal::RGBColor >( + const ::slideshow::internal::RGBColor& rFrom, + const ::slideshow::internal::RGBColor& rTo, + double t ) { return interpolate( rFrom, rTo, t ); } - + /// Specialization also for sal_Int16, although this code should not be called - template<> sal_Int16 lerp< sal_Int16 >( const sal_Int16&, - const sal_Int16& rTo, - double ) + template<> sal_Int16 lerp< sal_Int16 >( const sal_Int16&, + const sal_Int16& rTo, + double ) { OSL_ENSURE( false, "lerp<sal_Int16> called" ); return rTo; } - + /// Specialization also for string, although this code should not be called - template<> ::rtl::OUString lerp< ::rtl::OUString >( const ::rtl::OUString&, - const ::rtl::OUString& rTo, - double ) + template<> ::rtl::OUString lerp< ::rtl::OUString >( const ::rtl::OUString&, + const ::rtl::OUString& rTo, + double ) { OSL_ENSURE( false, "lerp<::rtl::OUString> called" ); return rTo; } - + /// Specialization also for bool, although this code should not be called - template<> bool lerp< bool >( const bool&, - const bool& rTo, - double ) + template<> bool lerp< bool >( const bool&, + const bool& rTo, + double ) { OSL_ENSURE( false, "lerp<bool> called" ); @@ -81,21 +81,21 @@ namespace basegfx } } } - + namespace slideshow { namespace internal { template< typename ValueType > struct Interpolator { - ValueType operator()( const ValueType& rFrom, - const ValueType& rTo, - double t ) const + ValueType operator()( const ValueType& rFrom, + const ValueType& rTo, + double t ) const { return basegfx::tools::lerp( rFrom, rTo, t ); } }; - + /// Specialization for HSLColor, to employ color-specific interpolator template<> struct Interpolator< HSLColor > { @@ -104,9 +104,9 @@ namespace slideshow { } - HSLColor operator()( const HSLColor& rFrom, - const HSLColor& rTo, - double t ) const + HSLColor operator()( const HSLColor& rFrom, + const HSLColor& rTo, + double t ) const { return interpolate( rFrom, rTo, t, mbCCW ); } @@ -133,10 +133,10 @@ namespace slideshow Total number of frames. Should be greater than zero. */ template< typename ValueType > ValueType lerp( const Interpolator< ValueType >& rInterpolator, - const ValueType& rFrom, - const ValueType& rTo, - sal_uInt32 nFrame, - ::std::size_t nTotalFrames ) + const ValueType& rFrom, + const ValueType& rTo, + sal_uInt32 nFrame, + ::std::size_t nTotalFrames ) { // TODO(P1): There's a nice HAKMEM trick for that // nTotalFrames > 1 condition below @@ -148,42 +148,42 @@ namespace slideshow } /// Specialization for non-interpolatable constants/enums - template<> sal_Int16 lerp< sal_Int16 >( const Interpolator< sal_Int16 >& /*rInterpolator*/, - const sal_Int16& rFrom, - const sal_Int16& rTo, - sal_uInt32 nFrame, - ::std::size_t nTotalFrames ) + template<> sal_Int16 lerp< sal_Int16 >( const Interpolator< sal_Int16 >& /*rInterpolator*/, + const sal_Int16& rFrom, + const sal_Int16& rTo, + sal_uInt32 nFrame, + ::std::size_t nTotalFrames ) { // until one half of the total frames are over, take from value. - // after that, take to value. + // after that, take to value. // For nFrames not divisable by 2, we prefer to over from, which // also neatly yields to for 1 frame activities return nFrame < nTotalFrames/2 ? rFrom : rTo; } /// Specialization for non-interpolatable strings - template<> ::rtl::OUString lerp< ::rtl::OUString >( const Interpolator< ::rtl::OUString >& /*rInterpolator*/, - const ::rtl::OUString& rFrom, - const ::rtl::OUString& rTo, - sal_uInt32 nFrame, - ::std::size_t nTotalFrames ) + template<> ::rtl::OUString lerp< ::rtl::OUString >( const Interpolator< ::rtl::OUString >& /*rInterpolator*/, + const ::rtl::OUString& rFrom, + const ::rtl::OUString& rTo, + sal_uInt32 nFrame, + ::std::size_t nTotalFrames ) { // until one half of the total frames are over, take from value. - // after that, take to value. + // after that, take to value. // For nFrames not divisable by 2, we prefer to over from, which // also neatly yields to for 1 frame activities return nFrame < nTotalFrames/2 ? rFrom : rTo; } /// Specialization for non-interpolatable bools - template<> bool lerp< bool >( const Interpolator< bool >& /*rInterpolator*/, - const bool& bFrom, - const bool& bTo, - sal_uInt32 nFrame, - ::std::size_t nTotalFrames ) + template<> bool lerp< bool >( const Interpolator< bool >& /*rInterpolator*/, + const bool& bFrom, + const bool& bTo, + sal_uInt32 nFrame, + ::std::size_t nTotalFrames ) { // until one half of the total frames are over, take from value. - // after that, take to value. + // after that, take to value. // For nFrames not divisable by 2, we prefer to over from, which // also neatly yields to for 1 frame activities return nFrame < nTotalFrames/2 ? bFrom : bTo; diff --git a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx index 9b08adc9b7b2..b2139621c18e 100644 --- a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx +++ b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ namespace slideshow void SimpleContinuousActivityBase::startAnimation() { - // init timer. We measure animation time only when we're + // init timer. We measure animation time only when we're // actually started. maTimer.reset(); } @@ -61,7 +61,7 @@ namespace slideshow ActivityBase::calcTimeLag(); if (! isActive()) return 0.0; - + // retrieve locally elapsed time const double nCurrElapsedTime( maTimer.getElapsedTime() ); @@ -74,7 +74,7 @@ namespace slideshow // here, try to spread the animator calls uniquely over // the [0,1] parameter range. Be aware of the fact that // perform will be called at least mnMinNumberOfTurns - // times. + // times. // fraction of time elapsed const double nFractionElapsedTime( @@ -109,26 +109,26 @@ namespace slideshow VERBOSE_TRACE( "SimpleContinuousActivityBase::perform(): " "t=%f is based on number of calls", nFractionRequiredCalls ); - + // lag global time, so all other animations lag, too: return ((nFractionElapsedTime - nFractionRequiredCalls) * mnMinSimpleDuration); } } - + bool SimpleContinuousActivityBase::perform() { // call base class, for start() calls and end handling if( !ActivityBase::perform() ) return false; // done, we're ended - + // get relative animation position // =============================== - + const double nCurrElapsedTime( maTimer.getElapsedTime() ); double nT( nCurrElapsedTime / mnMinSimpleDuration ); - + // one of the stop criteria reached? // ================================= @@ -156,7 +156,7 @@ namespace slideshow // to give animation the chance to render the last // frame below bActivityEnding = true; - + // clamp animation to max permissible value nT = nEffectiveRepeat; } @@ -201,7 +201,7 @@ namespace slideshow // calc simple time and number of repeats from nT // Now, that's easy, since the fractional part of - // nT gives the relative simple time, and the + // nT gives the relative simple time, and the // integer part the number of full repeats: nRelativeSimpleTime = modf(nT, &nRepeats); diff --git a/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx b/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx index 7a8a00b3ef38..a309be1cb9f8 100644 --- a/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx +++ b/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,37 +49,37 @@ namespace slideshow virtual double calcTimeLag() const; virtual bool perform(); - + protected: /** Hook for derived classes This method will be called from perform(). - + @param nSimpleTime Simple animation time, without repeat, acceleration or deceleration applied. This value is always in the [0,1] range, the repeat is accounted for with the nRepeatCount parameter. - + @param nRepeatCount Number of full repeats already performed */ virtual void simplePerform( double nSimpleTime, sal_uInt32 nRepeatCount ) const = 0; - + virtual void startAnimation(); private: /// Time elapsed since activity started - ::canvas::tools::ElapsedTime maTimer; + ::canvas::tools::ElapsedTime maTimer; /// Simple duration of activity - const double mnMinSimpleDuration; + const double mnMinSimpleDuration; /// Minimal number of frames to show (see ActivityParameters) - const sal_uInt32 mnMinNumberOfFrames; + const sal_uInt32 mnMinNumberOfFrames; /// Actual number of frames shown until now. - sal_uInt32 mnCurrPerformCalls; + sal_uInt32 mnCurrPerformCalls; }; } } diff --git a/slideshow/source/engine/activitiesqueue.cxx b/slideshow/source/engine/activitiesqueue.cxx index c408f592cf4e..253d71c0b251 100644 --- a/slideshow/source/engine/activitiesqueue.cxx +++ b/slideshow/source/engine/activitiesqueue.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ namespace slideshow { namespace internal { - ActivitiesQueue::ActivitiesQueue( + ActivitiesQueue::ActivitiesQueue( const ::boost::shared_ptr< ::canvas::tools::ElapsedTime >& pPresTimer ) : mpTimer( pPresTimer ), maCurrentActivitiesWaiting(), @@ -61,7 +61,7 @@ namespace slideshow ActivitiesQueue::~ActivitiesQueue() { // dispose all queue entries - try + try { std::for_each( maCurrentActivitiesWaiting.begin(), maCurrentActivitiesWaiting.end(), @@ -70,7 +70,7 @@ namespace slideshow maCurrentActivitiesReinsert.end(), boost::mem_fn( &Disposable::dispose ) ); } - catch (uno::Exception &) + catch (uno::Exception &) { OSL_ENSURE( false, rtl::OUStringToOString( comphelper::anyToString( @@ -105,18 +105,18 @@ namespace slideshow double fLag = 0.0; for ( ; iPos != iEnd; ++iPos ) fLag = std::max<double>( fLag, (*iPos)->calcTimeLag() ); - if (fLag > 0.0) + if (fLag > 0.0) { mpTimer->adjustTimer( -fLag ); } - + // process list of activities while( !maCurrentActivitiesWaiting.empty() ) { // process topmost activity ActivitySharedPtr pActivity( maCurrentActivitiesWaiting.front() ); maCurrentActivitiesWaiting.pop_front(); - + bool bReinsert( false ); try @@ -135,7 +135,7 @@ namespace slideshow // circumstance. Although, do _not_ // reinsert an activity that threw // once. - + // NOTE: we explicitely don't catch(...) here, // since this will also capture segmentation // violations and the like. In such a case, we @@ -152,7 +152,7 @@ namespace slideshow // circumstance. Although, do _not_ // reinsert an activity that threw // once. - + // NOTE: we explicitely don't catch(...) here, // since this will also capture segmentation // violations and the like. In such a case, we @@ -200,7 +200,7 @@ namespace slideshow maCurrentActivitiesWaiting.end(), boost::mem_fn( &Activity::dequeued ) ); ActivityQueue().swap( maCurrentActivitiesWaiting ); - + std::for_each( maCurrentActivitiesReinsert.begin(), maCurrentActivitiesReinsert.end(), boost::mem_fn( &Activity::dequeued ) ); diff --git a/slideshow/source/engine/animatedsprite.cxx b/slideshow/source/engine/animatedsprite.cxx index 8aefe9127730..5184c2ed74ce 100644 --- a/slideshow/source/engine/animatedsprite.cxx +++ b/slideshow/source/engine/animatedsprite.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,8 +49,8 @@ namespace slideshow { namespace internal { - AnimatedSprite::AnimatedSprite( const ViewLayerSharedPtr& rViewLayer, - const ::basegfx::B2DSize& rSpriteSizePixel, + AnimatedSprite::AnimatedSprite( const ViewLayerSharedPtr& rViewLayer, + const ::basegfx::B2DSize& rSpriteSizePixel, double nSpritePrio ) : mpViewLayer( rViewLayer ), mpSprite(), @@ -64,7 +64,7 @@ namespace slideshow mbSpriteVisible( false ) { ENSURE_OR_THROW( mpViewLayer, "AnimatedSprite::AnimatedSprite(): Invalid view layer" ); - + // Add half a pixel tolerance to sprite size, since we later on compare // against it in resize(). And view transformations will almost never yield // the same data bits when transforming to device coordinates @@ -82,19 +82,19 @@ namespace slideshow const ::cppcanvas::CanvasSharedPtr pContentCanvas( mpSprite->getContentCanvas() ); pContentCanvas->clear(); - + // extract linear part of canvas view transformation // (linear means: without translational components). The // only translation that is imposed at the view transform // is the local content pixel offset. - // + // // We can apply that directly here, no need to call // aLinearTransform.translate(), since, as said above, the // last column of aLinearTransform is assumed [0 0 1] ::basegfx::B2DHomMatrix aLinearTransform( mpViewLayer->getTransformation() ); aLinearTransform.set( 0, 2, maContentPixelOffset.getX() ); aLinearTransform.set( 1, 2, maContentPixelOffset.getY() ); - + // apply linear part of canvas view transformation to sprite canvas pContentCanvas->setTransformation( aLinearTransform ); @@ -112,9 +112,9 @@ namespace slideshow // implementations are limited to such sprite sizes // (otherwise, those implementations would internally // round up, too, wasting precious mem). - ::basegfx::B2DSize aNewSize( maEffectiveSpriteSizePixel ); - bool bNeedResize( false ); - + ::basegfx::B2DSize aNewSize( maEffectiveSpriteSizePixel ); + bool bNeedResize( false ); + if( rSpriteSizePixel.getX() > maEffectiveSpriteSizePixel.getX() || rSpriteSizePixel.getX() < 0.5*maEffectiveSpriteSizePixel.getX() ) { @@ -144,7 +144,7 @@ namespace slideshow mpSprite = mpViewLayer->createSprite( maEffectiveSpriteSizePixel, mnSpritePrio ); - ENSURE_OR_THROW( mpSprite, + ENSURE_OR_THROW( mpSprite, "AnimatedSprite::resize(): Could not create new sprite" ); // set attributes similar to previous sprite @@ -214,7 +214,7 @@ namespace slideshow mpSprite->hide(); mbSpriteVisible = false; } - + void AnimatedSprite::show() { mbSpriteVisible = true; diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx index 358029e08590..4af5d8dfbdf4 100644 --- a/slideshow/source/engine/animationfactory.cxx +++ b/slideshow/source/engine/animationfactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,22 +60,22 @@ namespace slideshow namespace internal { namespace - { - // attention, there is a similar implementation of Animation in + { + // attention, there is a similar implementation of Animation in // transitions/transitionfactory.cxx - + template< typename ValueT > class TupleAnimation : public PairAnimation { public: - TupleAnimation( const ShapeManagerSharedPtr& rShapeManager, - int nFlags, - bool (ShapeAttributeLayer::*pIs1stValid)() const, - bool (ShapeAttributeLayer::*pIs2ndValid)() const, - const ValueT& rDefaultValue, - const ::basegfx::B2DSize& rReferenceSize, - double (ShapeAttributeLayer::*pGet1stValue)() const, - double (ShapeAttributeLayer::*pGet2ndValue)() const, - void (ShapeAttributeLayer::*pSetValue)( const ValueT& ) ) : + TupleAnimation( const ShapeManagerSharedPtr& rShapeManager, + int nFlags, + bool (ShapeAttributeLayer::*pIs1stValid)() const, + bool (ShapeAttributeLayer::*pIs2ndValid)() const, + const ValueT& rDefaultValue, + const ::basegfx::B2DSize& rReferenceSize, + double (ShapeAttributeLayer::*pGet1stValue)() const, + double (ShapeAttributeLayer::*pGet2ndValue)() const, + void (ShapeAttributeLayer::*pSetValue)( const ValueT& ) ) : mpShape(), mpAttrLayer(), mpShapeManager( rShapeManager ), @@ -93,20 +93,20 @@ namespace slideshow "TupleAnimation::TupleAnimation(): Invalid ShapeManager" ); ENSURE_OR_THROW( pIs1stValid && pIs2ndValid && pGet1stValue && pGet2ndValue && pSetValue, "TupleAnimation::TupleAnimation(): One of the method pointers is NULL" ); - } + } ~TupleAnimation() { end_(); } - + // Animation interface // ------------------- virtual void prefetch( const AnimatableShapeSharedPtr&, const ShapeAttributeLayerSharedPtr& ) {} - virtual void start( const AnimatableShapeSharedPtr& rShape, + virtual void start( const AnimatableShapeSharedPtr& rShape, const ShapeAttributeLayerSharedPtr& rAttrLayer ) { OSL_ENSURE( !mpShape, @@ -130,7 +130,7 @@ namespace slideshow mpShapeManager->enterAnimationMode( mpShape ); } } - + virtual void end() { end_(); } void end_() { @@ -166,7 +166,7 @@ namespace slideshow if( mpShape->isContentChanged() ) mpShapeManager->notifyShapeUpdate( mpShape ); - + return true; } @@ -198,31 +198,31 @@ namespace slideshow } private: - AnimatableShapeSharedPtr mpShape; - ShapeAttributeLayerSharedPtr mpAttrLayer; - ShapeManagerSharedPtr mpShapeManager; - bool (ShapeAttributeLayer::*mpIs1stValidFunc)() const; - bool (ShapeAttributeLayer::*mpIs2ndValidFunc)() const; - double (ShapeAttributeLayer::*mpGet1stValueFunc)() const; - double (ShapeAttributeLayer::*mpGet2ndValueFunc)() const; - void (ShapeAttributeLayer::*mpSetValueFunc)( const ValueT& ); - - const int mnFlags; - - const ::basegfx::B2DSize maReferenceSize; - const ValueT maDefaultValue; - bool mbAnimationStarted; + AnimatableShapeSharedPtr mpShape; + ShapeAttributeLayerSharedPtr mpAttrLayer; + ShapeManagerSharedPtr mpShapeManager; + bool (ShapeAttributeLayer::*mpIs1stValidFunc)() const; + bool (ShapeAttributeLayer::*mpIs2ndValidFunc)() const; + double (ShapeAttributeLayer::*mpGet1stValueFunc)() const; + double (ShapeAttributeLayer::*mpGet2ndValueFunc)() const; + void (ShapeAttributeLayer::*mpSetValueFunc)( const ValueT& ); + + const int mnFlags; + + const ::basegfx::B2DSize maReferenceSize; + const ValueT maDefaultValue; + bool mbAnimationStarted; }; class PathAnimation : public NumberAnimation { public: - PathAnimation( const ::rtl::OUString& rSVGDPath, + PathAnimation( const ::rtl::OUString& rSVGDPath, sal_Int16 nAdditive, - const ShapeManagerSharedPtr& rShapeManager, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - int nFlags ) : + int nFlags ) : maPathPoly(), mpShape(), mpAttrLayer(), @@ -237,13 +237,13 @@ namespace slideshow "PathAnimation::PathAnimation(): Invalid ShapeManager" ); ::basegfx::B2DPolyPolygon aPolyPoly; - + ENSURE_OR_THROW( ::basegfx::tools::importFromSvgD( aPolyPoly, rSVGDPath ), "PathAnimation::PathAnimation(): failed to parse SVG:d path" ); ENSURE_OR_THROW( aPolyPoly.count() == 1, "PathAnimation::PathAnimation(): motion path consists of multiple/zero polygon(s)" ); - // TODO(F2): Since getPositionRelative() currently + // TODO(F2): Since getPositionRelative() currently // cannot handle beziers, have to subdivide. // AW: Should be no longer necessary; getPositionRelative is now bezier-safe maPathPoly = ::basegfx::tools::adaptiveSubdivideByAngle(aPolyPoly.getB2DPolygon(0) ); @@ -260,7 +260,7 @@ namespace slideshow const ShapeAttributeLayerSharedPtr& ) {} - virtual void start( const AnimatableShapeSharedPtr& rShape, + virtual void start( const AnimatableShapeSharedPtr& rShape, const ShapeAttributeLayerSharedPtr& rAttrLayer ) { OSL_ENSURE( !mpShape, @@ -278,7 +278,7 @@ namespace slideshow // TODO(F1): Check whether _shape_ bounds are correct here. // Theoretically, our AttrLayer is way down the stack, and - // we only have to consider _that_ value, not the one from + // we only have to consider _that_ value, not the one from // the top of the stack as returned by Shape::getBounds() if( mnAdditive == animations::AnimationAdditiveMode::SUM ) maShapeOrig = mpShape->getBounds().getCenter(); @@ -293,7 +293,7 @@ namespace slideshow mpShapeManager->enterAnimationMode( mpShape ); } } - + virtual void end() { end_(); } void end_() { @@ -337,7 +337,7 @@ namespace slideshow if( mpShape->isContentChanged() ) mpShapeManager->notifyShapeUpdate( mpShape ); - + return true; } @@ -346,22 +346,22 @@ namespace slideshow ENSURE_OR_THROW( mpAttrLayer, "PathAnimation::getUnderlyingValue(): Invalid ShapeAttributeLayer" ); - return 0.0; // though this should be used in concert with + return 0.0; // though this should be used in concert with // ActivitiesFactory::createSimpleActivity, better // explicitely name our start value. // Permissible range for operator() above is [0,1] } private: - ::basegfx::B2DPolygon maPathPoly; - AnimatableShapeSharedPtr mpShape; - ShapeAttributeLayerSharedPtr mpAttrLayer; - ShapeManagerSharedPtr mpShapeManager; - const ::basegfx::B2DSize maPageSize; - ::basegfx::B2DPoint maShapeOrig; - const int mnFlags; - bool mbAnimationStarted; - sal_Int16 mnAdditive; + ::basegfx::B2DPolygon maPathPoly; + AnimatableShapeSharedPtr mpShape; + ShapeAttributeLayerSharedPtr mpAttrLayer; + ShapeManagerSharedPtr mpShapeManager; + const ::basegfx::B2DSize maPageSize; + ::basegfx::B2DPoint maShapeOrig; + const int mnFlags; + bool mbAnimationStarted; + sal_Int16 mnAdditive; }; @@ -421,14 +421,14 @@ namespace slideshow Modifies up values before passing them to the pSetValue method. Must provide operator()( const ValueT& ) method. */ - GenericAnimation( const ShapeManagerSharedPtr& rShapeManager, - int nFlags, - bool (ShapeAttributeLayer::*pIsValid)() const, - const ValueT& rDefaultValue, - ValueT (ShapeAttributeLayer::*pGetValue)() const, - void (ShapeAttributeLayer::*pSetValue)( const ValueT& ), - const ModifierFunctor& rGetterModifier, - const ModifierFunctor& rSetterModifier ) : + GenericAnimation( const ShapeManagerSharedPtr& rShapeManager, + int nFlags, + bool (ShapeAttributeLayer::*pIsValid)() const, + const ValueT& rDefaultValue, + ValueT (ShapeAttributeLayer::*pGetValue)() const, + void (ShapeAttributeLayer::*pSetValue)( const ValueT& ), + const ModifierFunctor& rGetterModifier, + const ModifierFunctor& rSetterModifier ) : mpShape(), mpAttrLayer(), mpShapeManager( rShapeManager ), @@ -451,14 +451,14 @@ namespace slideshow { end_(); } - + // Animation interface // ------------------- virtual void prefetch( const AnimatableShapeSharedPtr&, const ShapeAttributeLayerSharedPtr& ) {} - virtual void start( const AnimatableShapeSharedPtr& rShape, + virtual void start( const AnimatableShapeSharedPtr& rShape, const ShapeAttributeLayerSharedPtr& rAttrLayer ) { OSL_ENSURE( !mpShape, @@ -484,7 +484,7 @@ namespace slideshow mpShapeManager->enterAnimationMode( mpShape ); } } - + virtual void end() { end_(); } void end_() { @@ -513,8 +513,8 @@ namespace slideshow // state has been set, and corresponds to the // shape's hold state), or by the animation // node (then, it's a forced end, and we - // _have_ to snap back). - // + // _have_ to snap back). + // // To reiterate: normally, we're called from // the Activity first, thus the // notifyShapeUpdate() below will update to @@ -575,20 +575,20 @@ namespace slideshow } private: - AnimatableShapeSharedPtr mpShape; - ShapeAttributeLayerSharedPtr mpAttrLayer; - ShapeManagerSharedPtr mpShapeManager; - bool (ShapeAttributeLayer::*mpIsValidFunc)() const; - ValueT (ShapeAttributeLayer::*mpGetValueFunc)() const; - void (ShapeAttributeLayer::*mpSetValueFunc)( const ValueT& ); + AnimatableShapeSharedPtr mpShape; + ShapeAttributeLayerSharedPtr mpAttrLayer; + ShapeManagerSharedPtr mpShapeManager; + bool (ShapeAttributeLayer::*mpIsValidFunc)() const; + ValueT (ShapeAttributeLayer::*mpGetValueFunc)() const; + void (ShapeAttributeLayer::*mpSetValueFunc)( const ValueT& ); - ModifierFunctor maGetterModifier; - ModifierFunctor maSetterModifier; + ModifierFunctor maGetterModifier; + ModifierFunctor maSetterModifier; - const int mnFlags; + const int mnFlags; - const ValueT maDefaultValue; - bool mbAnimationStarted; + const ValueT maDefaultValue; + bool mbAnimationStarted; }; /** Function template wrapper around GenericAnimation template @@ -597,17 +597,17 @@ namespace slideshow Type of animation to generate (determines the interface GenericAnimation will implement). */ - template< typename AnimationBase > ::boost::shared_ptr< AnimationBase > - makeGenericAnimation( const ShapeManagerSharedPtr& rShapeManager, - int nFlags, - bool (ShapeAttributeLayer::*pIsValid)() const, - const typename AnimationBase::ValueType& rDefaultValue, + template< typename AnimationBase > ::boost::shared_ptr< AnimationBase > + makeGenericAnimation( const ShapeManagerSharedPtr& rShapeManager, + int nFlags, + bool (ShapeAttributeLayer::*pIsValid)() const, + const typename AnimationBase::ValueType& rDefaultValue, typename AnimationBase::ValueType (ShapeAttributeLayer::*pGetValue)() const, - void (ShapeAttributeLayer::*pSetValue)( const typename AnimationBase::ValueType& ) ) + void (ShapeAttributeLayer::*pSetValue)( const typename AnimationBase::ValueType& ) ) { - return ::boost::shared_ptr< AnimationBase >( - new GenericAnimation< AnimationBase, - ::std::identity< typename AnimationBase::ValueType > >( + return ::boost::shared_ptr< AnimationBase >( + new GenericAnimation< AnimationBase, + ::std::identity< typename AnimationBase::ValueType > >( rShapeManager, nFlags, pIsValid, @@ -622,7 +622,7 @@ namespace slideshow class Scaler { public: - Scaler( double nScale ) : + Scaler( double nScale ) : mnScale( nScale ) { } @@ -638,13 +638,13 @@ namespace slideshow /** Overload for NumberAnimations which need scaling (width,height,x,y currently) */ - NumberAnimationSharedPtr makeGenericAnimation( const ShapeManagerSharedPtr& rShapeManager, - int nFlags, - bool (ShapeAttributeLayer::*pIsValid)() const, - double nDefaultValue, - double (ShapeAttributeLayer::*pGetValue)() const, - void (ShapeAttributeLayer::*pSetValue)( const double& ), - double nScaleValue ) + NumberAnimationSharedPtr makeGenericAnimation( const ShapeManagerSharedPtr& rShapeManager, + int nFlags, + bool (ShapeAttributeLayer::*pIsValid)() const, + double nDefaultValue, + double (ShapeAttributeLayer::*pGetValue)() const, + void (ShapeAttributeLayer::*pSetValue)( const double& ), + double nScaleValue ) { return NumberAnimationSharedPtr( new GenericAnimation< NumberAnimation, Scaler >( rShapeManager, @@ -658,17 +658,17 @@ namespace slideshow } - uno::Any getShapeDefault( const AnimatableShapeSharedPtr& rShape, - const ::rtl::OUString& rPropertyName ) + uno::Any getShapeDefault( const AnimatableShapeSharedPtr& rShape, + const ::rtl::OUString& rPropertyName ) { uno::Reference< drawing::XShape > xShape( rShape->getXShape() ); if( !xShape.is() ) return uno::Any(); // no regular shape, no defaults available - + // extract relevant value from XShape's PropertySet - uno::Reference< beans::XPropertySet > xPropSet( xShape, + uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY ); ENSURE_OR_THROW( xPropSet.is(), @@ -677,17 +677,17 @@ namespace slideshow return xPropSet->getPropertyValue( rPropertyName ); } - template< typename ValueType > ValueType getDefault( const AnimatableShapeSharedPtr& rShape, - const ::rtl::OUString& rPropertyName ) + template< typename ValueType > ValueType getDefault( const AnimatableShapeSharedPtr& rShape, + const ::rtl::OUString& rPropertyName ) { - const uno::Any& rAny( getShapeDefault( rShape, + const uno::Any& rAny( getShapeDefault( rShape, rPropertyName ) ); if( !rAny.hasValue() ) { OSL_ENSURE( false, "getDefault(): cannot get requested shape property" ); OSL_TRACE( "getDefault(): cannot get '%s' shape property", - ::rtl::OUStringToOString( rPropertyName, + ::rtl::OUStringToOString( rPropertyName, RTL_TEXTENCODING_ASCII_US ).getStr() ); return ValueType(); } @@ -699,7 +699,7 @@ namespace slideshow { OSL_ENSURE( false, "getDefault(): cannot extract requested shape property" ); OSL_TRACE( "getDefault(): cannot extract '%s' shape property", - ::rtl::OUStringToOString( rPropertyName, + ::rtl::OUStringToOString( rPropertyName, RTL_TEXTENCODING_ASCII_US ).getStr() ); return ValueType(); } @@ -709,16 +709,16 @@ namespace slideshow } template<> RGBColor getDefault< RGBColor >( const AnimatableShapeSharedPtr& rShape, - const ::rtl::OUString& rPropertyName ) + const ::rtl::OUString& rPropertyName ) { - const uno::Any& rAny( getShapeDefault( rShape, + const uno::Any& rAny( getShapeDefault( rShape, rPropertyName ) ); if( !rAny.hasValue() ) { OSL_ENSURE( false, "getDefault(): cannot get requested shape color property" ); OSL_TRACE( "getDefault(): cannot get '%s' shape color property", - ::rtl::OUStringToOString( rPropertyName, + ::rtl::OUStringToOString( rPropertyName, RTL_TEXTENCODING_ASCII_US ).getStr() ); return RGBColor(); } @@ -730,7 +730,7 @@ namespace slideshow { OSL_ENSURE( false, "getDefault(): cannot extract requested shape color property" ); OSL_TRACE( "getDefault(): cannot extract '%s' shape color property", - ::rtl::OUStringToOString( rPropertyName, + ::rtl::OUStringToOString( rPropertyName, RTL_TEXTENCODING_ASCII_US ).getStr() ); return RGBColor(); } @@ -747,7 +747,7 @@ namespace slideshow // ATTENTION: When changing this map, also the create*PropertyAnimation() methods must // be checked and possibly adapted in their switch statements - // TODO(Q2): Since this map must be coherent with the various switch statements + // TODO(Q2): Since this map must be coherent with the various switch statements // in the create*PropertyAnimation methods, try to unify into a single method or table switch( mapAttributeName( rAttrName ) ) { @@ -807,11 +807,11 @@ namespace slideshow } } - NumberAnimationSharedPtr AnimationFactory::createNumberPropertyAnimation( const ::rtl::OUString& rAttrName, - const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + NumberAnimationSharedPtr AnimationFactory::createNumberPropertyAnimation( const ::rtl::OUString& rAttrName, + const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - int nFlags ) + int nFlags ) { // ATTENTION: When changing this map, also the classifyAttributeName() method must // be checked and possibly adapted in their switch statement @@ -852,38 +852,38 @@ namespace slideshow case ATTRIBUTE_CHAR_HEIGHT: return makeGenericAnimation<NumberAnimation>( rShapeManager, nFlags, - &ShapeAttributeLayer::isCharScaleValid, + &ShapeAttributeLayer::isCharScaleValid, 1.0, // CharHeight is a relative attribute, thus // default is 1.0 - &ShapeAttributeLayer::getCharScale, + &ShapeAttributeLayer::getCharScale, &ShapeAttributeLayer::setCharScale ); case ATTRIBUTE_CHAR_WEIGHT: return makeGenericAnimation<NumberAnimation>( rShapeManager, nFlags, - &ShapeAttributeLayer::isCharWeightValid, + &ShapeAttributeLayer::isCharWeightValid, getDefault<double>( rShape, rAttrName ), - &ShapeAttributeLayer::getCharWeight, + &ShapeAttributeLayer::getCharWeight, &ShapeAttributeLayer::setCharWeight ); case ATTRIBUTE_CHAR_ROTATION: return makeGenericAnimation<NumberAnimation>( rShapeManager, nFlags, - &ShapeAttributeLayer::isCharRotationAngleValid, + &ShapeAttributeLayer::isCharRotationAngleValid, getDefault<double>( rShape, rAttrName ), - &ShapeAttributeLayer::getCharRotationAngle, + &ShapeAttributeLayer::getCharRotationAngle, &ShapeAttributeLayer::setCharRotationAngle ); case ATTRIBUTE_HEIGHT: return makeGenericAnimation( rShapeManager, nFlags, - &ShapeAttributeLayer::isHeightValid, + &ShapeAttributeLayer::isHeightValid, // TODO(F1): Check whether _shape_ bounds are correct here. // Theoretically, our AttrLayer is way down the stack, and - // we only have to consider _that_ value, not the one from + // we only have to consider _that_ value, not the one from // the top of the stack as returned by Shape::getBounds() rShape->getBounds().getHeight(), - &ShapeAttributeLayer::getHeight, + &ShapeAttributeLayer::getHeight, &ShapeAttributeLayer::setHeight, // convert expression parser value from relative page size rSlideSize.getY() ); @@ -891,78 +891,78 @@ namespace slideshow case ATTRIBUTE_OPACITY: return makeGenericAnimation<NumberAnimation>( rShapeManager, nFlags, - &ShapeAttributeLayer::isAlphaValid, + &ShapeAttributeLayer::isAlphaValid, // TODO(F1): Provide shape default here (FillTransparency?) 1.0, - &ShapeAttributeLayer::getAlpha, + &ShapeAttributeLayer::getAlpha, &ShapeAttributeLayer::setAlpha ); case ATTRIBUTE_ROTATE: return makeGenericAnimation<NumberAnimation>( rShapeManager, nFlags, - &ShapeAttributeLayer::isRotationAngleValid, + &ShapeAttributeLayer::isRotationAngleValid, // NOTE: Since we paint the shape as-is from metafile, // rotation angle is always 0.0, even for rotated shapes 0.0, - &ShapeAttributeLayer::getRotationAngle, + &ShapeAttributeLayer::getRotationAngle, &ShapeAttributeLayer::setRotationAngle ); - + case ATTRIBUTE_SKEW_X: return makeGenericAnimation<NumberAnimation>( rShapeManager, nFlags, - &ShapeAttributeLayer::isShearXAngleValid, + &ShapeAttributeLayer::isShearXAngleValid, // TODO(F1): Is there any shape property for skew? 0.0, - &ShapeAttributeLayer::getShearXAngle, + &ShapeAttributeLayer::getShearXAngle, &ShapeAttributeLayer::setShearXAngle ); - + case ATTRIBUTE_SKEW_Y: return makeGenericAnimation<NumberAnimation>( rShapeManager, nFlags, - &ShapeAttributeLayer::isShearYAngleValid, + &ShapeAttributeLayer::isShearYAngleValid, // TODO(F1): Is there any shape property for skew? 0.0, - &ShapeAttributeLayer::getShearYAngle, + &ShapeAttributeLayer::getShearYAngle, &ShapeAttributeLayer::setShearYAngle ); - + case ATTRIBUTE_WIDTH: return makeGenericAnimation( rShapeManager, nFlags, - &ShapeAttributeLayer::isWidthValid, + &ShapeAttributeLayer::isWidthValid, // TODO(F1): Check whether _shape_ bounds are correct here. // Theoretically, our AttrLayer is way down the stack, and - // we only have to consider _that_ value, not the one from + // we only have to consider _that_ value, not the one from // the top of the stack as returned by Shape::getBounds() rShape->getBounds().getWidth(), - &ShapeAttributeLayer::getWidth, + &ShapeAttributeLayer::getWidth, &ShapeAttributeLayer::setWidth, // convert expression parser value from relative page size rSlideSize.getX() ); - + case ATTRIBUTE_POS_X: return makeGenericAnimation( rShapeManager, nFlags, - &ShapeAttributeLayer::isPosXValid, + &ShapeAttributeLayer::isPosXValid, // TODO(F1): Check whether _shape_ bounds are correct here. // Theoretically, our AttrLayer is way down the stack, and - // we only have to consider _that_ value, not the one from + // we only have to consider _that_ value, not the one from // the top of the stack as returned by Shape::getBounds() rShape->getBounds().getCenterX(), - &ShapeAttributeLayer::getPosX, + &ShapeAttributeLayer::getPosX, &ShapeAttributeLayer::setPosX, // convert expression parser value from relative page size rSlideSize.getX() ); - + case ATTRIBUTE_POS_Y: return makeGenericAnimation( rShapeManager, nFlags, - &ShapeAttributeLayer::isPosYValid, + &ShapeAttributeLayer::isPosYValid, // TODO(F1): Check whether _shape_ bounds are correct here. // Theoretically, our AttrLayer is way down the stack, and - // we only have to consider _that_ value, not the one from + // we only have to consider _that_ value, not the one from // the top of the stack as returned by Shape::getBounds() rShape->getBounds().getCenterY(), - &ShapeAttributeLayer::getPosY, + &ShapeAttributeLayer::getPosY, &ShapeAttributeLayer::setPosY, // convert expression parser value from relative page size rSlideSize.getY() ); @@ -971,11 +971,11 @@ namespace slideshow return NumberAnimationSharedPtr(); } - EnumAnimationSharedPtr AnimationFactory::createEnumPropertyAnimation( const ::rtl::OUString& rAttrName, - const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + EnumAnimationSharedPtr AnimationFactory::createEnumPropertyAnimation( const ::rtl::OUString& rAttrName, + const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& /*rSlideSize*/, - int nFlags ) + int nFlags ) { // ATTENTION: When changing this map, also the classifyAttributeName() method must // be checked and possibly adapted in their switch statement @@ -1031,47 +1031,47 @@ namespace slideshow case ATTRIBUTE_FILL_STYLE: return makeGenericAnimation<EnumAnimation>( rShapeManager, nFlags, - &ShapeAttributeLayer::isFillStyleValid, + &ShapeAttributeLayer::isFillStyleValid, sal::static_int_cast<sal_Int16>( getDefault<drawing::FillStyle>( rShape, rAttrName )), - &ShapeAttributeLayer::getFillStyle, + &ShapeAttributeLayer::getFillStyle, &ShapeAttributeLayer::setFillStyle ); case ATTRIBUTE_LINE_STYLE: return makeGenericAnimation<EnumAnimation>( rShapeManager, nFlags, - &ShapeAttributeLayer::isLineStyleValid, + &ShapeAttributeLayer::isLineStyleValid, sal::static_int_cast<sal_Int16>( getDefault<drawing::LineStyle>( rShape, rAttrName )), - &ShapeAttributeLayer::getLineStyle, + &ShapeAttributeLayer::getLineStyle, &ShapeAttributeLayer::setLineStyle ); - + case ATTRIBUTE_CHAR_POSTURE: return makeGenericAnimation<EnumAnimation>( rShapeManager, nFlags, - &ShapeAttributeLayer::isCharPostureValid, + &ShapeAttributeLayer::isCharPostureValid, sal::static_int_cast<sal_Int16>( getDefault<awt::FontSlant>( rShape, rAttrName )), - &ShapeAttributeLayer::getCharPosture, + &ShapeAttributeLayer::getCharPosture, &ShapeAttributeLayer::setCharPosture ); - + case ATTRIBUTE_CHAR_UNDERLINE: return makeGenericAnimation<EnumAnimation>( rShapeManager, nFlags, - &ShapeAttributeLayer::isUnderlineModeValid, + &ShapeAttributeLayer::isUnderlineModeValid, getDefault<sal_Int16>( rShape, rAttrName ), - &ShapeAttributeLayer::getUnderlineMode, + &ShapeAttributeLayer::getUnderlineMode, &ShapeAttributeLayer::setUnderlineMode ); } - + return EnumAnimationSharedPtr(); } - ColorAnimationSharedPtr AnimationFactory::createColorPropertyAnimation( const ::rtl::OUString& rAttrName, - const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + ColorAnimationSharedPtr AnimationFactory::createColorPropertyAnimation( const ::rtl::OUString& rAttrName, + const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& /*rSlideSize*/, - int nFlags ) + int nFlags ) { // ATTENTION: When changing this map, also the classifyAttributeName() method must // be checked and possibly adapted in their switch statement @@ -1124,90 +1124,90 @@ namespace slideshow case ATTRIBUTE_CHAR_COLOR: return makeGenericAnimation<ColorAnimation>( rShapeManager, nFlags, - &ShapeAttributeLayer::isCharColorValid, + &ShapeAttributeLayer::isCharColorValid, getDefault<RGBColor>( rShape, rAttrName ), - &ShapeAttributeLayer::getCharColor, + &ShapeAttributeLayer::getCharColor, &ShapeAttributeLayer::setCharColor ); - + case ATTRIBUTE_COLOR: // TODO(F2): This is just mapped to fill color to make it work return makeGenericAnimation<ColorAnimation>( rShapeManager, nFlags, - &ShapeAttributeLayer::isFillColorValid, + &ShapeAttributeLayer::isFillColorValid, getDefault<RGBColor>( rShape, rAttrName ), - &ShapeAttributeLayer::getFillColor, + &ShapeAttributeLayer::getFillColor, &ShapeAttributeLayer::setFillColor ); - + case ATTRIBUTE_DIMCOLOR: return makeGenericAnimation<ColorAnimation>( rShapeManager, nFlags, - &ShapeAttributeLayer::isDimColorValid, + &ShapeAttributeLayer::isDimColorValid, getDefault<RGBColor>( rShape, rAttrName ), - &ShapeAttributeLayer::getDimColor, + &ShapeAttributeLayer::getDimColor, &ShapeAttributeLayer::setDimColor ); case ATTRIBUTE_FILL_COLOR: return makeGenericAnimation<ColorAnimation>( rShapeManager, nFlags, - &ShapeAttributeLayer::isFillColorValid, + &ShapeAttributeLayer::isFillColorValid, getDefault<RGBColor>( rShape, rAttrName ), - &ShapeAttributeLayer::getFillColor, + &ShapeAttributeLayer::getFillColor, &ShapeAttributeLayer::setFillColor ); - + case ATTRIBUTE_LINE_COLOR: return makeGenericAnimation<ColorAnimation>( rShapeManager, nFlags, - &ShapeAttributeLayer::isLineColorValid, + &ShapeAttributeLayer::isLineColorValid, getDefault<RGBColor>( rShape, rAttrName ), - &ShapeAttributeLayer::getLineColor, + &ShapeAttributeLayer::getLineColor, &ShapeAttributeLayer::setLineColor ); } return ColorAnimationSharedPtr(); } - PairAnimationSharedPtr AnimationFactory::createPairPropertyAnimation( const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + PairAnimationSharedPtr AnimationFactory::createPairPropertyAnimation( const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - sal_Int16 nTransformType, - int nFlags ) + sal_Int16 nTransformType, + int nFlags ) { const ::basegfx::B2DRectangle& rBounds( rShape->getBounds() ); switch( nTransformType ) { case animations::AnimationTransformType::SCALE: - return PairAnimationSharedPtr( - new TupleAnimation< ::basegfx::B2DSize >( + return PairAnimationSharedPtr( + new TupleAnimation< ::basegfx::B2DSize >( rShapeManager, nFlags, - &ShapeAttributeLayer::isWidthValid, - &ShapeAttributeLayer::isHeightValid, + &ShapeAttributeLayer::isWidthValid, + &ShapeAttributeLayer::isHeightValid, // TODO(F1): Check whether _shape_ bounds are correct here. // Theoretically, our AttrLayer is way down the stack, and - // we only have to consider _that_ value, not the one from + // we only have to consider _that_ value, not the one from // the top of the stack as returned by Shape::getBounds() rBounds.getRange(), rBounds.getRange(), - &ShapeAttributeLayer::getWidth, - &ShapeAttributeLayer::getHeight, + &ShapeAttributeLayer::getWidth, + &ShapeAttributeLayer::getHeight, &ShapeAttributeLayer::setSize ) ); case animations::AnimationTransformType::TRANSLATE: - return PairAnimationSharedPtr( - new TupleAnimation< ::basegfx::B2DPoint >( + return PairAnimationSharedPtr( + new TupleAnimation< ::basegfx::B2DPoint >( rShapeManager, nFlags, - &ShapeAttributeLayer::isPosXValid, - &ShapeAttributeLayer::isPosYValid, + &ShapeAttributeLayer::isPosXValid, + &ShapeAttributeLayer::isPosYValid, // TODO(F1): Check whether _shape_ bounds are correct here. // Theoretically, our AttrLayer is way down the stack, and - // we only have to consider _that_ value, not the one from + // we only have to consider _that_ value, not the one from // the top of the stack as returned by Shape::getBounds() rBounds.getCenter(), rSlideSize, - &ShapeAttributeLayer::getPosX, - &ShapeAttributeLayer::getPosY, + &ShapeAttributeLayer::getPosX, + &ShapeAttributeLayer::getPosY, &ShapeAttributeLayer::setPosition ) ); default: @@ -1219,11 +1219,11 @@ namespace slideshow return PairAnimationSharedPtr(); } - StringAnimationSharedPtr AnimationFactory::createStringPropertyAnimation( const ::rtl::OUString& rAttrName, - const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + StringAnimationSharedPtr AnimationFactory::createStringPropertyAnimation( const ::rtl::OUString& rAttrName, + const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& /*rSlideSize*/, - int nFlags ) + int nFlags ) { // ATTENTION: When changing this map, also the classifyAttributeName() method must // be checked and possibly adapted in their switch statement @@ -1284,20 +1284,20 @@ namespace slideshow case ATTRIBUTE_CHAR_FONT_NAME: return makeGenericAnimation<StringAnimation>( rShapeManager, nFlags, - &ShapeAttributeLayer::isFontFamilyValid, + &ShapeAttributeLayer::isFontFamilyValid, getDefault< ::rtl::OUString >( rShape, rAttrName ), - &ShapeAttributeLayer::getFontFamily, + &ShapeAttributeLayer::getFontFamily, &ShapeAttributeLayer::setFontFamily ); } return StringAnimationSharedPtr(); } - BoolAnimationSharedPtr AnimationFactory::createBoolPropertyAnimation( const ::rtl::OUString& rAttrName, - const AnimatableShapeSharedPtr& /*rShape*/, - const ShapeManagerSharedPtr& rShapeManager, + BoolAnimationSharedPtr AnimationFactory::createBoolPropertyAnimation( const ::rtl::OUString& rAttrName, + const AnimatableShapeSharedPtr& /*rShape*/, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& /*rSlideSize*/, - int nFlags ) + int nFlags ) { // ATTENTION: When changing this map, also the classifyAttributeName() method must // be checked and possibly adapted in their switch statement @@ -1358,29 +1358,29 @@ namespace slideshow case ATTRIBUTE_VISIBILITY: return makeGenericAnimation<BoolAnimation>( rShapeManager, nFlags, - &ShapeAttributeLayer::isVisibilityValid, + &ShapeAttributeLayer::isVisibilityValid, // TODO(F1): Is there a corresponding shape property? true, - &ShapeAttributeLayer::getVisibility, + &ShapeAttributeLayer::getVisibility, &ShapeAttributeLayer::setVisibility ); } return BoolAnimationSharedPtr(); } - NumberAnimationSharedPtr AnimationFactory::createPathMotionAnimation( const ::rtl::OUString& rSVGDPath, - sal_Int16 nAdditive, - const AnimatableShapeSharedPtr& /*rShape*/, - const ShapeManagerSharedPtr& rShapeManager, + NumberAnimationSharedPtr AnimationFactory::createPathMotionAnimation( const ::rtl::OUString& rSVGDPath, + sal_Int16 nAdditive, + const AnimatableShapeSharedPtr& /*rShape*/, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - int nFlags ) + int nFlags ) { - return NumberAnimationSharedPtr( + return NumberAnimationSharedPtr( new PathAnimation( rSVGDPath, nAdditive, rShapeManager, rSlideSize, nFlags ) ); } - + } } diff --git a/slideshow/source/engine/animationnodes/animationaudionode.cxx b/slideshow/source/engine/animationnodes/animationaudionode.cxx index c4efc7c4df34..bcd694d8d4d2 100644 --- a/slideshow/source/engine/animationnodes/animationaudionode.cxx +++ b/slideshow/source/engine/animationnodes/animationaudionode.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace slideshow { namespace internal { AnimationAudioNode::AnimationAudioNode( - const uno::Reference< animations::XAnimationNode >& xNode, + const uno::Reference< animations::XAnimationNode >& xNode, const BaseContainerNodeSharedPtr& rParent, const NodeContext& rContext ) : BaseNode( xNode, rParent, rContext ), @@ -54,10 +54,10 @@ AnimationAudioNode::AnimationAudioNode( mpPlayer() { mxAudioNode->getSource() >>= maSoundURL; - + OSL_ENSURE( maSoundURL.getLength(), "could not extract sound source URL/empty URL string" ); - + ENSURE_OR_THROW( getContext().mxComponentContext.is(), "Invalid component context" ); } @@ -72,21 +72,21 @@ void AnimationAudioNode::dispose() void AnimationAudioNode::activate_st() { createPlayer(); - + AnimationEventHandlerSharedPtr aHandler( boost::dynamic_pointer_cast<AnimationEventHandler>( getSelf() ) ); OSL_ENSURE( aHandler, "could not cast self to AnimationEventHandler?" ); getContext().mrEventMultiplexer.addCommandStopAudioHandler( aHandler ); - - if (mpPlayer && mpPlayer->startPlayback()) + + if (mpPlayer && mpPlayer->startPlayback()) { // TODO(F2): Handle end time attribute, too - if( getXAnimationNode()->getDuration().hasValue() ) + if( getXAnimationNode()->getDuration().hasValue() ) { scheduleDeactivationEvent(); } - else + else { // no node duration. Take inherent media time, then scheduleDeactivationEvent( @@ -95,7 +95,7 @@ void AnimationAudioNode::activate_st() "AnimationAudioNode::deactivate with delay") ); } } - else + else { // deactivate ASAP: scheduleDeactivationEvent( @@ -114,14 +114,14 @@ void AnimationAudioNode::deactivate_st( NodeState /*eDestState*/ ) OSL_ENSURE( aHandler, "could not cas self to AnimationEventHandler?" ); getContext().mrEventMultiplexer.removeCommandStopAudioHandler( aHandler ); - + // force-end sound - if (mpPlayer) + if (mpPlayer) { mpPlayer->stopPlayback(); resetPlayer(); } - + // notify _after_ state change: getContext().mrEventQueue.addEvent( makeEvent( boost::bind( &EventMultiplexer::notifyAudioStopped, @@ -142,14 +142,14 @@ void AnimationAudioNode::createPlayer() const { if (mpPlayer) return; - - try + + try { mpPlayer = SoundPlayer::create( getContext().mrEventMultiplexer, maSoundURL, getContext().mxComponentContext ); } - catch( lang::NoSupportException& ) + catch( lang::NoSupportException& ) { // catch possible exceptions from SoundPlayer, // since being not able to playback the sound @@ -160,7 +160,7 @@ void AnimationAudioNode::createPlayer() const void AnimationAudioNode::resetPlayer() const { - if (mpPlayer) + if (mpPlayer) { mpPlayer->stopPlayback(); mpPlayer->dispose(); diff --git a/slideshow/source/engine/animationnodes/animationaudionode.hxx b/slideshow/source/engine/animationnodes/animationaudionode.hxx index 60f0da8d863f..1fd2e4699905 100644 --- a/slideshow/source/engine/animationnodes/animationaudionode.hxx +++ b/slideshow/source/engine/animationnodes/animationaudionode.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ namespace slideshow { namespace internal { /** Audio node. - + This animation node contains an audio effect. Duration and start/stop behaviour is affected by the referenced audio file. @@ -46,27 +46,27 @@ class AnimationAudioNode : public BaseNode, public AnimationEventHandler public: AnimationAudioNode( ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> const& xNode, + ::com::sun::star::animations::XAnimationNode> const& xNode, ::boost::shared_ptr<BaseContainerNode> const& pParent, NodeContext const& rContext ); - + protected: virtual void dispose(); - + private: virtual void activate_st(); virtual void deactivate_st( NodeState eDestState ); virtual bool hasPendingAnimation() const; - + /// overriden, because we need to deal with STOPAUDIO commands virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode ); - + private: - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAudio > mxAudioNode; ::rtl::OUString maSoundURL; mutable SoundPlayerSharedPtr mpPlayer; - + void createPlayer() const; void resetPlayer() const; }; diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx b/slideshow/source/engine/animationnodes/animationbasenode.cxx index 370d646a4f43..fd3549a5fd56 100644 --- a/slideshow/source/engine/animationnodes/animationbasenode.cxx +++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ namespace slideshow { namespace internal { AnimationBaseNode::AnimationBaseNode( - const uno::Reference< animations::XAnimationNode >& xNode, + const uno::Reference< animations::XAnimationNode >& xNode, const BaseContainerNodeSharedPtr& rParent, const NodeContext& rContext ) : BaseNode( xNode, rParent, rContext ), @@ -69,13 +69,13 @@ AnimationBaseNode::AnimationBaseNode( { // extract native node targets // =========================== - + // plain shape target uno::Reference< drawing::XShape > xShape( mxAnimateNode->getTarget(), uno::UNO_QUERY ); - + // distinguish 5 cases: - // + // // - plain shape target // (NodeContext.mpMasterShapeSubset full set) // @@ -99,7 +99,7 @@ AnimationBaseNode::AnimationBaseNode( } else { - // cases 2 & 3: subset shape + // cases 2 & 3: subset shape mpShapeSubset = rContext.mpMasterShapeSubset; } } @@ -107,9 +107,9 @@ AnimationBaseNode::AnimationBaseNode( { // no parent-provided shape, try to extract // from XAnimationNode - cases 4 and 5 - + if( xShape.is() ) - { + { mpShape = lookupAttributableShape( getContext().mpSubsettableShapeManager, xShape ); } @@ -117,18 +117,18 @@ AnimationBaseNode::AnimationBaseNode( { // no shape provided. Maybe a ParagraphTarget? presentation::ParagraphTarget aTarget; - + if( !(mxAnimateNode->getTarget() >>= aTarget) ) ENSURE_OR_THROW( false, "could not extract any target information" ); - + xShape = aTarget.Shape; - + ENSURE_OR_THROW( xShape.is(), "invalid shape in ParagraphTarget" ); - + mpShape = lookupAttributableShape( getContext().mpSubsettableShapeManager, xShape ); - + // NOTE: For shapes with ParagraphTarget, we ignore // the SubItem property. We implicitely assume that it // is set to ONLY_TEXT. @@ -139,14 +139,14 @@ AnimationBaseNode::AnimationBaseNode( presentation::ShapeAnimationSubType::AS_WHOLE, "ParagraphTarget given, but subitem not AS_TEXT or AS_WHOLE? " "Make up your mind, I'll ignore the subitem." ); - + // okay, found a ParagraphTarget with a valid XShape. Does the shape // provide the given paragraph? - const DocTreeNode& rTreeNode( + const DocTreeNode& rTreeNode( mpShape->getTreeNodeSupplier().getTreeNode( - aTarget.Paragraph, + aTarget.Paragraph, DocTreeNode::NODETYPE_LOGICAL_PARAGRAPH ) ); - + // CAUTION: the creation of the subset shape // _must_ stay in the node constructor, since // Slide::prefetchShow() initializes shape @@ -156,7 +156,7 @@ AnimationBaseNode::AnimationBaseNode( new ShapeSubset( mpShape, rTreeNode, mpSubsetManager )); - + // Override NodeContext, and flag this node as // a special independent subset one. This is // important when applying initial attributes: @@ -171,7 +171,7 @@ AnimationBaseNode::AnimationBaseNode( // the slide is initially shown, and become // visible only when the effect starts. mbIsIndependentSubset = true; - + // already enable subset right here, the // setup of initial shape attributes of // course needs the subset shape @@ -188,12 +188,12 @@ void AnimationBaseNode::dispose() mpActivity->dispose(); mpActivity.reset(); } - + maAttributeLayerHolder.reset(); mxAnimateNode.clear(); mpShape.reset(); mpShapeSubset.reset(); - + BaseNode::dispose(); } @@ -204,12 +204,12 @@ bool AnimationBaseNode::init_st() mpActivity->dispose(); mpActivity.reset(); } - + // note: actually disposing the activity too early might cause problems, // because on dequeued() it calls endAnimation(pAnim->end()), thus ending // animation _after_ last screen update. // review that end() is properly called (which calls endAnimation(), too). - + try { // TODO(F2): For restart functionality, we must regenerate activities, // since they are not able to reset their state (or implement _that_) @@ -219,7 +219,7 @@ bool AnimationBaseNode::init_st() OSL_ENSURE( false, rtl::OUStringToOString( comphelper::anyToString(cppu::getCaughtException()), RTL_TEXTENCODING_UTF8 ) ); - // catch and ignore. We later handle empty activities, but for + // catch and ignore. We later handle empty activities, but for // other nodes to function properly, the core functionality of // this node must remain up and running. } @@ -227,7 +227,7 @@ bool AnimationBaseNode::init_st() } bool AnimationBaseNode::resolve_st() -{ +{ // enable shape subset for automatically generated // subsets. Independent subsets are already setup // during construction time. Doing it only here @@ -246,17 +246,17 @@ void AnimationBaseNode::activate_st() { // create new attribute layer maAttributeLayerHolder.createAttributeLayer( getShape() ); - + ENSURE_OR_THROW( maAttributeLayerHolder.get(), "Could not generate shape attribute layer" ); - + // TODO(Q2): This affects the way mpActivity // works, but is performed here because of // locality (we're fiddling with the additive mode // here, anyway, and it's the only place where we // do). OTOH, maybe the complete additive mode // setup should be moved to the activities. - + // for simple by-animations, the SMIL spec // requires us to emulate "0,by-value" value list // behaviour, with additive mode forced to "sum", @@ -275,7 +275,7 @@ void AnimationBaseNode::activate_st() // determine whether an // Activity::getUnderlyingValue() yields the // DOM value, or already a summed-up conglomerate) - // + // // Note that this poses problems with our // hybrid activity duration (time or min number of frames), // since if activities @@ -290,7 +290,7 @@ void AnimationBaseNode::activate_st() maAttributeLayerHolder.get()->setAdditiveMode( mxAnimateNode->getAdditive() ); } - + // fake normal animation behaviour, even if we // show nothing. This is the appropriate way to // handle errors on Activity generation, because @@ -301,7 +301,7 @@ void AnimationBaseNode::activate_st() // supply Activity (and the underlying Animation) with // it's AttributeLayer, to perform the animation on mpActivity->setTargets( getShape(), maAttributeLayerHolder.get() ); - + // add to activities queue getContext().mrActivitiesQueue.addActivity( mpActivity ); } @@ -318,7 +318,7 @@ void AnimationBaseNode::deactivate_st( NodeState eDestState ) if (mpActivity) mpActivity->end(); } - + if (isDependentSubsettedShape()) { // for dependent subsets, remove subset shape // from layer, re-integrate subsetted part @@ -329,7 +329,7 @@ void AnimationBaseNode::deactivate_st( NodeState eDestState ) // will effectively re-integrate the subsetted // part into the original shape (whose // animation will hopefully have ended, too) - + // this statement will save a whole lot of // sprites for iterated text effects, since // those sprites will only exist during the @@ -338,26 +338,26 @@ void AnimationBaseNode::deactivate_st( NodeState eDestState ) mpShapeSubset->disableSubsetShape(); } } - + if (eDestState == ENDED) { - + // no shape anymore, no layer needed: maAttributeLayerHolder.reset(); - + if (! isDependentSubsettedShape()) { - + // for all other shapes, removing the // attribute layer quite possibly changes // shape display. Thus, force update AttributableShapeSharedPtr const pShape( getShape() ); - + // don't anybody dare to check against // pShape->isVisible() here, removing the // attribute layer might actually make the // shape invisible! getContext().mpSubsettableShapeManager->notifyShapeUpdate( pShape ); } - + if (mpActivity) { // kill activity, if still running mpActivity->dispose(); @@ -368,7 +368,7 @@ void AnimationBaseNode::deactivate_st( NodeState eDestState ) bool AnimationBaseNode::hasPendingAnimation() const { - // TODO(F1): This might not always be true. Are there 'inactive' + // TODO(F1): This might not always be true. Are there 'inactive' // animation nodes? return true; } @@ -377,7 +377,7 @@ bool AnimationBaseNode::hasPendingAnimation() const void AnimationBaseNode::showState() const { BaseNode::showState(); - + VERBOSE_TRACE( "AnimationBaseNode info: independent subset=%s", mbIsIndependentSubset ? "y" : "n" ); } @@ -387,17 +387,17 @@ ActivitiesFactory::CommonParameters AnimationBaseNode::fillCommonParameters() const { double nDuration = 0.0; - + // TODO(F3): Duration/End handling is barely there if( !(mxAnimateNode->getDuration() >>= nDuration) ) { mxAnimateNode->getEnd() >>= nDuration; // Wah. } - + // minimal duration we fallback to (avoid 0 here!) nDuration = ::std::max( 0.001, nDuration ); - + const bool bAutoReverse( mxAnimateNode->getAutoReverse() ); - + boost::optional<double> aRepeats; double nRepeats = 0; if( (mxAnimateNode->getRepeatCount() >>= nRepeats) ) { @@ -410,7 +410,7 @@ AnimationBaseNode::fillCommonParameters() const // active duration. Thus, calc repeat // count with already adapted simple // duration (twice the specified duration) - + // convert duration back to repeat counts if( bAutoReverse ) aRepeats.reset( nRepeats / (2.0 * nDuration) ); @@ -420,7 +420,7 @@ AnimationBaseNode::fillCommonParameters() const else { // no double value for both values - Timing::INDEFINITE? animations::Timing eTiming; - + if( !(mxAnimateNode->getRepeatDuration() >>= eTiming) || eTiming != animations::Timing_INDEFINITE ) { @@ -434,7 +434,7 @@ AnimationBaseNode::fillCommonParameters() const } } } - + // calc accel/decel: double nAcceleration = 0.0; double nDeceleration = 0.0; @@ -449,7 +449,7 @@ AnimationBaseNode::fillCommonParameters() const nDeceleration = std::max( nDeceleration, xAnimationNode->getDecelerate() ); } - + EventSharedPtr pEndEvent; if (pSelf) { pEndEvent = makeEvent( diff --git a/slideshow/source/engine/animationnodes/animationbasenode.hxx b/slideshow/source/engine/animationnodes/animationbasenode.hxx index fd6e92682988..e34a86d7010e 100644 --- a/slideshow/source/engine/animationnodes/animationbasenode.hxx +++ b/slideshow/source/engine/animationnodes/animationbasenode.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ namespace slideshow { namespace internal { /** Common base class for all leaf animation nodes. - + This class basically holds the target shape */ class AnimationBaseNode : public BaseNode @@ -48,36 +48,36 @@ class AnimationBaseNode : public BaseNode public: AnimationBaseNode( ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> const& xNode, + ::com::sun::star::animations::XAnimationNode> const& xNode, ::boost::shared_ptr<BaseContainerNode> const& pParent, NodeContext const& rContext ); - + #if defined(VERBOSE) && defined(DBG_UTIL) virtual void showState() const; #endif - + protected: virtual void dispose(); - + ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate> const& getXAnimateNode() const { return mxAnimateNode; } - + /// Create parameter struct for ActivitiesFactory ActivitiesFactory::CommonParameters fillCommonParameters() const; ::basegfx::B2DVector const& getSlideSize() const { return maSlideSize; } AttributableShapeSharedPtr getShape() const; - + private: virtual bool hasPendingAnimation() const; - + private: // state transition callbacks virtual bool init_st(); virtual bool resolve_st(); virtual void activate_st(); virtual void deactivate_st( NodeState eDestState ); virtual AnimationActivitySharedPtr createActivity() const = 0; - + private: /** Returns true, if this is a subset animation, and the subset is autogenerated (e.g. from an @@ -85,20 +85,20 @@ private: */ bool isDependentSubsettedShape() const { return mpShapeSubset && !mbIsIndependentSubset; } - + ShapeAttributeLayerHolder const & getAttributeLayerHolder() const { return maAttributeLayerHolder; } - + private: ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate> mxAnimateNode; ShapeAttributeLayerHolder maAttributeLayerHolder; ::basegfx::B2DVector maSlideSize; AnimationActivitySharedPtr mpActivity; - + /// When valid, this node has a plain target shape AttributableShapeSharedPtr mpShape; - /// When valid, this is a subsetted target shape + /// When valid, this is a subsetted target shape ShapeSubsetSharedPtr mpShapeSubset; SubsettableShapeManagerSharedPtr mpSubsetManager; bool mbIsIndependentSubset; diff --git a/slideshow/source/engine/animationnodes/animationcolornode.cxx b/slideshow/source/engine/animationnodes/animationcolornode.cxx index d198ef08ae54..f459de2d5f72 100644 --- a/slideshow/source/engine/animationnodes/animationcolornode.cxx +++ b/slideshow/source/engine/animationnodes/animationcolornode.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ namespace internal { namespace { /** Little wrapper for HSL to RGB mapping. - + This class implements the HSLColorAnimation interface, internally converting to RGB and forwarding to ColorAnimation. @@ -61,7 +61,7 @@ public: mpAnimation, "HSLWrapper::HSLWrapper(): Invalid color animation delegate" ); } - + virtual void prefetch( const AnimatableShapeSharedPtr&, const ShapeAttributeLayerSharedPtr& ) {} @@ -71,22 +71,22 @@ public: { mpAnimation->start( rShape, rAttrLayer ); } - + virtual void end() { mpAnimation->end(); } - + virtual bool operator()( const HSLColor& rColor ) { return (*mpAnimation)( RGBColor( rColor ) ); } - + virtual HSLColor getUnderlyingValue() const { return HSLColor( mpAnimation->getUnderlyingValue() ); } - + private: ColorAnimationSharedPtr mpAnimation; }; @@ -96,39 +96,39 @@ private: AnimationActivitySharedPtr AnimationColorNode::createActivity() const { ActivitiesFactory::CommonParameters aParms( fillCommonParameters() ); - + switch( mxColorNode->getColorInterpolation() ) { case animations::AnimationColorSpace::RGB: return ActivitiesFactory::createAnimateActivity( aParms, - AnimationFactory::createColorPropertyAnimation( + AnimationFactory::createColorPropertyAnimation( mxColorNode->getAttributeName(), getShape(), getContext().mpSubsettableShapeManager, getSlideSize() ), getXAnimateNode() ); - + case animations::AnimationColorSpace::HSL: // Wrap a plain ColorAnimation with the HSL // wrapper, which implements the HSLColorAnimation - // interface, and internally converts HSL to RGB color + // interface, and internally converts HSL to RGB color return ActivitiesFactory::createAnimateActivity( aParms, HSLColorAnimationSharedPtr( new HSLWrapper( - AnimationFactory::createColorPropertyAnimation( + AnimationFactory::createColorPropertyAnimation( mxColorNode->getAttributeName(), getShape(), getContext().mpSubsettableShapeManager, getSlideSize() ))), mxColorNode ); - + default: ENSURE_OR_THROW( false, "AnimationColorNode::createColorActivity(): " "Unexpected color space" ); } - + return AnimationActivitySharedPtr(); } diff --git a/slideshow/source/engine/animationnodes/animationcolornode.hxx b/slideshow/source/engine/animationnodes/animationcolornode.hxx index 9f9758cc8e70..dc203115fef5 100644 --- a/slideshow/source/engine/animationnodes/animationcolornode.hxx +++ b/slideshow/source/engine/animationnodes/animationcolornode.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,20 +39,20 @@ class AnimationColorNode : public AnimationBaseNode public: AnimationColorNode( ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> const& xNode, + ::com::sun::star::animations::XAnimationNode> const& xNode, ::boost::shared_ptr<BaseContainerNode> const& pParent, NodeContext const& rContext ) : AnimationBaseNode( xNode, pParent, rContext ), mxColorNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) {} - + #if defined(VERBOSE) && defined(DBG_UTIL) virtual const char* getDescription() const { return "AnimationColorNode"; } #endif - + private: virtual AnimationActivitySharedPtr createActivity() const; - - ::com::sun::star::uno::Reference< + + ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimateColor > mxColorNode; }; diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.cxx b/slideshow/source/engine/animationnodes/animationcommandnode.cxx index e4bfed580f23..5be8e4985208 100644 --- a/slideshow/source/engine/animationnodes/animationcommandnode.cxx +++ b/slideshow/source/engine/animationnodes/animationcommandnode.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,10 +48,10 @@ namespace slideshow { namespace internal { namespace EffectCommands = com::sun::star::presentation::EffectCommands; - -AnimationCommandNode::AnimationCommandNode( uno::Reference<animations::XAnimationNode> const& xNode, + +AnimationCommandNode::AnimationCommandNode( uno::Reference<animations::XAnimationNode> const& xNode, ::boost::shared_ptr<BaseContainerNode> const& pParent, - NodeContext const& rContext ) : + NodeContext const& rContext ) : BaseNode( xNode, pParent, rContext ), mpShape(), mxCommandNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) @@ -77,12 +77,12 @@ void AnimationCommandNode::activate_st() // the command is an ole verb. case EffectCommands::VERB: break; // the command starts playing on a media object - case EffectCommands::PLAY: + case EffectCommands::PLAY: { double fMediaTime=0.0; beans::PropertyValue aMediaTime; if( (mxCommandNode->getParameter() >>= aMediaTime) && - aMediaTime.Name.equalsAsciiL( + aMediaTime.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("MediaTime") )) { aMediaTime.Value >>= fMediaTime; @@ -118,7 +118,7 @@ void AnimationCommandNode::activate_st() getContext().mrEventMultiplexer.notifyCommandStopAudio( getSelf() ); break; } - + // deactivate ASAP: scheduleDeactivationEvent( makeEvent( boost::bind( &AnimationNode::deactivate, getSelf() ), diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.hxx b/slideshow/source/engine/animationnodes/animationcommandnode.hxx index bb6a57a7cc4a..87a38926b377 100644 --- a/slideshow/source/engine/animationnodes/animationcommandnode.hxx +++ b/slideshow/source/engine/animationnodes/animationcommandnode.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,20 +45,20 @@ class AnimationCommandNode : public BaseNode public: AnimationCommandNode( ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> const& xNode, + ::com::sun::star::animations::XAnimationNode> const& xNode, ::boost::shared_ptr<BaseContainerNode> const& pParent, NodeContext const& rContext ); - + protected: virtual void dispose(); - + private: virtual void activate_st(); virtual bool hasPendingAnimation() const; - + private: ExternalMediaShapeSharedPtr mpShape; - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::animations::XCommand > mxCommandNode; bool mbIsPaused; }; diff --git a/slideshow/source/engine/animationnodes/animationnodefactory.cxx b/slideshow/source/engine/animationnodes/animationnodefactory.cxx index 868a0b8d81ac..a3bdf9717de6 100644 --- a/slideshow/source/engine/animationnodes/animationnodefactory.cxx +++ b/slideshow/source/engine/animationnodes/animationnodefactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,13 +86,13 @@ public: NodeCreator( BaseContainerNodeSharedPtr& rParent, const NodeContext& rContext ) : mrParent( rParent ), mrContext( rContext ) {} - + void operator()( const uno::Reference< animations::XAnimationNode >& xChildNode ) const { createChild( xChildNode, mrContext ); } - + protected: void createChild( const uno::Reference< animations::XAnimationNode >& xChildNode, @@ -101,23 +101,23 @@ protected: BaseNodeSharedPtr pChild( implCreateAnimationNode( xChildNode, mrParent, rContext ) ); - + OSL_ENSURE( pChild, "NodeCreator::operator(): child creation failed" ); - - // TODO(Q1): This yields circular references, which, it seems, is + + // TODO(Q1): This yields circular references, which, it seems, is // unavoidable here if( pChild ) mrParent->appendChildNode( pChild ); } - + BaseContainerNodeSharedPtr& mrParent; const NodeContext& mrContext; }; /** Same as NodeCreator, only that NodeContext's SubsetShape is cloned for every child node. - + This is used for iterated animation node generation */ class CloningNodeCreator : private NodeCreator @@ -126,12 +126,12 @@ public: CloningNodeCreator( BaseContainerNodeSharedPtr& rParent, const NodeContext& rContext ) : NodeCreator( rParent, rContext ) {} - + void operator()( const uno::Reference< animations::XAnimationNode >& xChildNode ) const { NodeContext aContext( mrContext ); - + // TODO(Q1): There's a catch here. If you clone a // subset whose actual subsetting has already been // realized (i.e. if enableSubsetShape() has been @@ -142,12 +142,12 @@ public: // triggered here (we either clone, XOR we enable // subset initially), but one might consider // reworking DrawShape/ShapeSubset to avoid this. - + // clone ShapeSubset, since each node needs their // own version of the ShapeSubset (otherwise, // e.g. activity counting does not work - subset // would be removed after first animation node - // disables it). + // disables it). // // NOTE: this is only a problem for animation // nodes that explicitely call @@ -157,15 +157,15 @@ public: // normalize things, which does the right thing // here: the subset is only removed after _the // last_ animation node releases the shared ptr. - aContext.mpMasterShapeSubset.reset( + aContext.mpMasterShapeSubset.reset( new ShapeSubset( *aContext.mpMasterShapeSubset ) ); - + createChild( xChildNode, aContext ); } }; /** Create animation nodes for text iterations - + This method clones the animation nodes below xIterNode for every iterated shape entity. */ @@ -176,9 +176,9 @@ bool implCreateIteratedNodes( { ENSURE_OR_THROW( xIterNode.is(), "implCreateIteratedNodes(): Invalid node" ); - + const double nIntervalTimeout( xIterNode->getIterateInterval() ); - + // valid iterate interval? We're ruling out monstrous // values here, to avoid pseudo 'hangs' in the // presentation @@ -187,28 +187,28 @@ bool implCreateIteratedNodes( { return false; // not an active iteration } - + if( ::basegfx::fTools::equalZero( nIntervalTimeout ) ) OSL_TRACE( "implCreateIteratedNodes(): " "iterate interval close to zero, there's " "no point in defining such an effect " "(visually equivalent to whole-shape effect)" ); - + // Determine target shape (or subset) // ================================== - + // TODO(E1): I'm not too sure what to expect here... ENSURE_OR_RETURN_FALSE( xIterNode->getTarget().hasValue(), "implCreateIteratedNodes(): no target on ITERATE node" ); - + uno::Reference< drawing::XShape > xTargetShape( xIterNode->getTarget(), uno::UNO_QUERY ); - + presentation::ParagraphTarget aTarget; sal_Int16 nSubItem( xIterNode->getSubItem() ); bool bParagraphTarget( false ); - + if( !xTargetShape.is() ) { // no shape provided. Maybe a ParagraphTarget? @@ -217,48 +217,48 @@ bool implCreateIteratedNodes( false, "implCreateIteratedNodes(): could not extract any " "target information" ); - + xTargetShape = aTarget.Shape; - + ENSURE_OR_RETURN_FALSE( xTargetShape.is(), "implCreateIteratedNodes(): invalid shape in ParagraphTarget" ); - + // we've a paragraph target to iterate over, thus, // the whole animation container refers only to // the text nSubItem = presentation::ShapeAnimationSubType::ONLY_TEXT; - + bParagraphTarget = true; } - + // Lookup shape, and fill NodeContext // ================================== - - AttributableShapeSharedPtr pTargetShape( + + AttributableShapeSharedPtr pTargetShape( lookupAttributableShape( rContext.maContext.mpSubsettableShapeManager, xTargetShape ) ); - + const DocTreeNodeSupplier& rTreeNodeSupplier( pTargetShape->getTreeNodeSupplier() ); - + ShapeSubsetSharedPtr pTargetSubset; - + NodeContext aContext( rContext ); - + // paragraph targets already need a subset as the // master shape (they're representing only a single // paragraph) if( bParagraphTarget ) { - ENSURE_OR_RETURN_FALSE( + ENSURE_OR_RETURN_FALSE( aTarget.Paragraph >= 0 && rTreeNodeSupplier.getNumberOfTreeNodes( DocTreeNode::NODETYPE_LOGICAL_PARAGRAPH ) > aTarget.Paragraph, "implCreateIteratedNodes(): paragraph index out of range" ); - - pTargetSubset.reset( - new ShapeSubset( + + pTargetSubset.reset( + new ShapeSubset( pTargetShape, // retrieve index aTarget.Paragraph of // type PARAGRAPH from this shape @@ -266,13 +266,13 @@ bool implCreateIteratedNodes( aTarget.Paragraph, DocTreeNode::NODETYPE_LOGICAL_PARAGRAPH ), rContext.maContext.mpSubsettableShapeManager ) ); - + // iterate target is not the whole shape, but only // the selected paragraph - subset _must_ be // independent, to be able to affect visibility // independent of master shape aContext.mbIsIndependentSubset = true; - + // already enable parent subset right here, to // make potentially generated subsets subtract // their content from the parent subset (and not @@ -287,18 +287,18 @@ bool implCreateIteratedNodes( } else { - pTargetSubset.reset( + pTargetSubset.reset( new ShapeSubset( pTargetShape, rContext.maContext.mpSubsettableShapeManager )); } - + aContext.mpMasterShapeSubset = pTargetSubset; uno::Reference< animations::XAnimationNode > xNode( xIterNode, uno::UNO_QUERY_THROW ); - + // Generate subsets // ================ - + if( bParagraphTarget || nSubItem != presentation::ShapeAnimationSubType::ONLY_TEXT ) { @@ -309,7 +309,7 @@ bool implCreateIteratedNodes( // method). For ONLY_TEXT effects, // we skip this part, to animate // only the text. - // + // // OR // // prepend with subset animation for full @@ -319,15 +319,15 @@ bool implCreateIteratedNodes( // ONLY_TEXT, if a paragraph is referenced as the // master of an iteration effect. NodeCreator aCreator( rParent, aContext ); - if( !::anim::for_each_childNode( xNode, + if( !::anim::for_each_childNode( xNode, aCreator ) ) { ENSURE_OR_RETURN_FALSE( - false, + false, "implCreateIteratedNodes(): iterated child node creation failed" ); - } + } } - + // TODO(F2): This does not do the correct // thing. Having nSubItem be set to ONLY_BACKGROUND // should result in the text staying unanimated in the @@ -340,31 +340,31 @@ bool implCreateIteratedNodes( { // determine type of subitem iteration (logical // text unit to animate) - DocTreeNode::NodeType eIterateNodeType( + DocTreeNode::NodeType eIterateNodeType( DocTreeNode::NODETYPE_LOGICAL_CHARACTER_CELL ); - + switch( xIterNode->getIterateType() ) { case presentation::TextAnimationType::BY_PARAGRAPH: eIterateNodeType = DocTreeNode::NODETYPE_LOGICAL_PARAGRAPH; break; - + case presentation::TextAnimationType::BY_WORD: eIterateNodeType = DocTreeNode::NODETYPE_LOGICAL_WORD; break; - + case presentation::TextAnimationType::BY_LETTER: eIterateNodeType = DocTreeNode::NODETYPE_LOGICAL_CHARACTER_CELL; break; - + default: ENSURE_OR_THROW( false, "implCreateIteratedNodes(): " "Unexpected IterateType on XIterateContainer"); break; } - - if( bParagraphTarget && + + if( bParagraphTarget && eIterateNodeType != DocTreeNode::NODETYPE_LOGICAL_WORD && eIterateNodeType != DocTreeNode::NODETYPE_LOGICAL_CHARACTER_CELL ) { @@ -377,7 +377,7 @@ bool implCreateIteratedNodes( { // setup iteration parameters // -------------------------- - + // iterate target is the whole shape (or the // whole parent subshape), thus, can save // loads of subset shapes by generating them @@ -387,7 +387,7 @@ bool implCreateIteratedNodes( // master shape and subset (since the iterated // effects are all the same). aContext.mbIsIndependentSubset = false; - + // determine number of nodes for given subitem // type sal_Int32 nTreeNodes( 0 ); @@ -404,26 +404,26 @@ bool implCreateIteratedNodes( else { // generate normal subset - nTreeNodes = rTreeNodeSupplier.getNumberOfTreeNodes( + nTreeNodes = rTreeNodeSupplier.getNumberOfTreeNodes( eIterateNodeType ); } - - + + // iterate node, generate copies of the children for each subset // ------------------------------------------------------------- - + // NodeContext::mnStartDelay contains additional node delay. // This will make the duplicated nodes for each iteration start // increasingly later. - aContext.mnStartDelay = nIntervalTimeout; - + aContext.mnStartDelay = nIntervalTimeout; + for( sal_Int32 i=0; i<nTreeNodes; ++i ) { // create subset with the corresponding tree nodes if( bParagraphTarget ) { // create subsets relative to paragraph subset - aContext.mpMasterShapeSubset.reset( + aContext.mpMasterShapeSubset.reset( new ShapeSubset( pTargetSubset, rTreeNodeSupplier.getSubsetTreeNode( @@ -434,27 +434,27 @@ bool implCreateIteratedNodes( else { // create subsets from main shape - aContext.mpMasterShapeSubset.reset( + aContext.mpMasterShapeSubset.reset( new ShapeSubset( pTargetSubset, rTreeNodeSupplier.getTreeNode( i, eIterateNodeType ) ) ); } - + CloningNodeCreator aCreator( rParent, aContext ); - if( !::anim::for_each_childNode( xNode, + if( !::anim::for_each_childNode( xNode, aCreator ) ) { ENSURE_OR_RETURN_FALSE( false, "implCreateIteratedNodes(): " "iterated child node creation failed" ); } - + aContext.mnStartDelay += nIntervalTimeout; } } } - + // done with iterate child generation return true; } @@ -466,10 +466,10 @@ BaseNodeSharedPtr implCreateAnimationNode( { ENSURE_OR_THROW( xNode.is(), "implCreateAnimationNode(): invalid XAnimationNode" ); - + BaseNodeSharedPtr pCreatedNode; BaseContainerNodeSharedPtr pCreatedContainer; - + // create the internal node, corresponding to xNode switch( xNode->getType() ) { @@ -477,12 +477,12 @@ BaseNodeSharedPtr implCreateAnimationNode( OSL_ENSURE( false, "implCreateAnimationNode(): " "CUSTOM not yet implemented" ); return pCreatedNode; - + case animations::AnimationNodeType::PAR: pCreatedNode = pCreatedContainer = BaseContainerNodeSharedPtr( new ParallelTimeContainer( xNode, rParent, rContext ) ); break; - + case animations::AnimationNodeType::ITERATE: // map iterate container to ParallelTimeContainer. // the iterating functionality is to be found @@ -490,72 +490,72 @@ BaseNodeSharedPtr implCreateAnimationNode( pCreatedNode = pCreatedContainer = BaseContainerNodeSharedPtr( new ParallelTimeContainer( xNode, rParent, rContext ) ); break; - + case animations::AnimationNodeType::SEQ: pCreatedNode = pCreatedContainer = BaseContainerNodeSharedPtr( new SequentialTimeContainer( xNode, rParent, rContext ) ); break; - + case animations::AnimationNodeType::ANIMATE: pCreatedNode.reset( new PropertyAnimationNode( xNode, rParent, rContext ) ); break; - + case animations::AnimationNodeType::SET: pCreatedNode.reset( new AnimationSetNode( xNode, rParent, rContext ) ); break; - + case animations::AnimationNodeType::ANIMATEMOTION: pCreatedNode.reset( new AnimationPathMotionNode( xNode, rParent, rContext ) ); break; - + case animations::AnimationNodeType::ANIMATECOLOR: pCreatedNode.reset( new AnimationColorNode( xNode, rParent, rContext ) ); break; - + case animations::AnimationNodeType::ANIMATETRANSFORM: pCreatedNode.reset( new AnimationTransformNode( xNode, rParent, rContext ) ); break; - + case animations::AnimationNodeType::TRANSITIONFILTER: pCreatedNode.reset( new AnimationTransitionFilterNode( xNode, rParent, rContext ) ); break; - + case animations::AnimationNodeType::AUDIO: pCreatedNode.reset( new AnimationAudioNode( xNode, rParent, rContext ) ); break; - + case animations::AnimationNodeType::COMMAND: pCreatedNode.reset( new AnimationCommandNode( xNode, rParent, rContext ) ); break; - + default: OSL_ENSURE( false, "implCreateAnimationNode(): " "invalid AnimationNodeType" ); return pCreatedNode; } - - // TODO(Q1): This yields circular references, which, it seems, is + + // TODO(Q1): This yields circular references, which, it seems, is // unavoidable here - - // HACK: node objects need shared_ptr to themselves, + + // HACK: node objects need shared_ptr to themselves, // which we pass them here. pCreatedNode->setSelf( pCreatedNode ); - - // if we've got a container node object, recursively add + + // if we've got a container node object, recursively add // its children if( pCreatedContainer ) { uno::Reference< animations::XIterateContainer > xIterNode( xNode, uno::UNO_QUERY ); - + // when this node is an XIterateContainer with // active iterations, this method will generate // the appropriate children @@ -569,7 +569,7 @@ BaseNodeSharedPtr implCreateAnimationNode( // node attribute are incomplete for iteration // children. implCreateIteratedNodes( xIterNode, - pCreatedContainer, + pCreatedContainer, rContext ); } else @@ -583,8 +583,8 @@ BaseNodeSharedPtr implCreateAnimationNode( return BaseNodeSharedPtr(); } } - } - + } + return pCreatedNode; } @@ -598,9 +598,9 @@ AnimationNodeSharedPtr AnimationNodeFactory::createAnimationNode( ENSURE_OR_THROW( xNode.is(), "AnimationNodeFactory::createAnimationNode(): invalid XAnimationNode" ); - + return BaseNodeSharedPtr( implCreateAnimationNode( - xNode, + xNode, BaseContainerNodeSharedPtr(), // no parent NodeContext( rContext, rSlideSize ))); diff --git a/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx b/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx index 19636ef3753f..56b4fdaeddc3 100644 --- a/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx +++ b/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ AnimationActivitySharedPtr AnimationPathMotionNode::createActivity() const rtl::OUString aString; ENSURE_OR_THROW( (mxPathMotionNode->getPath() >>= aString), "no string-based SVG:d path found" ); - + ActivitiesFactory::CommonParameters const aParms( fillCommonParameters() ); return ActivitiesFactory::createSimpleActivity( aParms, diff --git a/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx b/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx index 294584778b39..8916dfc43c36 100644 --- a/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx +++ b/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,25 +37,25 @@ class AnimationPathMotionNode : public AnimationBaseNode { public: AnimationPathMotionNode( - const ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode >& xNode, + const ::com::sun::star::uno::Reference< + ::com::sun::star::animations::XAnimationNode >& xNode, const BaseContainerNodeSharedPtr& rParent, const NodeContext& rContext ) : AnimationBaseNode( xNode, rParent, rContext ), mxPathMotionNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) {} - + #if defined(VERBOSE) && defined(DBG_UTIL) virtual const char* getDescription() const { return "AnimationPathMotionNode"; } #endif - + protected: virtual void dispose(); - + private: virtual AnimationActivitySharedPtr createActivity() const; - - ::com::sun::star::uno::Reference< + + ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimateMotion > mxPathMotionNode; }; diff --git a/slideshow/source/engine/animationnodes/animationsetnode.cxx b/slideshow/source/engine/animationnodes/animationsetnode.cxx index fe5be321fdf1..4fea17017a39 100644 --- a/slideshow/source/engine/animationnodes/animationsetnode.cxx +++ b/slideshow/source/engine/animationnodes/animationsetnode.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ AnimationActivitySharedPtr AnimationSetNode::createActivity() const uno::Reference<animations::XAnimate> const xAnimateNode = getXAnimateNode(); rtl::OUString const attrName( xAnimateNode->getAttributeName() ); AttributableShapeSharedPtr const pShape( getShape() ); - + // make deactivation a two-step procedure. Normally, we // could solely rely on // BaseNode::scheduleDeactivationEvent() to deactivate() @@ -67,7 +67,7 @@ AnimationActivitySharedPtr AnimationSetNode::createActivity() const // sequentiality by letting only the set activity schedule // the deactivation event (and AnimationBaseNode // takes care for the fact when mpActivity should be zero). - + // AnimationBaseNode::fillCommonParameters() has set up // immediate deactivation as default when activity ends, but if (! isIndefiniteTiming( xAnimateNode->getDuration() )) { @@ -80,7 +80,7 @@ AnimationActivitySharedPtr AnimationSetNode::createActivity() const pSelf ), "AnimationSetNode::implScheduleDeactivationEvent"); } - + switch (AnimationFactory::classifyAttributeName( attrName )) { default: case AnimationFactory::CLASS_UNKNOWN_PROPERTY: @@ -88,22 +88,22 @@ AnimationActivitySharedPtr AnimationSetNode::createActivity() const false, "AnimationSetNode::createSetActivity(): " "Unexpected attribute class" ); break; - + case AnimationFactory::CLASS_NUMBER_PROPERTY: { NumberAnimation::ValueType aValue; - + ENSURE_OR_THROW( - extractValue( aValue, - xAnimateNode->getTo(), - pShape, + extractValue( aValue, + xAnimateNode->getTo(), + pShape, getSlideSize() ), "AnimationSetNode::createSetActivity(): " "Could not import numeric to value" ); - + return makeSetActivity( aParms, - AnimationFactory::createNumberPropertyAnimation( + AnimationFactory::createNumberPropertyAnimation( attrName, pShape, getContext().mpSubsettableShapeManager, @@ -111,22 +111,22 @@ AnimationActivitySharedPtr AnimationSetNode::createActivity() const AnimationFactory::FLAG_NO_SPRITE ), aValue ); } - + case AnimationFactory::CLASS_ENUM_PROPERTY: { EnumAnimation::ValueType aValue; - + ENSURE_OR_THROW( - extractValue( aValue, - xAnimateNode->getTo(), - pShape, + extractValue( aValue, + xAnimateNode->getTo(), + pShape, getSlideSize() ), "AnimationSetNode::createSetActivity(): " "Could not import enum to value" ); - + return makeSetActivity( aParms, - AnimationFactory::createEnumPropertyAnimation( + AnimationFactory::createEnumPropertyAnimation( attrName, pShape, getContext().mpSubsettableShapeManager, @@ -134,22 +134,22 @@ AnimationActivitySharedPtr AnimationSetNode::createActivity() const AnimationFactory::FLAG_NO_SPRITE ), aValue ); } - + case AnimationFactory::CLASS_COLOR_PROPERTY: { ColorAnimation::ValueType aValue; - + ENSURE_OR_THROW( - extractValue( aValue, - xAnimateNode->getTo(), - pShape, + extractValue( aValue, + xAnimateNode->getTo(), + pShape, getSlideSize() ), "AnimationSetNode::createSetActivity(): " "Could not import color to value" ); - + return makeSetActivity( aParms, - AnimationFactory::createColorPropertyAnimation( + AnimationFactory::createColorPropertyAnimation( attrName, pShape, getContext().mpSubsettableShapeManager, @@ -157,22 +157,22 @@ AnimationActivitySharedPtr AnimationSetNode::createActivity() const AnimationFactory::FLAG_NO_SPRITE ), aValue ); } - + case AnimationFactory::CLASS_STRING_PROPERTY: { StringAnimation::ValueType aValue; - + ENSURE_OR_THROW( - extractValue( aValue, - xAnimateNode->getTo(), - pShape, + extractValue( aValue, + xAnimateNode->getTo(), + pShape, getSlideSize() ), "AnimationSetNode::createSetActivity(): " "Could not import string to value" ); - + return makeSetActivity( aParms, - AnimationFactory::createStringPropertyAnimation( + AnimationFactory::createStringPropertyAnimation( attrName, pShape, getContext().mpSubsettableShapeManager, @@ -180,22 +180,22 @@ AnimationActivitySharedPtr AnimationSetNode::createActivity() const AnimationFactory::FLAG_NO_SPRITE ), aValue ); } - + case AnimationFactory::CLASS_BOOL_PROPERTY: { BoolAnimation::ValueType aValue; - + ENSURE_OR_THROW( - extractValue( aValue, - xAnimateNode->getTo(), - pShape, + extractValue( aValue, + xAnimateNode->getTo(), + pShape, getSlideSize() ), "AnimationSetNode::createSetActivity(): " "Could not import bool to value" ); - + return makeSetActivity( aParms, - AnimationFactory::createBoolPropertyAnimation( + AnimationFactory::createBoolPropertyAnimation( attrName, pShape, getContext().mpSubsettableShapeManager, @@ -204,7 +204,7 @@ AnimationActivitySharedPtr AnimationSetNode::createActivity() const aValue ); } } - + return AnimationActivitySharedPtr(); } diff --git a/slideshow/source/engine/animationnodes/animationsetnode.hxx b/slideshow/source/engine/animationnodes/animationsetnode.hxx index 9fe265549983..b718e23c63b4 100644 --- a/slideshow/source/engine/animationnodes/animationsetnode.hxx +++ b/slideshow/source/engine/animationnodes/animationsetnode.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,15 +37,15 @@ class AnimationSetNode : public AnimationBaseNode public: AnimationSetNode( ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> const& xNode, + ::com::sun::star::animations::XAnimationNode> const& xNode, ::boost::shared_ptr<BaseContainerNode> const& pParent, NodeContext const& rContext ) : AnimationBaseNode( xNode, pParent, rContext ) {} - + #if defined(VERBOSE) && defined(DBG_UTIL) virtual const char* getDescription() const { return "AnimationSetNode"; } #endif - + private: virtual AnimationActivitySharedPtr createActivity() const; void implScheduleDeactivationEvent(); diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.cxx b/slideshow/source/engine/animationnodes/animationtransformnode.cxx index 2279b3fc824a..bc88d1d924b5 100644 --- a/slideshow/source/engine/animationnodes/animationtransformnode.cxx +++ b/slideshow/source/engine/animationnodes/animationtransformnode.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,59 +51,59 @@ void AnimationTransformNode::dispose() AnimationActivitySharedPtr AnimationTransformNode::createActivity() const { ActivitiesFactory::CommonParameters aParms( fillCommonParameters() ); - + const sal_Int16 nTransformType( mxTransformNode->getTransformType() ); - + const AttributableShapeSharedPtr& rShape( getShape() ); - + switch( nTransformType ) { default: ENSURE_OR_THROW( false, "AnimationTransformNode::createTransformActivity(): " "Unknown transform type" ); - + case animations::AnimationTransformType::TRANSLATE: // FALLTHROUGH intended case animations::AnimationTransformType::SCALE: return ActivitiesFactory::createAnimateActivity( aParms, - AnimationFactory::createPairPropertyAnimation( - rShape, - getContext().mpSubsettableShapeManager, + AnimationFactory::createPairPropertyAnimation( + rShape, + getContext().mpSubsettableShapeManager, getSlideSize(), nTransformType ), getXAnimateNode() ); - + case animations::AnimationTransformType::ROTATE: return ActivitiesFactory::createAnimateActivity( aParms, - AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString( + AnimationFactory::createNumberPropertyAnimation( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Rotate") ), - rShape, + rShape, getContext().mpSubsettableShapeManager, getSlideSize() ), getXAnimateNode() ); - + case animations::AnimationTransformType::SKEWX: return ActivitiesFactory::createAnimateActivity( aParms, - AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString( + AnimationFactory::createNumberPropertyAnimation( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SkewX") ), - rShape, + rShape, getContext().mpSubsettableShapeManager, getSlideSize() ), getXAnimateNode() ); - + case animations::AnimationTransformType::SKEWY: return ActivitiesFactory::createAnimateActivity( aParms, - AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString( + AnimationFactory::createNumberPropertyAnimation( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SkewY") ), - rShape, + rShape, getContext().mpSubsettableShapeManager, getSlideSize() ), getXAnimateNode() ); diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.hxx b/slideshow/source/engine/animationnodes/animationtransformnode.hxx index 2fa151712235..6a8f30f2eb55 100644 --- a/slideshow/source/engine/animationnodes/animationtransformnode.hxx +++ b/slideshow/source/engine/animationnodes/animationtransformnode.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,24 +39,24 @@ class AnimationTransformNode : public AnimationBaseNode public: AnimationTransformNode( ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> const& xNode, + ::com::sun::star::animations::XAnimationNode> const& xNode, ::boost::shared_ptr<BaseContainerNode> const& pParent, NodeContext const& rContext ) : AnimationBaseNode( xNode, pParent, rContext ), mxTransformNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) {} - + #if defined(VERBOSE) && defined(DBG_UTIL) virtual const char* getDescription() const { return "AnimationTransformNode"; } #endif - + protected: virtual void dispose(); - + private: virtual AnimationActivitySharedPtr createActivity() const; - - ::com::sun::star::uno::Reference< + + ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimateTransform > mxTransformNode; }; diff --git a/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx b/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx index 9ab203c75389..382167509432 100644 --- a/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx +++ b/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx b/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx index ac8fc660280a..dd0ffe2a8588 100644 --- a/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx +++ b/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,25 +39,25 @@ class AnimationTransitionFilterNode : public AnimationBaseNode public: AnimationTransitionFilterNode( ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> const& xNode, + ::com::sun::star::animations::XAnimationNode> const& xNode, ::boost::shared_ptr<BaseContainerNode> const& pParent, NodeContext const& rContext ) : AnimationBaseNode( xNode, pParent, rContext ), mxTransitionFilterNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW) {} - + #if defined(VERBOSE) virtual const char* getDescription() const { return "AnimationTransitionFilterNode"; } #endif - + protected: virtual void dispose(); - + private: virtual AnimationActivitySharedPtr createActivity() const; - - ::com::sun::star::uno::Reference< + + ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTransitionFilter> mxTransitionFilterNode; }; diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx index 5d12390d38dd..da99624e0e1d 100644 --- a/slideshow/source/engine/animationnodes/basecontainernode.cxx +++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ namespace slideshow { namespace internal { BaseContainerNode::BaseContainerNode( - const uno::Reference< animations::XAnimationNode >& xNode, + const uno::Reference< animations::XAnimationNode >& xNode, const BaseContainerNodeSharedPtr& rParent, const NodeContext& rContext ) : BaseNode( xNode, rParent, rContext ), @@ -90,7 +90,7 @@ void BaseContainerNode::deactivate_st( NodeState eDestState ) bool BaseContainerNode::hasPendingAnimation() const { // does any of our children returns "true" on - // AnimationNode::hasPendingAnimation()? + // AnimationNode::hasPendingAnimation()? // If yes, we, too, return true VectorOfNodes::const_iterator const iEnd( maChildren.end() ); return (std::find_if( @@ -102,9 +102,9 @@ void BaseContainerNode::appendChildNode( AnimationNodeSharedPtr const& pNode ) { if (! checkValidNode()) return; - + // register derived classes as end listeners at all children. - // this is necessary to control the children animation + // this is necessary to control the children animation // sequence, and to determine our own end event if (pNode->registerDeactivatingListener( getSelf() )) { maChildren.push_back( pNode ); @@ -135,12 +135,12 @@ bool BaseContainerNode::notifyDeactivatedChild( OSL_ENSURE( false, "unknown notifier!" ); return false; } - + std::size_t const nSize = maChildren.size(); OSL_ASSERT( mnFinishedChildren < nSize ); ++mnFinishedChildren; bool const bFinished = (mnFinishedChildren >= nSize); - + // all children finished, and we've got indefinite duration? // think of ParallelTimeContainer::notifyDeactivating() // if duration given, we will be deactivated by some end event @@ -148,7 +148,7 @@ bool BaseContainerNode::notifyDeactivatedChild( if (bFinished && isDurationIndefinite()) { deactivate(); } - + return bFinished; } @@ -160,12 +160,12 @@ void BaseContainerNode::showState() const BaseNodeSharedPtr pNode = boost::shared_dynamic_cast<BaseNode>(maChildren[i]); VERBOSE_TRACE( - "Node connection: n0x%X -> n0x%X", - (const char*)this+debugGetCurrentOffset(), + "Node connection: n0x%X -> n0x%X", + (const char*)this+debugGetCurrentOffset(), (const char*)pNode.get()+debugGetCurrentOffset() ); pNode->showState(); } - + BaseNode::showState(); } #endif diff --git a/slideshow/source/engine/animationnodes/basecontainernode.hxx b/slideshow/source/engine/animationnodes/basecontainernode.hxx index 820c53e28167..99d32f8ccaff 100644 --- a/slideshow/source/engine/animationnodes/basecontainernode.hxx +++ b/slideshow/source/engine/animationnodes/basecontainernode.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,15 +39,15 @@ class BaseContainerNode : public BaseNode { public: BaseContainerNode( - ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> const& xNode, + ::com::sun::star::uno::Reference< + ::com::sun::star::animations::XAnimationNode> const& xNode, ::boost::shared_ptr<BaseContainerNode> const& pParent, NodeContext const& rContext ); - + /** Add given child node to this container */ void appendChildNode( AnimationNodeSharedPtr const& pNode ); - + #if defined(VERBOSE) && defined(DBG_UTIL) virtual void showState() const; virtual const char* getDescription() const { return "BaseContainerNode"; } @@ -56,7 +56,7 @@ public: protected: // overrides from BaseNode virtual void dispose(); - + private: virtual bool init_st(); virtual void deactivate_st( NodeState eDestState ); @@ -65,15 +65,15 @@ private: virtual void activate_st() = 0; virtual void notifyDeactivating( AnimationNodeSharedPtr const& rNotifier ) = 0; - + protected: bool isDurationIndefinite() const { return mbDurationIndefinite; } - + bool isChildNode( AnimationNodeSharedPtr const& pNode ) const; - + /// @return true: if all children have been deactivated bool notifyDeactivatedChild( AnimationNodeSharedPtr const& pChildNode ); - + template <typename FuncT> inline void forEachChildNode( FuncT const& func, int nodeStateMask = -1 ) const @@ -87,11 +87,11 @@ protected: func(pNode); } } - + typedef ::std::vector<AnimationNodeSharedPtr> VectorOfNodes; VectorOfNodes maChildren; ::std::size_t mnFinishedChildren; - + private: const bool mbDurationIndefinite; }; diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index b0cfa99c34f5..61ec04ae16d6 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,38 +70,38 @@ const int* getStateTransitionTable( sal_Int16 nRestartMode, sal_Int16 nFillMode ) { // TODO(F2): restart issues in below tables - + // transition table for restart=NEVER, fill=REMOVE static const StateTransitionTable stateTransitionTable_Never_Remove = { AnimationNode::INVALID, AnimationNode::RESOLVED|AnimationNode::ENDED, // active successors for UNRESOLVED AnimationNode::ACTIVE|AnimationNode::ENDED, // active successors for RESOLVED - AnimationNode::INVALID, + AnimationNode::INVALID, AnimationNode::ENDED, // active successors for ACTIVE: no freeze here - AnimationNode::INVALID, - AnimationNode::INVALID, - AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, AnimationNode::INVALID, // active successors for FROZEN: this state is unreachable here - AnimationNode::INVALID, - AnimationNode::INVALID, - AnimationNode::INVALID, - AnimationNode::INVALID, - AnimationNode::INVALID, - AnimationNode::INVALID, - AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, AnimationNode::ENDED // active successors for ENDED: this state is a sink here (cannot restart) }; - + // transition table for restart=WHEN_NOT_ACTIVE, fill=REMOVE static const StateTransitionTable stateTransitionTable_NotActive_Remove = { AnimationNode::INVALID, AnimationNode::RESOLVED|AnimationNode::ENDED, // active successors for UNRESOLVED AnimationNode::ACTIVE|AnimationNode::ENDED, // active successors for RESOLVED - AnimationNode::INVALID, + AnimationNode::INVALID, AnimationNode::ENDED, // active successors for ACTIVE: no freeze here - AnimationNode::INVALID, - AnimationNode::INVALID, - AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, AnimationNode::INVALID, // active successors for FROZEN: // this state is unreachable here AnimationNode::INVALID, @@ -114,13 +114,13 @@ const int* getStateTransitionTable( sal_Int16 nRestartMode, AnimationNode::ENDED|AnimationNode::RESOLVED|AnimationNode::ACTIVE // active successors for ENDED: // restart possible when ended }; - + // transition table for restart=ALWAYS, fill=REMOVE static const StateTransitionTable stateTransitionTable_Always_Remove = { AnimationNode::INVALID, AnimationNode::RESOLVED|AnimationNode::ENDED, // active successors for UNRESOLVED AnimationNode::ACTIVE|AnimationNode::ENDED, // active successors for RESOLVED - AnimationNode::INVALID, + AnimationNode::INVALID, AnimationNode::ENDED|AnimationNode::ACTIVE|AnimationNode::RESOLVED, // active successors for ACTIVE: restart AnimationNode::INVALID, AnimationNode::INVALID, @@ -136,38 +136,38 @@ const int* getStateTransitionTable( sal_Int16 nRestartMode, AnimationNode::INVALID, AnimationNode::ENDED|AnimationNode::ACTIVE|AnimationNode::RESOLVED // active successors for ENDED: restart }; - + // transition table for restart=NEVER, fill=FREEZE static const StateTransitionTable stateTransitionTable_Never_Freeze = { AnimationNode::INVALID, AnimationNode::RESOLVED|AnimationNode::ENDED, // active successors for UNRESOLVED AnimationNode::ACTIVE|AnimationNode::ENDED, // active successors for RESOLVED - AnimationNode::INVALID, + AnimationNode::INVALID, AnimationNode::FROZEN|AnimationNode::ENDED, // active successors for ACTIVE: freeze object - AnimationNode::INVALID, - AnimationNode::INVALID, - AnimationNode::INVALID, - AnimationNode::ENDED, // active successors for FROZEN: end - AnimationNode::INVALID, - AnimationNode::INVALID, - AnimationNode::INVALID, - AnimationNode::INVALID, - AnimationNode::INVALID, - AnimationNode::INVALID, - AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::ENDED, // active successors for FROZEN: end + AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, AnimationNode::ENDED, // active successors for ENDED: this state is a sink here (cannot restart) }; - + // transition table for restart=WHEN_NOT_ACTIVE, fill=FREEZE static const StateTransitionTable stateTransitionTable_NotActive_Freeze = { AnimationNode::INVALID, AnimationNode::RESOLVED|AnimationNode::ENDED, // active successors for UNRESOLVED AnimationNode::ACTIVE|AnimationNode::ENDED, // active successors for RESOLVED - AnimationNode::INVALID, + AnimationNode::INVALID, AnimationNode::FROZEN|AnimationNode::ENDED, // active successors for ACTIVE: freeze object - AnimationNode::INVALID, - AnimationNode::INVALID, - AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, AnimationNode::ENDED|AnimationNode::RESOLVED|AnimationNode::ACTIVE, // active successors for FROZEN: // restart possible when ended AnimationNode::INVALID, @@ -180,29 +180,29 @@ const int* getStateTransitionTable( sal_Int16 nRestartMode, AnimationNode::ENDED|AnimationNode::RESOLVED|AnimationNode::ACTIVE // active successors for ENDED: // restart possible when ended }; - + // transition table for restart=ALWAYS, fill=FREEZE static const StateTransitionTable stateTransitionTable_Always_Freeze = { AnimationNode::INVALID, AnimationNode::RESOLVED|AnimationNode::ENDED, // active successors for UNRESOLVED AnimationNode::ACTIVE|AnimationNode::ENDED, // active successors for RESOLVED - AnimationNode::INVALID, + AnimationNode::INVALID, AnimationNode::FROZEN|AnimationNode::ENDED|AnimationNode::ACTIVE|AnimationNode::RESOLVED, // active successors for ACTIVE: // end object, restart AnimationNode::INVALID, AnimationNode::INVALID, AnimationNode::INVALID, AnimationNode::ENDED|AnimationNode::RESOLVED|AnimationNode::ACTIVE, // active successors for FROZEN: restart possible - AnimationNode::INVALID, - AnimationNode::INVALID, - AnimationNode::INVALID, - AnimationNode::INVALID, - AnimationNode::INVALID, - AnimationNode::INVALID, - AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, + AnimationNode::INVALID, AnimationNode::ENDED|AnimationNode::ACTIVE|AnimationNode::RESOLVED // active successors for ENDED: restart }; - + static const StateTransitionTable* tableGuide[] = { &stateTransitionTable_Never_Remove, &stateTransitionTable_NotActive_Remove, @@ -211,12 +211,12 @@ const int* getStateTransitionTable( sal_Int16 nRestartMode, &stateTransitionTable_NotActive_Freeze, &stateTransitionTable_Always_Freeze }; - + int nRestartValue; switch( nRestartMode ) { default: case animations::AnimationRestart::DEFAULT: - // same value: animations::AnimationRestart::INHERIT: + // same value: animations::AnimationRestart::INHERIT: OSL_ENSURE( false, "getStateTransitionTable(): unexpected case for restart" ); // FALLTHROUGH intended @@ -230,7 +230,7 @@ const int* getStateTransitionTable( sal_Int16 nRestartMode, nRestartValue = 2; break; } - + int nFillValue; switch( nFillMode ) { default: @@ -249,7 +249,7 @@ const int* getStateTransitionTable( sal_Int16 nRestartMode, nFillValue = 1; break; } - + return *tableGuide[ 3*nFillValue + nRestartValue ]; } @@ -259,10 +259,10 @@ bool isMainSequenceRootNode_( { // detect main sequence root node (need that for // end-of-mainsequence signalling below) - beans::NamedValue const aSearchKey( + beans::NamedValue const aSearchKey( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "node-type" ) ), uno::makeAny( presentation::EffectNodeType::MAIN_SEQUENCE ) ); - + uno::Sequence<beans::NamedValue> const userData(xNode->getUserData()); return findNamedValue( userData, aSearchKey ); } @@ -278,14 +278,14 @@ class BaseNode::StateTransition : private boost::noncopyable { public: enum Options { NONE, FORCE }; - + explicit StateTransition( BaseNode * pNode ) : mpNode(pNode), meToState(INVALID) {} - + ~StateTransition() { clear(); } - + bool enter( NodeState eToState, int options = NONE ) { OSL_ENSURE( meToState == INVALID, @@ -303,7 +303,7 @@ public: meToState = eToState; return true; // in transition } - + void commit() { OSL_ENSURE( meToState != INVALID, "### nothing to commit!" ); if (meToState != INVALID) { @@ -315,7 +315,7 @@ public: // every state change of one of its nodes. // Debug_ShowNodeTree(mpNode->mpSelf); } - + void clear() { if (meToState != INVALID) { OSL_ASSERT( (mpNode->meCurrentStateTransition & meToState) != 0 ); @@ -323,13 +323,13 @@ public: meToState = INVALID; } } - + private: BaseNode *const mpNode; NodeState meToState; }; -BaseNode::BaseNode( const uno::Reference< animations::XAnimationNode >& xNode, +BaseNode::BaseNode( const uno::Reference< animations::XAnimationNode >& xNode, const BaseContainerNodeSharedPtr& rParent, const NodeContext& rContext ) : maContext( rContext.maContext ), @@ -346,7 +346,7 @@ BaseNode::BaseNode( const uno::Reference< animations::XAnimationNode >& xNode, { ENSURE_OR_THROW( mxAnimationNode.is(), "BaseNode::BaseNode(): Invalid XAnimationNode" ); - + // setup state transition table mpStateTransitionTable = getStateTransitionTable( getRestartMode(), getFillMode() ); @@ -355,7 +355,7 @@ BaseNode::BaseNode( const uno::Reference< animations::XAnimationNode >& xNode, void BaseNode::dispose() { meCurrState = INVALID; - + // discharge a loaded event, if any: if (mpCurrentEvent) { mpCurrentEvent->dispose(); @@ -383,13 +383,13 @@ sal_Int16 BaseNode::getFillMode() const sal_Int16 nFill((nTmp != animations::AnimationFill::DEFAULT && nTmp != animations::AnimationFill::INHERIT) ? nTmp : getFillDefaultMode()); - + // For AUTO fill mode, SMIL specifies that fill mode is FREEZE, // if no explicit active duration is given - // (no duration, end, repeatCount or repeatDuration given), + // (no duration, end, repeatCount or repeatDuration given), // and REMOVE otherwise if( nFill == animations::AnimationFill::AUTO ) { - return (isIndefiniteTiming( mxAnimationNode->getDuration() ) && + return (isIndefiniteTiming( mxAnimationNode->getDuration() ) && isIndefiniteTiming( mxAnimationNode->getEnd() ) && !mxAnimationNode->getRepeatCount().hasValue() && isIndefiniteTiming( mxAnimationNode->getRepeatDuration() )) @@ -450,31 +450,31 @@ bool BaseNode::resolve() { if (! checkValidNode()) return false; - + OSL_ASSERT( meCurrState != RESOLVED ); if (inStateOrTransition( RESOLVED )) return true; - + StateTransition st(this); if (st.enter( RESOLVED ) && isTransition( RESOLVED, ACTIVE ) && resolve_st() /* may call derived class */) { st.commit(); // changing state - + // discharge a loaded event, if any: if (mpCurrentEvent) mpCurrentEvent->dispose(); - + // schedule activation event: - + // This method takes the NodeContext::mnStartDelay value into account, // to cater for iterate container time shifts. We cannot put different - // iterations of the iterate container's children into different + // iterations of the iterate container's children into different // subcontainer (such as a 'DelayContainer', which delays resolving its - // children by a fixed amount), since all iterations' nodes must be + // children by a fixed amount), since all iterations' nodes must be // resolved at the same time (otherwise, the delayed subset creation - // will not work, i.e. deactivate the subsets too late in the master + // will not work, i.e. deactivate the subsets too late in the master // shape). uno::Any const aBegin( mxAnimationNode->getBegin() ); if (aBegin.hasValue()) { @@ -486,7 +486,7 @@ bool BaseNode::resolve() // For some leaf nodes, PPT import yields empty begin time, // although semantically, it should be 0.0 // TODO(F3): That should really be provided by the PPT import - + // schedule delayed activation event. Take iterate node // timeout into account mpCurrentEvent = makeDelay( @@ -495,7 +495,7 @@ bool BaseNode::resolve() "AnimationNode::activate with delay"); maContext.mrEventQueue.addEvent( mpCurrentEvent ); } - + return true; } return false; @@ -511,23 +511,23 @@ bool BaseNode::activate() { if (! checkValidNode()) return false; - + OSL_ASSERT( meCurrState != ACTIVE ); if (inStateOrTransition( ACTIVE )) return true; - + StateTransition st(this); if (st.enter( ACTIVE )) { - + activate_st(); // calling derived class - + st.commit(); // changing state - + maContext.mrEventMultiplexer.notifyAnimationStart( mpSelf ); - + return true; } - + return false; } @@ -552,12 +552,12 @@ void BaseNode::scheduleDeactivationEvent( EventSharedPtr const& pEvent ) // because the deactivation event is only scheduled // when the effect is started: the timeout is then // already respected. - + // xxx todo: // think about set node, anim base node! // if anim base node has no activity, this is called to schedule deactivatiion, // but what if it does not schedule anything? - + // TODO(F2): Handle end time attribute, too mpCurrentEvent = generateEvent( mxAnimationNode->getDuration(), @@ -570,17 +570,17 @@ void BaseNode::deactivate() { if (inStateOrTransition( ENDED | FROZEN ) || !checkValidNode()) return; - + if (isTransition( meCurrState, FROZEN, false /* no OSL_ASSERT */ )) { // do transition to FROZEN: StateTransition st(this); if (st.enter( FROZEN, StateTransition::FORCE )) { - + deactivate_st( FROZEN ); st.commit(); - + notifyEndListeners(); - + // discharge a loaded event, before going on: if (mpCurrentEvent) { mpCurrentEvent->dispose(); @@ -604,15 +604,15 @@ void BaseNode::end() bool const bIsFrozenOrInTransitionToFrozen = inStateOrTransition( FROZEN ); if (inStateOrTransition( ENDED ) || !checkValidNode()) return; - - // END must always be reachable. If not, that's an error in the + + // END must always be reachable. If not, that's an error in the // transition tables OSL_ENSURE( isTransition( meCurrState, ENDED ), "end state not reachable in transition table" ); - + StateTransition st(this); if (st.enter( ENDED, StateTransition::FORCE )) { - + deactivate_st( ENDED ); st.commit(); // changing state @@ -620,7 +620,7 @@ void BaseNode::end() // will/already notified deactivating listeners if (!bIsFrozenOrInTransitionToFrozen) notifyEndListeners(); - + // discharge a loaded event, before going on: if (mpCurrentEvent) { mpCurrentEvent->dispose(); @@ -644,10 +644,10 @@ void BaseNode::notifyEndListeners() const maDeactivatingListeners.end(), boost::bind( &AnimationNode::notifyDeactivating, _1, boost::cref(mpSelf) ) ); - + // notify state change maContext.mrEventMultiplexer.notifyAnimationEnd( mpSelf ); - + // notify main sequence end (iff we're the main // sequence root node). This is because the main // sequence determines the active duration of the @@ -670,12 +670,12 @@ bool BaseNode::registerDeactivatingListener( { if (! checkValidNode()) return false; - + ENSURE_OR_RETURN_FALSE( rNotifee, "BaseNode::registerDeactivatingListener(): invalid notifee" ); maDeactivatingListeners.push_back( rNotifee ); - + return true; } @@ -685,7 +685,7 @@ void BaseNode::setSelf( const BaseNodeSharedPtr& rSelf ) "BaseNode::setSelf(): got ptr to different object" ); ENSURE_OR_THROW( !mpSelf, "BaseNode::setSelf(): called multiple times" ); - + mpSelf = rSelf; } @@ -696,7 +696,7 @@ void BaseNode::setSelf( const BaseNodeSharedPtr& rSelf ) void BaseNode::showState() const { const AnimationNode::NodeState eNodeState( getState() ); - + if( eNodeState == AnimationNode::INVALID ) VERBOSE_TRACE( "Node state: n0x%X [label=\"%s\",style=filled," "fillcolor=\"0.5,0.2,0.5\"]", @@ -708,7 +708,7 @@ void BaseNode::showState() const (const char*)this+debugGetCurrentOffset(), getDescription(), log(double(getState()))/4.0 ); - + // determine additional node information uno::Reference<animations::XAnimate> const xAnimate( mxAnimationNode, uno::UNO_QUERY ); @@ -716,31 +716,31 @@ void BaseNode::showState() const { uno::Reference< drawing::XShape > xTargetShape( xAnimate->getTarget(), uno::UNO_QUERY ); - + if( !xTargetShape.is() ) { ::com::sun::star::presentation::ParagraphTarget aTarget; - + // no shape provided. Maybe a ParagraphTarget? if( (xAnimate->getTarget() >>= aTarget) ) xTargetShape = aTarget.Shape; } - + if( xTargetShape.is() ) { - uno::Reference< beans::XPropertySet > xPropSet( xTargetShape, + uno::Reference< beans::XPropertySet > xPropSet( xTargetShape, uno::UNO_QUERY ); - + // read shape name ::rtl::OUString aName; - if( (xPropSet->getPropertyValue( + if( (xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Name") ) ) >>= aName) ) { - const ::rtl::OString& rAsciiName( - ::rtl::OUStringToOString( aName, - RTL_TEXTENCODING_ASCII_US ) ); - + const ::rtl::OString& rAsciiName( + ::rtl::OUStringToOString( aName, + RTL_TEXTENCODING_ASCII_US ) ); + VERBOSE_TRACE( "Node info: n0x%X, name \"%s\"", (const char*)this+debugGetCurrentOffset(), rAsciiName.getStr() ); @@ -759,7 +759,7 @@ void BaseNode::showTreeFromWithin() const // find root node BaseNodeSharedPtr pCurrNode( mpSelf ); while( pCurrNode->mpParent ) pCurrNode = pCurrNode->mpParent; - + pCurrNode->showState(); } #endif diff --git a/slideshow/source/engine/animationnodes/basenode.hxx b/slideshow/source/engine/animationnodes/basenode.hxx index 2bbd9d9b51e8..eb722d6fd367 100644 --- a/slideshow/source/engine/animationnodes/basenode.hxx +++ b/slideshow/source/engine/animationnodes/basenode.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ namespace slideshow { namespace internal { /** Context for every node. - + Besides the global AnimationNodeFactory::Context data, this struct also contains the current DocTree subset for this node. If start and end index of the @@ -60,13 +60,13 @@ struct NodeContext mnStartDelay(0.0), mbIsIndependentSubset( true ) {} - - void dispose() - { - maContext.dispose(); - mpMasterShapeSubset.reset(); + + void dispose() + { + maContext.dispose(); + mpMasterShapeSubset.reset(); } - + /// Context as passed to createAnimationNode() SlideShowContext maContext; @@ -75,10 +75,10 @@ struct NodeContext /// Shape to be used (provided by parent, e.g. for iterations) ShapeSubsetSharedPtr mpMasterShapeSubset; - + /// Additional delay to node begin (to offset iterate effects) double mnStartDelay; - + /// When true, subset must be created during slide initialization bool mbIsIndependentSubset; }; @@ -93,40 +93,40 @@ class BaseNode : public AnimationNode, private ::boost::noncopyable { public: - BaseNode( ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> const& xNode, + BaseNode( ::com::sun::star::uno::Reference< + ::com::sun::star::animations::XAnimationNode> const& xNode, ::boost::shared_ptr<BaseContainerNode> const& pParent, NodeContext const& rContext ); - + /** Provide the node with a shared_ptr to itself. - + Since implementation has to create objects which need a shared_ptr to this node, and a pointee cannot retrieve a shared_ptr to itself internally, have to set that from the outside. */ void setSelf( const ::boost::shared_ptr< BaseNode >& rSelf ); - - + + #if defined(VERBOSE) && defined(DBG_UTIL) virtual void showState() const; virtual const char* getDescription() const; void showTreeFromWithin() const; #endif - + const ::boost::shared_ptr< BaseContainerNode >& getParentNode() const { return mpParent; } - + // Disposable: virtual void dispose(); - + // AnimationNode: virtual bool init(); virtual bool resolve(); virtual bool activate(); virtual void deactivate(); virtual void end(); - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode> getXAnimationNode() const; virtual NodeState getState() const; virtual bool registerDeactivatingListener( @@ -134,12 +134,12 @@ public: // nop: virtual void notifyDeactivating( const AnimationNodeSharedPtr& rNotifier ); - bool isMainSequenceRootNode() const { return mbIsMainSequenceRootNode; } + bool isMainSequenceRootNode() const { return mbIsMainSequenceRootNode; } protected: void scheduleDeactivationEvent( EventSharedPtr const& pEvent = EventSharedPtr() ); - + SlideShowContext const& getContext() const { return maContext; } ::boost::shared_ptr<BaseNode> const& getSelf() const { return mpSelf; } @@ -149,7 +149,7 @@ protected: OSL_ENSURE( bRet, "### INVALID node!" ); return bRet; } - + private: // all state affecting methods have "_st" counterparts being called at // derived classes when in state transistion: no-ops here at BaseNode... @@ -157,35 +157,35 @@ private: virtual bool resolve_st(); virtual void activate_st(); virtual void deactivate_st( NodeState eDestState ); - + private: /// notifies /// - all registered deactivation listeners /// - single animation end (every node) /// - slide animations (if main sequence root node) void notifyEndListeners() const; - + /// Get the node's restart mode sal_Int16 getRestartMode(); - + /** Get the default restart mode - + If this node's default mode is AnimationRestart::DEFAULT, this method recursively calls the parent node. */ sal_Int16 getRestartDefaultMode() const; - + /// Get the node's fill mode sal_Int16 getFillMode(); - + /** Get the default fill mode. - + If this node's default mode is AnimationFill::DEFAULT, this method recursively calls the parent node. */ sal_Int16 getFillDefaultMode() const; - + bool isTransition( NodeState eFromState, NodeState eToState, bool debugAssert = true ) const { (void) debugAssert; // avoid warning @@ -198,17 +198,17 @@ private: return ((meCurrState & mask) != 0 || (meCurrentStateTransition & mask) != 0); } - + class StateTransition; friend class StateTransition; - + private: SlideShowContext maContext; - + typedef ::std::vector< AnimationNodeSharedPtr > ListenerVector; - + ListenerVector maDeactivatingListeners; - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxAnimationNode; ::boost::shared_ptr< BaseContainerNode > mpParent; ::boost::shared_ptr< BaseNode > mpSelf; diff --git a/slideshow/source/engine/animationnodes/generateevent.cxx b/slideshow/source/engine/animationnodes/generateevent.cxx index d73cd0f0d494..ed1b8768175d 100644 --- a/slideshow/source/engine/animationnodes/generateevent.cxx +++ b/slideshow/source/engine/animationnodes/generateevent.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,15 +57,15 @@ EventSharedPtr generateEvent( double nAdditionalDelay ) { EventSharedPtr pEvent; - + if (! rEventDescription.hasValue()) return pEvent; - + animations::Timing eTiming; animations::Event aEvent; uno::Sequence<uno::Any> aSequence; double nDelay1 = 0; - + if (rEventDescription >>= eTiming) { switch (eTiming) { case animations::Timing_INDEFINITE: @@ -78,21 +78,21 @@ EventSharedPtr generateEvent( } } else if (rEventDescription >>= aEvent) { - + // try to extract additional event delay double nDelay2 = 0.0; if (aEvent.Offset.hasValue() && !(aEvent.Offset >>= nDelay2)) { OSL_ENSURE( false, "offset values apart from DOUBLE not " "recognized in animations::Event!" ); } - + // common vars used inside switch uno::Reference<animations::XAnimationNode> xNode; uno::Reference<drawing::XShape> xShape; ShapeSharedPtr pShape; - + // TODO(F1): Respect aEvent.Repeat value - + switch (aEvent.Trigger) { default: ENSURE_OR_THROW( false, "unexpected event trigger!" ); @@ -111,7 +111,7 @@ EventSharedPtr generateEvent( pEvent = makeDelay( rFunctor, nDelay2 + nAdditionalDelay, "generateEvent, BEGIN_EVENT"); - rContext.mrUserEventQueue.registerAnimationStartEvent( + rContext.mrUserEventQueue.registerAnimationStartEvent( pEvent, xNode ); } else { @@ -125,7 +125,7 @@ EventSharedPtr generateEvent( pEvent = makeDelay( rFunctor, nDelay2 + nAdditionalDelay, "generateEvent, END_EVENT"); - rContext.mrUserEventQueue.registerAnimationEndEvent( + rContext.mrUserEventQueue.registerAnimationEndEvent( pEvent, xNode ); } else { @@ -157,14 +157,14 @@ EventSharedPtr generateEvent( pEvent = makeDelay( rFunctor, nDelay2 + nAdditionalDelay, "generateEvent, ON_DBL_CLICK"); - rContext.mrUserEventQueue.registerShapeDoubleClickEvent( + rContext.mrUserEventQueue.registerShapeDoubleClickEvent( pEvent, pShape ); } else { OSL_ENSURE( false, "could not extract source XAnimationNode " "for ON_DBL_CLICK!" ); } - break; + break; case animations::EventTrigger::ON_MOUSE_ENTER: // try to extract XShape event source if ((aEvent.Source >>= xShape) && @@ -173,7 +173,7 @@ EventSharedPtr generateEvent( pEvent = makeDelay( rFunctor, nDelay2 + nAdditionalDelay, "generateEvent, ON_MOUSE_ENTER"); - rContext.mrUserEventQueue.registerMouseEnterEvent( + rContext.mrUserEventQueue.registerMouseEnterEvent( pEvent, pShape ); } else { @@ -189,7 +189,7 @@ EventSharedPtr generateEvent( pEvent = makeDelay( rFunctor, nDelay2 + nAdditionalDelay, "generateEvent, ON_MOUSE_LEAVE"); - rContext.mrUserEventQueue.registerMouseLeaveEvent( + rContext.mrUserEventQueue.registerMouseLeaveEvent( pEvent, pShape ); } else { @@ -237,7 +237,7 @@ EventSharedPtr generateEvent( // schedule delay event rContext.mrEventQueue.addEvent( pEvent ); } - + return pEvent; } diff --git a/slideshow/source/engine/animationnodes/generateevent.hxx b/slideshow/source/engine/animationnodes/generateevent.hxx index d0f4ce1b5ce4..2b7c761bc3c5 100644 --- a/slideshow/source/engine/animationnodes/generateevent.hxx +++ b/slideshow/source/engine/animationnodes/generateevent.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,16 +36,16 @@ namespace slideshow { namespace internal { /** Create an event for the given description, calling the given functor. - + @param rEventDescription Directly from API - + @param rFunctor Functor to call when event fires. - + @param rContext Context struct, to provide event queue - + @param nAdditionalDelay Additional delay, gets added on top of timeout. */ diff --git a/slideshow/source/engine/animationnodes/nodetools.cxx b/slideshow/source/engine/animationnodes/nodetools.cxx index 198108b8be43..8ae7e5c9ba5c 100644 --- a/slideshow/source/engine/animationnodes/nodetools.cxx +++ b/slideshow/source/engine/animationnodes/nodetools.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,14 +48,14 @@ namespace slideshow int& debugGetCurrentOffset() { static int lcl_nOffset = 0; // to make each tree output distinct - + return lcl_nOffset; } void debugNodesShowTree( const BaseNode* pNode ) { if( pNode ) - pNode->showState(); + pNode->showState(); ++debugGetCurrentOffset(); } @@ -63,24 +63,24 @@ namespace slideshow void debugNodesShowTreeWithin( const BaseNode* pNode ) { if( pNode ) - pNode->showTreeFromWithin(); + pNode->showTreeFromWithin(); ++debugGetCurrentOffset(); } #endif - AttributableShapeSharedPtr lookupAttributableShape( const ShapeManagerSharedPtr& rShapeManager, - const uno::Reference< drawing::XShape >& xShape ) + AttributableShapeSharedPtr lookupAttributableShape( const ShapeManagerSharedPtr& rShapeManager, + const uno::Reference< drawing::XShape >& xShape ) { ENSURE_OR_THROW( rShapeManager, "lookupAttributableShape(): invalid ShapeManager" ); - + ShapeSharedPtr pShape( rShapeManager->lookupShape( xShape ) ); ENSURE_OR_THROW( pShape, "lookupAttributableShape(): no shape found for given XShape" ); - AttributableShapeSharedPtr pRes( + AttributableShapeSharedPtr pRes( ::boost::dynamic_pointer_cast< AttributableShape >( pShape ) ); // TODO(E3): Cannot throw here, people might set animation info @@ -98,7 +98,7 @@ namespace slideshow return true; animations::Timing eTiming; - + if( !(rAny >>= eTiming) || eTiming != animations::Timing_INDEFINITE ) { @@ -109,13 +109,13 @@ namespace slideshow } /// Extract the node type from the user data - bool getNodeType( sal_Int16& o_rNodeType, - const uno::Sequence< beans::NamedValue >& rValues ) + bool getNodeType( sal_Int16& o_rNodeType, + const uno::Sequence< beans::NamedValue >& rValues ) { beans::NamedValue aNamedValue; if( findNamedValue( &aNamedValue, - rValues, + rValues, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("node-type") ) ) ) { if( (aNamedValue.Value >>= o_rNodeType) ) diff --git a/slideshow/source/engine/animationnodes/nodetools.hxx b/slideshow/source/engine/animationnodes/nodetools.hxx index e70defd4dc5b..a790c78b4cae 100644 --- a/slideshow/source/engine/animationnodes/nodetools.hxx +++ b/slideshow/source/engine/animationnodes/nodetools.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,22 +55,22 @@ namespace slideshow //========================================================================= #if defined(VERBOSE) && defined(DBG_UTIL) - int& debugGetCurrentOffset(); + int& debugGetCurrentOffset(); void debugNodesShowTree( const BaseNode* ); void debugNodesShowTreeWithin( const BaseNode* ); -#endif +#endif /** Look up an AttributableShape from ShapeManager. This method retrieves an AttributableShape pointer, given - an XShape and a LayerManager. + an XShape and a LayerManager. Throws a runtime exception if there's no such shape, or if it does not implement the AttributableShape interface. */ - AttributableShapeSharedPtr lookupAttributableShape( const ShapeManagerSharedPtr& rShapeManager, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape ); + AttributableShapeSharedPtr lookupAttributableShape( const ShapeManagerSharedPtr& rShapeManager, + const ::com::sun::star::uno::Reference< + ::com::sun::star::drawing::XShape >& xShape ); /** Predicate whether a Begin, Duration or End timing is indefinite, i.e. either contains no value, or the @@ -79,8 +79,8 @@ namespace slideshow bool isIndefiniteTiming( const ::com::sun::star::uno::Any& rAny ); /// Extract the node type from the user data - bool getNodeType( sal_Int16& o_rNodeType, - const ::com::sun::star::uno::Sequence< + bool getNodeType( sal_Int16& o_rNodeType, + const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rValues ); } } diff --git a/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx b/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx index 969e789c57c8..54457247f9b4 100644 --- a/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx +++ b/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx b/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx index 1694d51b0669..3e9c2e3014ca 100644 --- a/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx +++ b/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,24 +33,24 @@ namespace slideshow { namespace internal { /** This class implements parallel node containers - + All children of this node are played in parallel */ class ParallelTimeContainer : public BaseContainerNode { public: ParallelTimeContainer( - const ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode >& xNode, + const ::com::sun::star::uno::Reference< + ::com::sun::star::animations::XAnimationNode >& xNode, const BaseContainerNodeSharedPtr& rParent, const NodeContext& rContext ) : BaseContainerNode( xNode, rParent, rContext ) {} - + #if defined(VERBOSE) && defined(DBG_UTIL) virtual const char* getDescription() const { return "ParallelTimeContainer"; } #endif - + private: virtual void activate_st(); virtual void notifyDeactivating( AnimationNodeSharedPtr const& pChildNode ); diff --git a/slideshow/source/engine/animationnodes/propertyanimationnode.cxx b/slideshow/source/engine/animationnodes/propertyanimationnode.cxx index a200cdfa3d59..2063569fa3db 100644 --- a/slideshow/source/engine/animationnodes/propertyanimationnode.cxx +++ b/slideshow/source/engine/animationnodes/propertyanimationnode.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,9 +45,9 @@ AnimationActivitySharedPtr PropertyAnimationNode::createActivity() const // Create AnimationActivity from common XAnimate parameters: ActivitiesFactory::CommonParameters aParms( fillCommonParameters() ); uno::Reference<animations::XAnimate> const& xAnimateNode =getXAnimateNode(); - rtl::OUString const attrName( xAnimateNode->getAttributeName() ); + rtl::OUString const attrName( xAnimateNode->getAttributeName() ); AttributableShapeSharedPtr const pShape( getShape() ); - + switch (AnimationFactory::classifyAttributeName( attrName )) { default: case AnimationFactory::CLASS_UNKNOWN_PROPERTY: @@ -55,58 +55,58 @@ AnimationActivitySharedPtr PropertyAnimationNode::createActivity() const false, "Unexpected attribute class (unknown or empty attribute name)" ); break; - + case AnimationFactory::CLASS_NUMBER_PROPERTY: return ActivitiesFactory::createAnimateActivity( aParms, - AnimationFactory::createNumberPropertyAnimation( + AnimationFactory::createNumberPropertyAnimation( attrName, pShape, getContext().mpSubsettableShapeManager, getSlideSize() ), xAnimateNode ); - + case AnimationFactory::CLASS_ENUM_PROPERTY: return ActivitiesFactory::createAnimateActivity( aParms, - AnimationFactory::createEnumPropertyAnimation( + AnimationFactory::createEnumPropertyAnimation( attrName, pShape, getContext().mpSubsettableShapeManager, getSlideSize() ), xAnimateNode ); - + case AnimationFactory::CLASS_COLOR_PROPERTY: return ActivitiesFactory::createAnimateActivity( aParms, - AnimationFactory::createColorPropertyAnimation( + AnimationFactory::createColorPropertyAnimation( attrName, pShape, getContext().mpSubsettableShapeManager, getSlideSize() ), xAnimateNode ); - + case AnimationFactory::CLASS_STRING_PROPERTY: return ActivitiesFactory::createAnimateActivity( aParms, - AnimationFactory::createStringPropertyAnimation( + AnimationFactory::createStringPropertyAnimation( attrName, pShape, getContext().mpSubsettableShapeManager, getSlideSize() ), xAnimateNode ); - + case AnimationFactory::CLASS_BOOL_PROPERTY: return ActivitiesFactory::createAnimateActivity( aParms, - AnimationFactory::createBoolPropertyAnimation( + AnimationFactory::createBoolPropertyAnimation( attrName, pShape, getContext().mpSubsettableShapeManager, getSlideSize() ), xAnimateNode ); } - + return AnimationActivitySharedPtr(); } diff --git a/slideshow/source/engine/animationnodes/propertyanimationnode.hxx b/slideshow/source/engine/animationnodes/propertyanimationnode.hxx index e96aa701b522..1a87c93a671a 100644 --- a/slideshow/source/engine/animationnodes/propertyanimationnode.hxx +++ b/slideshow/source/engine/animationnodes/propertyanimationnode.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,16 +37,16 @@ class PropertyAnimationNode : public AnimationBaseNode public: PropertyAnimationNode( ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> const& xNode, + ::com::sun::star::animations::XAnimationNode> const& xNode, ::boost::shared_ptr<BaseContainerNode> const& pParent, NodeContext const& rContext ) : AnimationBaseNode( xNode, pParent, rContext ) {} - + #if defined(VERBOSE) && defined(DBG_UTIL) virtual const char* getDescription() const { return "PropertyAnimationNode"; } #endif - + private: virtual AnimationActivitySharedPtr createActivity() const; }; diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx index 1b5458ca240f..f70828d09516 100644 --- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx +++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ void SequentialTimeContainer::activate_st() OSL_ENSURE( false, "### resolving child failed!" ); } } - + if (isDurationIndefinite() && (maChildren.empty() || mnFinishedChildren >= maChildren.size())) { @@ -112,20 +112,20 @@ bool SequentialTimeContainer::resolveChild( mpCurrentSkipEvent->dispose(); if (mpCurrentRewindEvent) mpCurrentRewindEvent->dispose(); - + // event that will deactivate the resolved/running child: mpCurrentSkipEvent = makeEvent( - boost::bind( &SequentialTimeContainer::skipEffect, + boost::bind( &SequentialTimeContainer::skipEffect, boost::dynamic_pointer_cast<SequentialTimeContainer>( getSelf() ), pChildNode ), "SequentialTimeContainer::skipEffect, resolveChild"); // event that will reresolve the resolved/activated child: mpCurrentRewindEvent = makeEvent( - boost::bind( &SequentialTimeContainer::rewindEffect, + boost::bind( &SequentialTimeContainer::rewindEffect, boost::dynamic_pointer_cast<SequentialTimeContainer>( getSelf() ), pChildNode ), "SequentialTimeContainer::rewindEffect, resolveChild"); - + // deactivate child node when skip event occurs: getContext().mrUserEventQueue.registerSkipEffectEvent( mpCurrentSkipEvent, @@ -142,13 +142,13 @@ void SequentialTimeContainer::notifyDeactivating( { if (notifyDeactivatedChild( rNotifier )) return; - + OSL_ASSERT( mnFinishedChildren < maChildren.size() ); AnimationNodeSharedPtr const& pNextChild = maChildren[mnFinishedChildren]; OSL_ASSERT( pNextChild->getState() == UNRESOLVED ); - + if (! resolveChild( pNextChild )) { - // could not resolve child - since we risk to + // could not resolve child - since we risk to // stall the chain of events here, play it safe // and deactivate this node (only if we have // indefinite duration - otherwise, we'll get a diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx index 4ea13062d244..1fc4b3b8ad9b 100644 --- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx +++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,37 +33,37 @@ namespace slideshow { namespace internal { /** This class implements sequential node containers - + All children of this node are played sequentially */ class SequentialTimeContainer : public BaseContainerNode { public: SequentialTimeContainer( - ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> const& xNode, + ::com::sun::star::uno::Reference< + ::com::sun::star::animations::XAnimationNode> const& xNode, BaseContainerNodeSharedPtr const& pParent, NodeContext const& rContext ) : BaseContainerNode( xNode, pParent, rContext ) {} - + #if defined(VERBOSE) && defined(DBG_UTIL) virtual const char* getDescription() const { return "SequentialTimeContainer"; } #endif - + protected: virtual void dispose(); - + private: virtual void activate_st(); virtual void notifyDeactivating( AnimationNodeSharedPtr const& rNotifier ); - + void skipEffect( AnimationNodeSharedPtr const& pChildNode ); void rewindEffect( AnimationNodeSharedPtr const& pChildNode ); - + private: bool resolveChild( AnimationNodeSharedPtr const& pChildNode ); - + EventSharedPtr mpCurrentSkipEvent; EventSharedPtr mpCurrentRewindEvent; }; diff --git a/slideshow/source/engine/animationnodes/setactivity.hxx b/slideshow/source/engine/animationnodes/setactivity.hxx index 06486f33c2ab..86f65f336b40 100644 --- a/slideshow/source/engine/animationnodes/setactivity.hxx +++ b/slideshow/source/engine/animationnodes/setactivity.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,11 +42,11 @@ namespace slideshow { namespace internal { /** Templated setter for animation values - + This template class implements the AnimationActivity interface, but only the perform() and setAttributeLayer() methods are functional. To be used for set animations. - + @see AnimationSetNode. */ template <class AnimationT> @@ -55,7 +55,7 @@ class SetActivity : public AnimationActivity public: typedef ::boost::shared_ptr< AnimationT > AnimationSharedPtrT; typedef typename AnimationT::ValueType ValueT; - + SetActivity( const ActivitiesFactory::CommonParameters& rParms, const AnimationSharedPtrT& rAnimation, const ValueT& rToValue ) @@ -69,7 +69,7 @@ public: { ENSURE_OR_THROW( mpAnimation, "Invalid animation" ); } - + virtual void dispose() { mbIsActive = false; @@ -81,19 +81,19 @@ public: mpEndEvent->dispose(); mpEndEvent.reset(); } - + virtual double calcTimeLag() const { return 0.0; } - + virtual bool perform() { if (! isActive()) return false; // we're going inactive immediately: mbIsActive = false; - + if (mpAnimation && mpAttributeLayer && mpShape) { mpAnimation->start( mpShape, mpAttributeLayer ); (*mpAnimation)(maToValue); @@ -102,15 +102,15 @@ public: // fire end event, if any if (mpEndEvent) mrEventQueue.addEvent( mpEndEvent ); - + return false; // don't reinsert } - + virtual bool isActive() const { return mbIsActive; } - + virtual void dequeued() { } @@ -119,17 +119,17 @@ public: { perform(); } - + virtual void setTargets( const AnimatableShapeSharedPtr& rShape, const ShapeAttributeLayerSharedPtr& rAttrLayer ) { ENSURE_OR_THROW( rShape, "Invalid shape" ); ENSURE_OR_THROW( rAttrLayer, "Invalid attribute layer" ); - + mpShape = rShape; mpAttributeLayer = rAttrLayer; } - + private: AnimationSharedPtrT mpAnimation; AnimatableShapeSharedPtr mpShape; diff --git a/slideshow/source/engine/attributemap.cxx b/slideshow/source/engine/attributemap.cxx index a4b1cbeda7fc..9d3cc2734786 100644 --- a/slideshow/source/engine/attributemap.cxx +++ b/slideshow/source/engine/attributemap.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -105,19 +105,19 @@ namespace slideshow false ); AttributeType eAttributeType = ATTRIBUTE_INVALID; - - // determine the type from the attribute name + + // determine the type from the attribute name if( !aMap.lookup( rAttrName, eAttributeType ) ) { OSL_TRACE( "mapAttributeName(): attribute name %s not found in map.", - ::rtl::OUStringToOString( rAttrName, + ::rtl::OUStringToOString( rAttrName, RTL_TEXTENCODING_ASCII_US ).getStr() ); return ATTRIBUTE_INVALID; } - + return eAttributeType; } - + } } diff --git a/slideshow/source/engine/color.cxx b/slideshow/source/engine/color.cxx index e49f8e7e1b63..5dfad3ce40bd 100644 --- a/slideshow/source/engine/color.cxx +++ b/slideshow/source/engine/color.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,21 +61,21 @@ namespace slideshow const double nMax( ::std::max(nRed,::std::max(nGreen, nBlue)) ); const double nMin( ::std::min(nRed,::std::min(nGreen, nBlue)) ); - + const double nDelta( nMax - nMin ); aRes.mnLuminance = (nMax + nMin) / 2.0; - + if( ::basegfx::fTools::equalZero( nDelta ) ) { aRes.mnSaturation = 0.0; - + // hue undefined (achromatic case) aRes.mnHue = 0.0; } else { - aRes.mnSaturation = aRes.mnLuminance > 0.5 ? + aRes.mnSaturation = aRes.mnLuminance > 0.5 ? nDelta/(2.0-nMax-nMin) : nDelta/(nMax + nMin); @@ -110,7 +110,7 @@ namespace slideshow return nValue2; else if( nHue < 240.0 ) return nValue1 + (nValue2 - nValue1)*(240.0 - nHue)/60.0; - else + else return nValue1; } @@ -125,9 +125,9 @@ namespace slideshow RGBColor::RGBTriple aRes; aRes.mnRed = hsl2rgbHelper( nVal2, - nVal1, + nVal1, nHue + 120.0 ); - aRes.mnGreen = hsl2rgbHelper( nVal2, + aRes.mnGreen = hsl2rgbHelper( nVal2, nVal1, nHue ); aRes.mnBlue = hsl2rgbHelper( nVal2, @@ -140,23 +140,23 @@ namespace slideshow /// Truncate range of value to [0,1] double truncateRangeStd( double nVal ) { - return ::std::max( 0.0, - ::std::min( 1.0, + return ::std::max( 0.0, + ::std::min( 1.0, nVal ) ); } /// Truncate range of value to [0,360] double truncateRangeHue( double nVal ) { - return ::std::max( 0.0, - ::std::min( 360.0, + return ::std::max( 0.0, + ::std::min( 360.0, nVal ) ); } /// convert RGB color to sal_uInt8, truncate range appropriately before sal_uInt8 colorToInt( double nCol ) { - return static_cast< sal_uInt8 >( + return static_cast< sal_uInt8 >( ::basegfx::fround( truncateRangeStd( nCol ) * 255.0 ) ); } } @@ -179,7 +179,7 @@ namespace slideshow mnLuminance( nLuminance ) { } - + HSLColor::HSLColor() : maHSLTriple( 0.0, 0.0, 0.0 ), mnMagicValue( getMagic( maHSLTriple.mnLuminance, @@ -202,16 +202,16 @@ namespace slideshow maHSLTriple.mnSaturation ) ) { } - + HSLColor::HSLColor( const RGBColor& rColor ) : - maHSLTriple( rgb2hsl( truncateRangeStd( rColor.getRed() ), + maHSLTriple( rgb2hsl( truncateRangeStd( rColor.getRed() ), truncateRangeStd( rColor.getGreen() ), truncateRangeStd( rColor.getBlue() ) ) ), mnMagicValue( getMagic( maHSLTriple.mnLuminance, maHSLTriple.mnSaturation ) ) { } - + double HSLColor::getHue() const { return maHSLTriple.mnHue; @@ -232,8 +232,8 @@ namespace slideshow if( ::basegfx::fTools::equalZero( getSaturation() ) ) return getLuminance(); - return hsl2rgbHelper( 2.0*getLuminance() - mnMagicValue, - mnMagicValue, + return hsl2rgbHelper( 2.0*getLuminance() - mnMagicValue, + mnMagicValue, getHue() + 120.0 ); } @@ -242,8 +242,8 @@ namespace slideshow if( ::basegfx::fTools::equalZero( getSaturation() ) ) return getLuminance(); - return hsl2rgbHelper( 2.0*getLuminance() - mnMagicValue, - mnMagicValue, + return hsl2rgbHelper( 2.0*getLuminance() - mnMagicValue, + mnMagicValue, getHue() ); } @@ -252,8 +252,8 @@ namespace slideshow if( ::basegfx::fTools::equalZero( getSaturation() ) ) return getLuminance(); - return hsl2rgbHelper( 2.0*getLuminance() - mnMagicValue, - mnMagicValue, + return hsl2rgbHelper( 2.0*getLuminance() - mnMagicValue, + mnMagicValue, getHue() - 120.0 ); } @@ -264,10 +264,10 @@ namespace slideshow getLuminance() ) ); return RGBColor( aColor.mnRed, aColor.mnGreen, aColor.mnBlue ); } - + RGBColor::RGBColor(const RGBColor& rLHS) { - RGBColor(rLHS.getRed(), rLHS.getGreen(), rLHS.getBlue()); + RGBColor(rLHS.getRed(), rLHS.getGreen(), rLHS.getBlue()); } RGBColor& RGBColor::operator=( const RGBColor& rLHS ){ @@ -276,7 +276,7 @@ namespace slideshow maRGBTriple.mnGreen = rLHS.getGreen(); maRGBTriple.mnBlue = rLHS.getBlue(); return *this; - } + } HSLColor operator+( const HSLColor& rLHS, const HSLColor& rRHS ) { @@ -302,7 +302,7 @@ namespace slideshow HSLColor interpolate( const HSLColor& rFrom, const HSLColor& rTo, double t, bool bCCW ) { const double nFromHue( rFrom.getHue() ); - const double nToHue ( rTo.getHue() ); + const double nToHue ( rTo.getHue() ); double nHue=0.0; @@ -340,7 +340,7 @@ namespace slideshow (1.0-t)*rFrom.getLuminance() + t*rTo.getLuminance() ); } - + // RGBColor // =============================================== @@ -352,14 +352,14 @@ namespace slideshow mnBlue() { } - + RGBColor::RGBTriple::RGBTriple( double nRed, double nGreen, double nBlue ) : mnRed( nRed ), mnGreen( nGreen ), mnBlue( nBlue ) { } - + RGBColor::RGBColor() : maRGBTriple( 0.0, 0.0, 0.0 ) { @@ -376,14 +376,14 @@ namespace slideshow maRGBTriple( nRed, nGreen, nBlue ) { } - + RGBColor::RGBColor( const HSLColor& rColor ) : - maRGBTriple( hsl2rgb( truncateRangeHue( rColor.getHue() ), + maRGBTriple( hsl2rgb( truncateRangeHue( rColor.getHue() ), truncateRangeStd( rColor.getSaturation() ), truncateRangeStd( rColor.getLuminance() ) ) ) { } - + double RGBColor::getHue() const { return rgb2hsl( getRed(), @@ -426,7 +426,7 @@ namespace slideshow getGreen(), getBlue() ) ); return HSLColor( aColor.mnHue, aColor.mnSaturation, aColor.mnLuminance ); - } + } ::cppcanvas::Color::IntSRGBA RGBColor::getIntegerColor() const { @@ -435,7 +435,7 @@ namespace slideshow colorToInt( getBlue() ), 255 ); } - + RGBColor operator+( const RGBColor& rLHS, const RGBColor& rRHS ) { return RGBColor( rLHS.getRed() + rRHS.getRed(), @@ -459,7 +459,7 @@ namespace slideshow RGBColor interpolate( const RGBColor& rFrom, const RGBColor& rTo, double t ) { - return RGBColor( (1.0-t)*rFrom.getRed() + t*rTo.getRed(), + return RGBColor( (1.0-t)*rFrom.getRed() + t*rTo.getRed(), (1.0-t)*rFrom.getGreen() + t*rTo.getGreen(), (1.0-t)*rFrom.getBlue() + t*rTo.getBlue() ); } diff --git a/slideshow/source/engine/debug.cxx b/slideshow/source/engine/debug.cxx index 4c8ba5415f04..8f4b4f959640 100644 --- a/slideshow/source/engine/debug.cxx +++ b/slideshow/source/engine/debug.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ public: - + OUString DebugGetDescription (const AnimationNodeSharedPtr& rpNode) { if (::boost::dynamic_pointer_cast<BaseContainerNode>(rpNode)) @@ -136,7 +136,7 @@ void DebugShowState (const AnimationNodeSharedPtr& rpNode) sStateColor = OUString::createFromAscii("slategray3"); break; } - + const uno::Any aBegin (rpNode->getXAnimationNode()->getBegin()); OUString sTrigger; if (aBegin.hasValue()) @@ -216,7 +216,7 @@ AnimationNodeSharedPtr DebugGetTreeRoot (const BaseNodeSharedPtr& rpNode) void Debug_ShowNodeTree (const AnimationNodeSharedPtr& rpNode) { DebugTraceScope aTraceScope ("NodeTree"); - + DebugShowState(DebugGetTreeRoot(::boost::dynamic_pointer_cast<BaseNode>(rpNode))); } @@ -238,7 +238,7 @@ extern "C" { maTime() { } - + int mnIndentation; FILE* mpFile; ::canvas::tools::ElapsedTime maTime; @@ -271,7 +271,7 @@ extern "C" { } // end of anonymous namespace - + } // end of extern "C" void SAL_CALL DebugTraceBegin (const sal_Char* sFormat, ...) @@ -281,7 +281,7 @@ void SAL_CALL DebugTraceBegin (const sal_Char* sFormat, ...) DebugTrace(+1,sFormat, args); va_end(args); } - + void SAL_CALL DebugTraceEnd (const sal_Char* sFormat, ...) { va_list args; @@ -305,7 +305,7 @@ DebugTraceScope::DebugTraceScope (const sal_Char* sFormat, ...) { va_list args; va_start(args, sFormat); - + msMessage[mnBufferSize-1] = 0; _vsnprintf(msMessage, mnBufferSize-1, sFormat, args); TRACE_BEGIN("[ %s", msMessage); diff --git a/slideshow/source/engine/delayevent.cxx b/slideshow/source/engine/delayevent.cxx index 14d9c9bc3e31..5093c7d88242 100644 --- a/slideshow/source/engine/delayevent.cxx +++ b/slideshow/source/engine/delayevent.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx index b094634cc117..6fac9696deef 100644 --- a/slideshow/source/engine/effectrewinder.cxx +++ b/slideshow/source/engine/effectrewinder.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -110,17 +110,17 @@ void EffectRewinder::initialize (void) // main sequence effect and if so, increase the respective counter), // b,c) a slide was started or ended (in which case the effect counter // is reset. - + mpAnimationStartHandler.reset( new RewinderAnimationEventHandler( ::boost::bind(&EffectRewinder::notifyAnimationStart, this, _1))); mrEventMultiplexer.addAnimationStartHandler(mpAnimationStartHandler); - + mpSlideStartHandler.reset( new RewinderEventHandler( ::boost::bind(&EffectRewinder::resetEffectCount, this))); mrEventMultiplexer.addSlideStartHandler(mpSlideStartHandler); - + mpSlideEndHandler.reset( new RewinderEventHandler( ::boost::bind(&EffectRewinder::resetEffectCount, this))); @@ -145,7 +145,7 @@ void EffectRewinder::dispose (void) mpAsynchronousRewindEvent->dispose(); mpAsynchronousRewindEvent.reset(); } - + if (mpAnimationStartHandler) { mrEventMultiplexer.removeAnimationStartHandler(mpAnimationStartHandler); @@ -194,7 +194,7 @@ bool EffectRewinder::rewind ( // Abort (and skip over the rest of) any currently active animation. mrUserEventQueue.callSkipEffectEventHandler(); mrEventQueue.forceEmpty(); - + const int nSkipCount (mnMainSequenceEffectCount - 1); if (nSkipCount < 0) { @@ -298,7 +298,7 @@ sal_Int32 EffectRewinder::countMainSequenceEffects (void) } return nMainSequenceNodeCount; - + // // Skip all main sequence nodes. // SkipSomeMainSequenceEffects(nMainSequenceNodeCount); } @@ -352,7 +352,7 @@ bool EffectRewinder::notifyAnimationStart (const AnimationNodeSharedPtr& rpNode) // This notification is only relevant for us when the effect is user // triggered. bool bIsUserTriggered (false); - + Reference<animations::XAnimationNode> xNode (rpNode->getXAnimationNode()); if (xNode.is()) { diff --git a/slideshow/source/engine/effectrewinder.hxx b/slideshow/source/engine/effectrewinder.hxx index 23d3128d8e2d..fed03592e3cf 100644 --- a/slideshow/source/engine/effectrewinder.hxx +++ b/slideshow/source/engine/effectrewinder.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ public: /** Call Dispose() before the ownder of an EffectRewinder object dies so that the EffectRewinder can release all references to the owner. - + */ void dispose (void); @@ -112,7 +112,7 @@ private: EventMultiplexer& mrEventMultiplexer; EventQueue& mrEventQueue; UserEventQueue& mrUserEventQueue; - + EventHandlerSharedPtr mpSlideStartHandler; EventHandlerSharedPtr mpSlideEndHandler; AnimationEventHandlerSharedPtr mpAnimationStartHandler; @@ -126,12 +126,12 @@ private: nested rewinds. */ EventSharedPtr mpAsynchronousRewindEvent; - + css::uno::Reference<css::animations::XAnimationNode> mxCurrentAnimationRootNode; ::boost::shared_ptr<ScreenUpdater::UpdateLock> mpPaintLock; bool mbNonUserTriggeredMainSequenceEffectSeen; - + void initialize (void); bool resetEffectCount (void); @@ -148,7 +148,7 @@ private: /** Skip the next main sequence effect. */ void skipSingleMainSequenceEffects (void); - + /** Skip the specified number of main sequence effects. */ void skipSomeMainSequenceEffects (const sal_Int32 nSkipCount); diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx index ea910d60e575..9576f0fc924e 100644 --- a/slideshow/source/engine/eventmultiplexer.cxx +++ b/slideshow/source/engine/eventmultiplexer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,26 +85,26 @@ class PrioritizedHandlerEntry typedef boost::shared_ptr<HandlerT> HandlerSharedPtrT; HandlerSharedPtrT mpHandler; double mnPrio; - + public: - PrioritizedHandlerEntry( HandlerSharedPtrT const& pHandler, + PrioritizedHandlerEntry( HandlerSharedPtrT const& pHandler, double nPrio ) : - mpHandler(pHandler), - mnPrio(nPrio) + mpHandler(pHandler), + mnPrio(nPrio) {} - + HandlerSharedPtrT const& getHandler() const { return mpHandler; } - + /// To sort according to priority - bool operator<( PrioritizedHandlerEntry const& rRHS ) const + bool operator<( PrioritizedHandlerEntry const& rRHS ) const { // reversed order - high prioritized entries // should be at the beginning of the queue return mnPrio > rRHS.mnPrio; } - + /// To permit std::remove in removeHandler template - bool operator==( PrioritizedHandlerEntry const& rRHS ) const + bool operator==( PrioritizedHandlerEntry const& rRHS ) const { // ignore prio, for removal, only the handler ptr matters return mpHandler == rRHS.mpHandler; @@ -131,13 +131,13 @@ typedef cppu::WeakComponentImplHelper2< XSlideViews, and passes on the events to the EventMultiplexer (via EventQueue indirection, to force the events into the main thread) */ -class EventMultiplexerListener : private cppu::BaseMutex, +class EventMultiplexerListener : private cppu::BaseMutex, public Listener_UnoBase, private ::boost::noncopyable { public: EventMultiplexerListener( EventQueue& rEventQueue, - EventMultiplexerImpl& rEventMultiplexer ) : + EventMultiplexerImpl& rEventMultiplexer ) : Listener_UnoBase( m_aMutex ), mpEventQueue( &rEventQueue ), mpEventMultiplexer( &rEventMultiplexer ) @@ -146,7 +146,7 @@ public: // WeakComponentImplHelperBase::disposing virtual void SAL_CALL disposing(); - + private: virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException); @@ -160,13 +160,13 @@ private: throw (uno::RuntimeException); virtual void SAL_CALL mouseExited( const awt::MouseEvent& e ) throw (uno::RuntimeException); - + // XMouseMotionListener implementation virtual void SAL_CALL mouseDragged( const awt::MouseEvent& e ) throw (uno::RuntimeException); virtual void SAL_CALL mouseMoved( const awt::MouseEvent& e ) throw (uno::RuntimeException); - + EventQueue* mpEventQueue; EventMultiplexerImpl* mpEventMultiplexer; @@ -224,7 +224,7 @@ struct EventMultiplexerImpl void mouseMoved( const awt::MouseEvent& e ); bool isMouseListenerRegistered() const; - + typedef ThreadUnsafeListenerContainer< PrioritizedHandlerEntry<EventHandler>, std::vector< @@ -260,14 +260,14 @@ struct EventMultiplexerImpl typedef ThreadUnsafeListenerContainer< PrioritizedHandlerEntry<HyperlinkHandler>, std::vector<PrioritizedHandlerEntry<HyperlinkHandler> > > ImplHyperLinkHandlers; - + template <typename XSlideShowViewFunc> void forEachView( XSlideShowViewFunc pViewMethod ); - + UnoViewSharedPtr findUnoView(const uno::Reference< presentation::XSlideShowView>& xView) const; - template< typename RegisterFunction > + template< typename RegisterFunction > void addMouseHandler( ImplMouseHandlers& rHandlerContainer, const MouseEventHandlerSharedPtr& rHandler, double nPriority, @@ -275,30 +275,30 @@ struct EventMultiplexerImpl bool notifyAllAnimationHandlers( ImplAnimationHandlers const& rContainer, AnimationNodeSharedPtr const& rNode ); - + bool notifyMouseHandlers( const ImplMouseHandlers& rQueue, bool (MouseEventHandler::*pHandlerMethod)( const awt::MouseEvent& ), const awt::MouseEvent& e ); - + bool notifyNextEffect(); - - /// Called for automatic nextEffect + + /// Called for automatic nextEffect void tick(); - + /// Schedules a tick event void scheduleTick(); - + /// Schedules tick events, if mbIsAutoMode is true void handleTicks(); - + EventQueue& mrEventQueue; UnoViewContainer const& mrViewContainer; ::rtl::Reference< EventMultiplexerListener> mxListener; - + ImplNextEffectHandlers maNextEffectHandlers; ImplEventHandlers maSlideStartHandlers; ImplEventHandlers maSlideEndHandlers; @@ -320,9 +320,9 @@ struct EventMultiplexerImpl /// automatic next effect mode timeout double mnTimeout; - + /** Holds ptr to optional tick event weakly - + When event queue is cleansed, the next setAutomaticMode(true) call is then able to regenerate the event. @@ -358,13 +358,13 @@ void SAL_CALL EventMultiplexerListener::mousePressed( const awt::MouseEvent& e ) throw (uno::RuntimeException) { osl::MutexGuard const guard( m_aMutex ); - + // notify mouse press. Don't call handlers directly, this // might not be the main thread! if( mpEventQueue ) mpEventQueue->addEvent( makeEvent( boost::bind( &EventMultiplexerImpl::mousePressed, - mpEventMultiplexer, + mpEventMultiplexer, e ), "EventMultiplexerImpl::mousePressed") ); } @@ -379,7 +379,7 @@ void SAL_CALL EventMultiplexerListener::mouseReleased( if( mpEventQueue ) mpEventQueue->addEvent( makeEvent( boost::bind( &EventMultiplexerImpl::mouseReleased, - mpEventMultiplexer, + mpEventMultiplexer, e ), "EventMultiplexerImpl::mouseReleased") ); } @@ -401,13 +401,13 @@ void SAL_CALL EventMultiplexerListener::mouseDragged( const awt::MouseEvent& e ) throw (uno::RuntimeException) { osl::MutexGuard const guard( m_aMutex ); - + // notify mouse drag. Don't call handlers directly, this // might not be the main thread! if( mpEventQueue ) mpEventQueue->addEvent( makeEvent( boost::bind( &EventMultiplexerImpl::mouseDragged, - mpEventMultiplexer, + mpEventMultiplexer, e ), "EventMultiplexerImpl::mouseDragged") ); } @@ -422,7 +422,7 @@ void SAL_CALL EventMultiplexerListener::mouseMoved( if( mpEventQueue ) mpEventQueue->addEvent( makeEvent( boost::bind( &EventMultiplexerImpl::mouseMoved, - mpEventMultiplexer, + mpEventMultiplexer, e ), "EventMultiplexerImpl::mouseMoved") ); } @@ -432,7 +432,7 @@ void SAL_CALL EventMultiplexerListener::mouseMoved( bool EventMultiplexerImpl::notifyAllAnimationHandlers( ImplAnimationHandlers const& rContainer, - AnimationNodeSharedPtr const& rNode ) + AnimationNodeSharedPtr const& rNode ) { return rContainer.applyAll( boost::bind( &AnimationEventHandler::handleAnimationEvent, @@ -446,7 +446,7 @@ void EventMultiplexerImpl::forEachView( XSlideShowViewFunc pViewMethod ) { // (un)register mouse listener on all views for( UnoViewVector::const_iterator aIter( mrViewContainer.begin() ), - aEnd( mrViewContainer.end() ); aIter != aEnd; ++aIter ) + aEnd( mrViewContainer.end() ); aIter != aEnd; ++aIter ) { uno::Reference<presentation::XSlideShowView> xView ((*aIter)->getUnoView()); if (xView.is()) @@ -469,7 +469,7 @@ UnoViewSharedPtr EventMultiplexerImpl::findUnoView( const UnoViewVector::const_iterator aEnd ( mrViewContainer.end() ); if( (aIter=std::find_if( mrViewContainer.begin(), aEnd, - boost::bind( + boost::bind( std::equal_to<uno::Reference<presentation::XSlideShowView> >(), boost::cref( xView ), boost::bind( &UnoView::getUnoView, _1 )))) == aEnd ) @@ -481,7 +481,7 @@ UnoViewSharedPtr EventMultiplexerImpl::findUnoView( return *aIter; } -template< typename RegisterFunction > +template< typename RegisterFunction > void EventMultiplexerImpl::addMouseHandler( ImplMouseHandlers& rHandlerContainer, const MouseEventHandlerSharedPtr& rHandler, @@ -491,13 +491,13 @@ void EventMultiplexerImpl::addMouseHandler( ENSURE_OR_THROW( rHandler, "EventMultiplexer::addMouseHandler(): Invalid handler" ); - + // register mouse listener on all views forEachView( pRegisterListener ); - + // add into sorted container: - rHandlerContainer.addSorted( - typename ImplMouseHandlers::container_type::value_type( + rHandlerContainer.addSorted( + typename ImplMouseHandlers::container_type::value_type( rHandler, nPriority )); } @@ -512,9 +512,9 @@ void EventMultiplexerImpl::tick() { if( !mbIsAutoMode ) return; // this event is just a left-over, ignore - + notifyNextEffect(); - + if( !maNextEffectHandlers.isEmpty() ) { // still handlers left, schedule next timeout @@ -526,7 +526,7 @@ void EventMultiplexerImpl::tick() void EventMultiplexerImpl::scheduleTick() { EventSharedPtr pEvent( - makeDelay( boost::bind( &EventMultiplexerImpl::tick, + makeDelay( boost::bind( &EventMultiplexerImpl::tick, this ), mnTimeout, "EventMultiplexerImpl::tick with delay")); @@ -540,7 +540,7 @@ void EventMultiplexerImpl::scheduleTick() // which will eventually call our tick() method mrEventQueue.addEventForNextRound( pEvent ); } - + void EventMultiplexerImpl::handleTicks() { if( !mbIsAutoMode ) @@ -551,7 +551,7 @@ void EventMultiplexerImpl::handleTicks() return; // nothing to do, there's already a tick // pending - // schedule initial tick (which reschedules itself + // schedule initial tick (which reschedules itself // after that, all by itself) scheduleTick(); } @@ -562,7 +562,7 @@ void EventMultiplexerImpl::clear() // deregister from all views. if( isMouseListenerRegistered() ) { - for( UnoViewVector::const_iterator aIter=mrViewContainer.begin(), + for( UnoViewVector::const_iterator aIter=mrViewContainer.begin(), aEnd=mrViewContainer.end(); aIter!=aEnd; ++aIter ) @@ -574,7 +574,7 @@ void EventMultiplexerImpl::clear() if( !maMouseMoveHandlers.isEmpty() ) { - for( UnoViewVector::const_iterator aIter=mrViewContainer.begin(), + for( UnoViewVector::const_iterator aIter=mrViewContainer.begin(), aEnd=mrViewContainer.end(); aIter!=aEnd; ++aIter ) @@ -611,7 +611,7 @@ bool EventMultiplexerImpl::notifyMouseHandlers( { uno::Reference<presentation::XSlideShowView> xView( e.Source, uno::UNO_QUERY ); - + ENSURE_OR_RETURN_FALSE( xView.is(), "EventMultiplexer::notifyHandlers(): " "event source is not an XSlideShowView" ); @@ -621,7 +621,7 @@ bool EventMultiplexerImpl::notifyMouseHandlers( const UnoViewVector::const_iterator aBegin( mrViewContainer.begin() ); const UnoViewVector::const_iterator aEnd ( mrViewContainer.end() ); if( (aIter=::std::find_if( - aBegin, aEnd, + aBegin, aEnd, boost::bind( std::equal_to< uno::Reference< presentation::XSlideShowView > >(), boost::cref( xView ), @@ -650,8 +650,8 @@ bool EventMultiplexerImpl::notifyMouseHandlers( return rQueue.apply( boost::bind( pHandlerMethod, - boost::bind( - &ImplMouseHandlers::container_type::value_type::getHandler, + boost::bind( + &ImplMouseHandlers::container_type::value_type::getHandler, _1 ), aEvent )); } @@ -669,7 +669,7 @@ void EventMultiplexerImpl::mousePressed( const awt::MouseEvent& e ) } // fire single-click events for all remaining clicks - while( nCurrClickCount > 0 && + while( nCurrClickCount > 0 && notifyMouseHandlers( maMouseClickHandlers, &MouseEventHandler::handleMousePressed, e )) @@ -691,7 +691,7 @@ void EventMultiplexerImpl::mouseReleased( const awt::MouseEvent& e ) } // fire single-click events for all remaining clicks - while( nCurrClickCount > 0 && + while( nCurrClickCount > 0 && notifyMouseHandlers( maMouseClickHandlers, &MouseEventHandler::handleMouseReleased, e )) @@ -702,15 +702,15 @@ void EventMultiplexerImpl::mouseReleased( const awt::MouseEvent& e ) void EventMultiplexerImpl::mouseDragged( const awt::MouseEvent& e ) { - notifyMouseHandlers( maMouseMoveHandlers, - &MouseEventHandler::handleMouseDragged, + notifyMouseHandlers( maMouseMoveHandlers, + &MouseEventHandler::handleMouseDragged, e ); } void EventMultiplexerImpl::mouseMoved( const awt::MouseEvent& e ) { notifyMouseHandlers( maMouseMoveHandlers, - &MouseEventHandler::handleMouseMoved, + &MouseEventHandler::handleMouseMoved, e ); } @@ -722,7 +722,7 @@ bool EventMultiplexerImpl::notifyNextEffect() return maNextEffectHandlers.apply( boost::bind( &EventHandler::handleEvent, - boost::bind( + boost::bind( &ImplNextEffectHandlers::container_type::value_type::getHandler, _1 )) ); } @@ -783,7 +783,7 @@ void EventMultiplexer::addNextEffectHandler( // Enable tick events, if not done already mpImpl->handleTicks(); } - + void EventMultiplexer::removeNextEffectHandler( const EventHandlerSharedPtr& rHandler ) { @@ -956,7 +956,7 @@ void EventMultiplexer::addClickHandler( void EventMultiplexer::removeClickHandler( const MouseEventHandlerSharedPtr& rHandler ) { - mpImpl->maMouseClickHandlers.remove( + mpImpl->maMouseClickHandlers.remove( EventMultiplexerImpl::ImplMouseHandlers::container_type::value_type( rHandler, 0.0) ); @@ -981,7 +981,7 @@ void EventMultiplexer::addDoubleClickHandler( void EventMultiplexer::removeDoubleClickHandler( const MouseEventHandlerSharedPtr& rHandler ) { - mpImpl->maMouseDoubleClickHandlers.remove( + mpImpl->maMouseDoubleClickHandlers.remove( EventMultiplexerImpl::ImplMouseHandlers::container_type::value_type( rHandler, 0.0) ); @@ -1006,7 +1006,7 @@ void EventMultiplexer::addMouseMoveHandler( void EventMultiplexer::removeMouseMoveHandler( const MouseEventHandlerSharedPtr& rHandler ) { - mpImpl->maMouseMoveHandlers.remove( + mpImpl->maMouseMoveHandlers.remove( EventMultiplexerImpl::ImplMouseHandlers::container_type::value_type( rHandler, 0.0) ); @@ -1016,7 +1016,7 @@ void EventMultiplexer::removeMouseMoveHandler( &presentation::XSlideShowView::removeMouseMotionListener ); } -void EventMultiplexer::addHyperlinkHandler( const HyperlinkHandlerSharedPtr& rHandler, +void EventMultiplexer::addHyperlinkHandler( const HyperlinkHandlerSharedPtr& rHandler, double nPriority ) { mpImpl->maHyperlinkHandlers.addSorted( @@ -1027,13 +1027,13 @@ void EventMultiplexer::addHyperlinkHandler( const HyperlinkHandlerSharedPtr& rHa void EventMultiplexer::removeHyperlinkHandler( const HyperlinkHandlerSharedPtr& rHandler ) { - mpImpl->maHyperlinkHandlers.remove( + mpImpl->maHyperlinkHandlers.remove( EventMultiplexerImpl::ImplHyperLinkHandlers::container_type::value_type( rHandler, 0.0) ); } -bool EventMultiplexer::notifyShapeListenerAdded( +bool EventMultiplexer::notifyShapeListenerAdded( const uno::Reference<presentation::XShapeEventListener>& xListener, const uno::Reference<drawing::XShape>& xShape ) { @@ -1044,7 +1044,7 @@ bool EventMultiplexer::notifyShapeListenerAdded( boost::cref(xShape)) ); } -bool EventMultiplexer::notifyShapeListenerRemoved( +bool EventMultiplexer::notifyShapeListenerRemoved( const uno::Reference<presentation::XShapeEventListener>& xListener, const uno::Reference<drawing::XShape>& xShape ) { @@ -1055,8 +1055,8 @@ bool EventMultiplexer::notifyShapeListenerRemoved( boost::cref(xShape)) ); } -bool EventMultiplexer::notifyShapeCursorChange( - const uno::Reference<drawing::XShape>& xShape, +bool EventMultiplexer::notifyShapeCursorChange( + const uno::Reference<drawing::XShape>& xShape, sal_Int16 nPointerShape ) { return mpImpl->maShapeCursorHandlers.applyAll( @@ -1107,7 +1107,7 @@ bool EventMultiplexer::notifyEraseAllInk( bool const& rEraseAllInk ) boost::cref(rEraseAllInk))); } -//adding erasing features with UserPaintOverlay +//adding erasing features with UserPaintOverlay bool EventMultiplexer::notifyEraseInkWidth( sal_Int32 rEraseInkSize ) { return mpImpl->maUserPaintEventHandlers.applyAll( @@ -1115,7 +1115,7 @@ bool EventMultiplexer::notifyEraseInkWidth( sal_Int32 rEraseInkSize ) _1, boost::cref(rEraseInkSize))); } - + bool EventMultiplexer::notifyNextEffect() { return mpImpl->notifyNextEffect(); @@ -1136,14 +1136,14 @@ bool EventMultiplexer::notifySlideEndEvent() bool EventMultiplexer::notifyAnimationStart( const AnimationNodeSharedPtr& rNode ) { - return mpImpl->notifyAllAnimationHandlers( mpImpl->maAnimationStartHandlers, + return mpImpl->notifyAllAnimationHandlers( mpImpl->maAnimationStartHandlers, rNode ); } bool EventMultiplexer::notifyAnimationEnd( const AnimationNodeSharedPtr& rNode ) { - return mpImpl->notifyAllAnimationHandlers( mpImpl->maAnimationEndHandlers, + return mpImpl->notifyAllAnimationHandlers( mpImpl->maAnimationEndHandlers, rNode ); } @@ -1156,16 +1156,16 @@ bool EventMultiplexer::notifySlideAnimationsEnd() bool EventMultiplexer::notifyAudioStopped( const AnimationNodeSharedPtr& rNode ) { - return mpImpl->notifyAllAnimationHandlers( - mpImpl->maAudioStoppedHandlers, + return mpImpl->notifyAllAnimationHandlers( + mpImpl->maAudioStoppedHandlers, rNode ); } bool EventMultiplexer::notifyCommandStopAudio( const AnimationNodeSharedPtr& rNode ) { - return mpImpl->notifyAllAnimationHandlers( - mpImpl->maCommandStopAudioHandlers, + return mpImpl->notifyAllAnimationHandlers( + mpImpl->maCommandStopAudioHandlers, rNode ); } @@ -1185,11 +1185,11 @@ bool EventMultiplexer::notifyViewAdded( const UnoViewSharedPtr& rView ) rView->getUnoView() ); if( mpImpl->isMouseListenerRegistered() ) - rUnoView->addMouseListener( + rUnoView->addMouseListener( mpImpl->mxListener.get() ); if( !mpImpl->maMouseMoveHandlers.isEmpty() ) - rUnoView->addMouseMotionListener( + rUnoView->addMouseMotionListener( mpImpl->mxListener.get() ); return mpImpl->maViewHandlers.applyAll( @@ -1202,17 +1202,17 @@ bool EventMultiplexer::notifyViewRemoved( const UnoViewSharedPtr& rView ) { ENSURE_OR_THROW( rView, "EventMultiplexer::removeView(): Invalid view" ); - - // revoke event listeners + + // revoke event listeners uno::Reference<presentation::XSlideShowView> const rUnoView( rView->getUnoView() ); if( mpImpl->isMouseListenerRegistered() ) - rUnoView->removeMouseListener( + rUnoView->removeMouseListener( mpImpl->mxListener.get() ); if( !mpImpl->maMouseMoveHandlers.isEmpty() ) - rUnoView->removeMouseMotionListener( + rUnoView->removeMouseMotionListener( mpImpl->mxListener.get() ); return mpImpl->maViewHandlers.applyAll( @@ -1245,7 +1245,7 @@ bool EventMultiplexer::notifyViewsChanged() boost::mem_fn( &ViewEventHandler::viewsChanged )); } -bool EventMultiplexer::notifyViewClobbered( +bool EventMultiplexer::notifyViewClobbered( const uno::Reference<presentation::XSlideShowView>& xView ) { UnoViewSharedPtr pView( mpImpl->findUnoView(xView) ); diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx index f7af3156ff0b..44dd95755948 100644 --- a/slideshow/source/engine/eventqueue.cxx +++ b/slideshow/source/engine/eventqueue.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,20 +74,20 @@ namespace slideshow // add in all that have been added explicitly for this round: EventEntryVector::const_iterator const iEnd( maNextEvents.end() ); for ( EventEntryVector::const_iterator iPos( maNextEvents.begin() ); - iPos != iEnd; ++iPos ) + iPos != iEnd; ++iPos ) { maEvents.push(*iPos); } EventEntryVector().swap( maNextEvents ); - + // dispose event queue while( !maEvents.empty() ) { - try + try { maEvents.top().pEvent->dispose(); } - catch (uno::Exception &) + catch (uno::Exception &) { OSL_ENSURE( false, rtl::OUStringToOString( comphelper::anyToString( @@ -108,12 +108,12 @@ namespace slideshow OUStringToOString(rEvent->GetDescription(), RTL_TEXTENCODING_UTF8).getStr(), rEvent.get(), rEvent->getActivationTime(0.0)); -#endif +#endif ENSURE_OR_RETURN_FALSE( rEvent, "EventQueue::addEvent: event ptr NULL" ); // prepare entry - + // A seemingly obvious optimization cannot be used here, // because it breaks assumed order of notification: zero // timeout events could be fired() immediately, but that @@ -125,20 +125,20 @@ namespace slideshow mpTimer->getElapsedTime()) ) ); return true; } - + bool EventQueue::addEventForNextRound( EventSharedPtr const& rEvent ) { ::osl::MutexGuard aGuard( maMutex ); - + #if OSL_DEBUG_LEVEL > 1 && defined (SLIDESHOW_ADD_DESCRIPTIONS_TO_EVENTS) OSL_TRACE("adding at %f event [%s] at %x for next round with delay %f\r", mpTimer->getElapsedTime(), OUStringToOString(rEvent->GetDescription(), RTL_TEXTENCODING_UTF8).getStr(), rEvent.get(), rEvent->getActivationTime(0.0)); -#endif +#endif - ENSURE_OR_RETURN_FALSE( rEvent.get() != NULL, + ENSURE_OR_RETURN_FALSE( rEvent.get() != NULL, "EventQueue::addEvent: event ptr NULL" ); maNextEvents.push_back( EventEntry( rEvent, rEvent->getActivationTime( @@ -156,10 +156,10 @@ namespace slideshow OUStringToOString(rpEvent->GetDescription(), RTL_TEXTENCODING_UTF8).getStr(), rpEvent.get(), rpEvent->getActivationTime(0.0)); -#endif +#endif ENSURE_OR_RETURN_FALSE( - rpEvent.get() != NULL, + rpEvent.get() != NULL, "EventQueue::addEvent: event ptr NULL"); maNextNextEvents.push( @@ -169,7 +169,7 @@ namespace slideshow return true; } - + void EventQueue::forceEmpty() { ::osl::MutexGuard aGuard( maMutex ); @@ -183,7 +183,7 @@ namespace slideshow process_(false); } - + void EventQueue::process_( bool bFireAllEvents ) { VERBOSE_TRACE( "EventQueue: heartbeat" ); @@ -195,7 +195,7 @@ namespace slideshow maEvents.push(*iPos); } EventEntryVector().swap( maNextEvents ); - + // perform topmost, ready-to-execute event // ======================================= @@ -234,7 +234,7 @@ namespace slideshow try { #if OSL_DEBUG_LEVEL > 0 - VERBOSE_TRACE( "Firing event: unknown (0x%X), timeout was: %f", + VERBOSE_TRACE( "Firing event: unknown (0x%X), timeout was: %f", event.pEvent.get(), event.pEvent->getActivationTime(0.0) ); #endif @@ -260,7 +260,7 @@ namespace slideshow // circumstance. Although, do _not_ // reinsert an activity that threw // once. - + // NOTE: we explicitely don't catch(...) here, // since this will also capture segmentation // violations and the like. In such a case, we @@ -268,7 +268,7 @@ namespace slideshow OSL_ENSURE( false, rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); + RTL_TEXTENCODING_UTF8 ).getStr() ); } catch( SlideShowException& ) { @@ -277,7 +277,7 @@ namespace slideshow // circumstance. Although, do _not_ // reinsert an activity that threw // once. - + // NOTE: we explicitely don't catch(...) here, // since this will also capture segmentation // violations and the like. In such a case, we @@ -288,14 +288,14 @@ namespace slideshow else { #if OSL_DEBUG_LEVEL > 0 - VERBOSE_TRACE( "Ignoring discharged event: unknown (0x%X), timeout was: %f", + VERBOSE_TRACE( "Ignoring discharged event: unknown (0x%X), timeout was: %f", event.pEvent.get(), event.pEvent->getActivationTime(0.0) ); #endif } } } - + bool EventQueue::isEmpty() const { ::osl::MutexGuard aGuard( maMutex ); @@ -316,7 +316,7 @@ namespace slideshow nTimeout = ::std::min(nTimeout, maNextEvents.front().nTime - nCurrentTime); if ( ! maNextNextEvents.empty()) nTimeout = ::std::min(nTimeout, maNextNextEvents.top().nTime - nCurrentTime); - + return nTimeout; } diff --git a/slideshow/source/engine/expressionnodefactory.cxx b/slideshow/source/engine/expressionnodefactory.cxx index 8032caeaa5a2..6d689459b901 100644 --- a/slideshow/source/engine/expressionnodefactory.cxx +++ b/slideshow/source/engine/expressionnodefactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ namespace slideshow } private: - double maValue; + double maValue; }; class TValueExpression : public ExpressionNode @@ -82,7 +82,7 @@ namespace slideshow { return t; } - + virtual bool isConstant() const { return false; @@ -98,8 +98,8 @@ namespace slideshow class BinaryExpressionBase : public ExpressionNode { public: - BinaryExpressionBase( const ExpressionNodeSharedPtr& rFirstArg, - const ExpressionNodeSharedPtr& rSecondArg ) : + BinaryExpressionBase( const ExpressionNodeSharedPtr& rFirstArg, + const ExpressionNodeSharedPtr& rSecondArg ) : mpFirstArg( rFirstArg ), mpSecondArg( rSecondArg ) { @@ -107,21 +107,21 @@ namespace slideshow virtual bool isConstant() const { - return - mpFirstArg->isConstant() && + return + mpFirstArg->isConstant() && mpSecondArg->isConstant(); } protected: - ExpressionNodeSharedPtr mpFirstArg; + ExpressionNodeSharedPtr mpFirstArg; ExpressionNodeSharedPtr mpSecondArg; }; class PlusExpression : public BinaryExpressionBase { public: - PlusExpression( const ExpressionNodeSharedPtr& rFirstArg, - const ExpressionNodeSharedPtr& rSecondArg ) : + PlusExpression( const ExpressionNodeSharedPtr& rFirstArg, + const ExpressionNodeSharedPtr& rSecondArg ) : BinaryExpressionBase( rFirstArg, rSecondArg ) { } @@ -135,8 +135,8 @@ namespace slideshow class MinusExpression : public BinaryExpressionBase { public: - MinusExpression( const ExpressionNodeSharedPtr& rFirstArg, - const ExpressionNodeSharedPtr& rSecondArg ) : + MinusExpression( const ExpressionNodeSharedPtr& rFirstArg, + const ExpressionNodeSharedPtr& rSecondArg ) : BinaryExpressionBase( rFirstArg, rSecondArg ) { } @@ -150,8 +150,8 @@ namespace slideshow class MultipliesExpression : public BinaryExpressionBase { public: - MultipliesExpression( const ExpressionNodeSharedPtr& rFirstArg, - const ExpressionNodeSharedPtr& rSecondArg ) : + MultipliesExpression( const ExpressionNodeSharedPtr& rFirstArg, + const ExpressionNodeSharedPtr& rSecondArg ) : BinaryExpressionBase( rFirstArg, rSecondArg ) { } @@ -159,14 +159,14 @@ namespace slideshow virtual double operator()( double t ) const { return (*mpFirstArg)(t) * (*mpSecondArg)(t); - } + } }; class DividesExpression : public BinaryExpressionBase { public: - DividesExpression( const ExpressionNodeSharedPtr& rFirstArg, - const ExpressionNodeSharedPtr& rSecondArg ) : + DividesExpression( const ExpressionNodeSharedPtr& rFirstArg, + const ExpressionNodeSharedPtr& rSecondArg ) : BinaryExpressionBase( rFirstArg, rSecondArg ) { } @@ -174,14 +174,14 @@ namespace slideshow virtual double operator()( double t ) const { return (*mpFirstArg)(t) / (*mpSecondArg)(t); - } + } }; class ComposedExpression : public BinaryExpressionBase { public: - ComposedExpression( const ExpressionNodeSharedPtr& rFirstArg, - const ExpressionNodeSharedPtr& rSecondArg ) : + ComposedExpression( const ExpressionNodeSharedPtr& rFirstArg, + const ExpressionNodeSharedPtr& rSecondArg ) : BinaryExpressionBase( rFirstArg, rSecondArg ) { } @@ -195,8 +195,8 @@ namespace slideshow class MinExpression : public BinaryExpressionBase { public: - MinExpression( const ExpressionNodeSharedPtr& rFirstArg, - const ExpressionNodeSharedPtr& rSecondArg ) : + MinExpression( const ExpressionNodeSharedPtr& rFirstArg, + const ExpressionNodeSharedPtr& rSecondArg ) : BinaryExpressionBase( rFirstArg, rSecondArg ) { } @@ -210,8 +210,8 @@ namespace slideshow class MaxExpression : public BinaryExpressionBase { public: - MaxExpression( const ExpressionNodeSharedPtr& rFirstArg, - const ExpressionNodeSharedPtr& rSecondArg ) : + MaxExpression( const ExpressionNodeSharedPtr& rFirstArg, + const ExpressionNodeSharedPtr& rSecondArg ) : BinaryExpressionBase( rFirstArg, rSecondArg ) { } @@ -227,53 +227,53 @@ namespace slideshow { return ExpressionNodeSharedPtr( new ConstantValueExpression(rConstantValue) ); } - + ExpressionNodeSharedPtr ExpressionNodeFactory::createValueTExpression() { return ExpressionNodeSharedPtr( new TValueExpression() ); } - ExpressionNodeSharedPtr ExpressionNodeFactory::createPlusExpression( const ExpressionNodeSharedPtr& rLHS, - const ExpressionNodeSharedPtr& rRHS ) + ExpressionNodeSharedPtr ExpressionNodeFactory::createPlusExpression( const ExpressionNodeSharedPtr& rLHS, + const ExpressionNodeSharedPtr& rRHS ) { return ExpressionNodeSharedPtr( new PlusExpression(rLHS, rRHS) ); } - ExpressionNodeSharedPtr ExpressionNodeFactory::createMinusExpression( const ExpressionNodeSharedPtr& rLHS, - const ExpressionNodeSharedPtr& rRHS ) + ExpressionNodeSharedPtr ExpressionNodeFactory::createMinusExpression( const ExpressionNodeSharedPtr& rLHS, + const ExpressionNodeSharedPtr& rRHS ) { return ExpressionNodeSharedPtr( new MinusExpression(rLHS, rRHS) ); } - ExpressionNodeSharedPtr ExpressionNodeFactory::createMultipliesExpression( const ExpressionNodeSharedPtr& rLHS, - const ExpressionNodeSharedPtr& rRHS ) + ExpressionNodeSharedPtr ExpressionNodeFactory::createMultipliesExpression( const ExpressionNodeSharedPtr& rLHS, + const ExpressionNodeSharedPtr& rRHS ) { return ExpressionNodeSharedPtr( new MultipliesExpression(rLHS, rRHS) ); } - ExpressionNodeSharedPtr ExpressionNodeFactory::createDividesExpression( const ExpressionNodeSharedPtr& rLHS, - const ExpressionNodeSharedPtr& rRHS ) + ExpressionNodeSharedPtr ExpressionNodeFactory::createDividesExpression( const ExpressionNodeSharedPtr& rLHS, + const ExpressionNodeSharedPtr& rRHS ) { return ExpressionNodeSharedPtr( new DividesExpression(rLHS, rRHS) ); } - ExpressionNodeSharedPtr ExpressionNodeFactory::createComposedExpression ( const ExpressionNodeSharedPtr& rOuterFunction, - const ExpressionNodeSharedPtr& rInnerFunction ) + ExpressionNodeSharedPtr ExpressionNodeFactory::createComposedExpression ( const ExpressionNodeSharedPtr& rOuterFunction, + const ExpressionNodeSharedPtr& rInnerFunction ) { return ExpressionNodeSharedPtr( new ComposedExpression(rOuterFunction, rInnerFunction) ); } - ExpressionNodeSharedPtr ExpressionNodeFactory::createMinExpression ( const ExpressionNodeSharedPtr& rOuterFunction, - const ExpressionNodeSharedPtr& rInnerFunction ) + ExpressionNodeSharedPtr ExpressionNodeFactory::createMinExpression ( const ExpressionNodeSharedPtr& rOuterFunction, + const ExpressionNodeSharedPtr& rInnerFunction ) { return ExpressionNodeSharedPtr( new MinExpression(rOuterFunction, rInnerFunction) ); } - ExpressionNodeSharedPtr ExpressionNodeFactory::createMaxExpression ( const ExpressionNodeSharedPtr& rOuterFunction, - const ExpressionNodeSharedPtr& rInnerFunction ) + ExpressionNodeSharedPtr ExpressionNodeFactory::createMaxExpression ( const ExpressionNodeSharedPtr& rOuterFunction, + const ExpressionNodeSharedPtr& rInnerFunction ) { return ExpressionNodeSharedPtr( new MaxExpression(rOuterFunction, rInnerFunction) ); } - + } } diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx index 0f35c7ca396f..546d84b06ea9 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.cxx +++ b/slideshow/source/engine/rehearsetimingsactivity.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,14 +77,14 @@ public: mpActivity(rActivity), mrActivityQueue( rActivityQueue ) {} - + virtual void dispose() {} virtual bool fire() { ActivitySharedPtr pActivity( mpActivity.lock() ); if( !pActivity ) return false; - + return mrActivityQueue.addActivity( pActivity ); } @@ -92,16 +92,16 @@ public: virtual double getActivationTime( double nCurrentTime ) const { const double nElapsedTime( maTimer.getElapsedTime() ); - + return ::std::max( nCurrentTime, nCurrentTime - nElapsedTime + mnNextTime ); - } + } /// Start the internal timer void start() { maTimer.reset(); } - + /** Set the next timeout this object should generate. - + @param nextTime Absolute time, measured from the last start() call, when this event should wakeup the Activity again. If @@ -109,7 +109,7 @@ public: every setNextTimeout() call. */ void setNextTimeout( double nextTime ) { mnNextTime = nextTime; } - + private: ::canvas::tools::ElapsedTime maTimer; double mnNextTime; @@ -117,15 +117,15 @@ private: ActivitiesQueue& mrActivityQueue; }; -class RehearseTimingsActivity::MouseHandler : public MouseEventHandler, +class RehearseTimingsActivity::MouseHandler : public MouseEventHandler, private boost::noncopyable { public: explicit MouseHandler( RehearseTimingsActivity& rta ); - + void reset(); bool hasBeenClicked() const { return mbHasBeenClicked; } - + // MouseEventHandler virtual bool handleMousePressed( awt::MouseEvent const & evt ); virtual bool handleMouseReleased( awt::MouseEvent const & evt ); @@ -133,7 +133,7 @@ public: virtual bool handleMouseExited( awt::MouseEvent const & evt ); virtual bool handleMouseDragged( awt::MouseEvent const & evt ); virtual bool handleMouseMoved( awt::MouseEvent const & evt ); - + private: bool isInArea( com::sun::star::awt::MouseEvent const & evt ) const; void updatePressedState( const bool pressedState ) const; @@ -193,7 +193,7 @@ RehearseTimingsActivity::~RehearseTimingsActivity() { stop(); } - catch (uno::Exception &) + catch (uno::Exception &) { OSL_ENSURE( false, rtl::OUStringToOString( comphelper::anyToString( @@ -208,9 +208,9 @@ boost::shared_ptr<RehearseTimingsActivity> RehearseTimingsActivity::create( boost::shared_ptr<RehearseTimingsActivity> pActivity( new RehearseTimingsActivity( rContext )); - pActivity->mpMouseHandler.reset( + pActivity->mpMouseHandler.reset( new MouseHandler(*pActivity.get()) ); - pActivity->mpWakeUpEvent.reset( + pActivity->mpWakeUpEvent.reset( new WakeupEvent( rContext.mrEventQueue.getTimer(), pActivity, rContext.mrActivitiesQueue )); @@ -308,7 +308,7 @@ void RehearseTimingsActivity::dequeued() void RehearseTimingsActivity::end() { - if (isActive()) + if (isActive()) { stop(); mbActive = false; @@ -317,7 +317,7 @@ void RehearseTimingsActivity::end() basegfx::B2DRange RehearseTimingsActivity::calcSpriteRectangle( UnoViewSharedPtr const& rView ) const { - const Reference<rendering::XBitmap> xBitmap( rView->getCanvas()->getUNOCanvas(), + const Reference<rendering::XBitmap> xBitmap( rView->getCanvas()->getUNOCanvas(), UNO_QUERY ); if( !xBitmap.is() ) return basegfx::B2DRange(); @@ -349,10 +349,10 @@ void RehearseTimingsActivity::viewAdded( const UnoViewSharedPtr& rView ) 1001.0 )); // sprite should be in front of all // other sprites sprite->setAlpha( 0.8 ); - const basegfx::B2DRange spriteRectangle( + const basegfx::B2DRange spriteRectangle( calcSpriteRectangle( rView ) ); sprite->move( basegfx::B2DPoint( - spriteRectangle.getMinX(), + spriteRectangle.getMinX(), spriteRectangle.getMinY() ) ); if( maViews.empty() ) @@ -382,22 +382,22 @@ void RehearseTimingsActivity::viewChanged( const UnoViewSharedPtr& rView ) // find entry corresponding to modified view ViewsVecT::iterator aModifiedEntry( std::find_if( - maViews.begin(), + maViews.begin(), maViews.end(), boost::bind( std::equal_to<UnoViewSharedPtr>(), rView, - // select view: + // select view: boost::bind( std::select1st<ViewsVecT::value_type>(), _1 )))); - + OSL_ASSERT( aModifiedEntry != maViews.end() ); if( aModifiedEntry == maViews.end() ) return; // new sprite pos, transformation might have changed: maSpriteRectangle = calcSpriteRectangle( rView ); - - // reposition sprite: + + // reposition sprite: aModifiedEntry->second->move( maSpriteRectangle.getMinimum() ); // sprites changed, need screen update @@ -407,16 +407,16 @@ void RehearseTimingsActivity::viewChanged( const UnoViewSharedPtr& rView ) void RehearseTimingsActivity::viewsChanged() { if( !maViews.empty() ) - { + { // new sprite pos, transformation might have changed: maSpriteRectangle = calcSpriteRectangle( maViews.front().first ); - + // reposition sprites for_each_sprite( boost::bind( &cppcanvas::Sprite::move, _1, boost::cref(maSpriteRectangle.getMinimum())) ); - // sprites changed, need screen update + // sprites changed, need screen update mrScreenUpdater.notifyUpdate(); } } @@ -463,13 +463,13 @@ void RehearseTimingsActivity::paint( cppcanvas::CanvasSharedPtr const & canvas ) Rectangle rect = Rectangle( 0,0, maSpriteSizePixel.getX(), maSpriteSizePixel.getY()); - if (mbDrawPressed) + if (mbDrawPressed) { blackHole.SetTextColor( COL_BLACK ); blackHole.SetFillColor( COL_LIGHTGRAY ); blackHole.SetLineColor( COL_GRAY ); } - else + else { blackHole.SetTextColor( COL_BLACK ); blackHole.SetFillColor( COL_WHITE ); diff --git a/slideshow/source/engine/rehearsetimingsactivity.hxx b/slideshow/source/engine/rehearsetimingsactivity.hxx index 666c87c40380..f600e3446adb 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.hxx +++ b/slideshow/source/engine/rehearsetimingsactivity.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ class RehearseTimingsActivity : public Activity, public: /** Creates the activity. */ - static boost::shared_ptr<RehearseTimingsActivity> create( + static boost::shared_ptr<RehearseTimingsActivity> create( const SlideShowContext& rContext ); virtual ~RehearseTimingsActivity(); @@ -69,7 +69,7 @@ public: /** Starts and shows the timer; adds to activity queue. */ void start(); - + /** Stops and hides the timer. @return elapsed time */ @@ -84,7 +84,7 @@ public: virtual void viewRemoved( const UnoViewSharedPtr& rView ); virtual void viewChanged( const UnoViewSharedPtr& rView ); virtual void viewsChanged(); - + // Disposable: virtual void dispose(); // Activity: @@ -93,18 +93,18 @@ public: virtual bool isActive() const; virtual void dequeued(); virtual void end(); - + private: class WakeupEvent; explicit RehearseTimingsActivity( const SlideShowContext& rContext ); - + void paint( ::cppcanvas::CanvasSharedPtr const & canvas ) const; void paintAllSprites() const; - + class MouseHandler; friend class MouseHandler; - + typedef ::std::vector< ::std::pair<UnoViewSharedPtr, boost::shared_ptr<cppcanvas::CustomSprite> > > ViewsVecT; @@ -120,7 +120,7 @@ private: ::basegfx::B2DRange calcSpriteRectangle( UnoViewSharedPtr const & rView ) const; - + EventQueue& mrEventQueue; ScreenUpdater& mrScreenUpdater; EventMultiplexer& mrEventMultiplexer; @@ -128,10 +128,10 @@ private: canvas::tools::ElapsedTime maElapsedTime; ViewsVecT maViews; - + /// screen rect of sprite (in view coordinates!) ::basegfx::B2DRange maSpriteRectangle; - + Font maFont; boost::shared_ptr<WakeupEvent> mpWakeUpEvent; boost::shared_ptr<MouseHandler> mpMouseHandler; diff --git a/slideshow/source/engine/screenupdater.cxx b/slideshow/source/engine/screenupdater.cxx index ee1e4840900d..52d11b8ad9d4 100644 --- a/slideshow/source/engine/screenupdater.cxx +++ b/slideshow/source/engine/screenupdater.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,12 +62,12 @@ namespace internal ViewUpdateSharedPtr, std::vector<ViewUpdateSharedPtr> > maUpdaters; - /// Views that have been notified for update + /// Views that have been notified for update UpdateRequestVector maViewUpdateRequests; /// List of View. Used to issue screen updates on. UnoViewContainer const& mrViewContainer; - + /// True, if a notifyUpdate() for all views has been issued. bool mbUpdateAllRequest; @@ -76,7 +76,7 @@ namespace internal /// The screen is updated only when mnLockCount==0 sal_Int32 mnLockCount; - + explicit ImplScreenUpdater( UnoViewContainer const& rViewContainer ) : maUpdaters(), maViewUpdateRequests(), @@ -101,11 +101,11 @@ namespace internal { mpImpl->mbUpdateAllRequest = true; } - - void ScreenUpdater::notifyUpdate( const UnoViewSharedPtr& rView, + + void ScreenUpdater::notifyUpdate( const UnoViewSharedPtr& rView, bool bViewClobbered ) { - mpImpl->maViewUpdateRequests.push_back( + mpImpl->maViewUpdateRequests.push_back( std::make_pair(rView, bViewClobbered) ); if( bViewClobbered ) @@ -116,10 +116,10 @@ namespace internal { if (mpImpl->mnLockCount > 0) return; - + // cases: // - // (a) no update necessary at all + // (a) no update necessary at all // // (b) no ViewUpdate-generated update // I. update all views requested -> for_each( mrViewContainer ) @@ -130,12 +130,12 @@ namespace internal // any ViewUpdate-triggered updates? const bool bViewUpdatesNeeded( - mpImpl->maUpdaters.apply( + mpImpl->maUpdaters.apply( boost::mem_fn(&ViewUpdate::needsUpdate)) ); if( bViewUpdatesNeeded ) { - mpImpl->maUpdaters.applyAll( + mpImpl->maUpdaters.applyAll( boost::mem_fn((bool (ViewUpdate::*)())&ViewUpdate::update) ); } @@ -145,8 +145,8 @@ namespace internal // unconditionally update all views std::for_each( mpImpl->mrViewContainer.begin(), mpImpl->mrViewContainer.end(), - mpImpl->mbViewClobbered ? - boost::mem_fn(&View::paintScreen) : + mpImpl->mbViewClobbered ? + boost::mem_fn(&View::paintScreen) : boost::mem_fn(&View::updateScreen) ); } else if( !mpImpl->maViewUpdateRequests.empty() ) diff --git a/slideshow/source/engine/shapeattributelayer.cxx b/slideshow/source/engine/shapeattributelayer.cxx index ca3b9f8997aa..93ea4ea4b5bb 100644 --- a/slideshow/source/engine/shapeattributelayer.cxx +++ b/slideshow/source/engine/shapeattributelayer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ namespace slideshow namespace internal { /** Update state ids - + This method updates all state IDs from possible children. Whenever a child's state ID changed, we increment ours. @@ -85,10 +85,10 @@ namespace slideshow appropriately combining it with children values (by evaluating the mnAdditiveMode member). */ - template< typename T > T ShapeAttributeLayer::calcValue( const T& rCurrValue, - bool bThisInstanceValid, + template< typename T > T ShapeAttributeLayer::calcValue( const T& rCurrValue, + bool bThisInstanceValid, bool (ShapeAttributeLayer::*pIsValid)() const, - T (ShapeAttributeLayer::*pGetValue)() const ) const + T (ShapeAttributeLayer::*pGetValue)() const ) const { // deviated from the (*shared_ptr).*mpFuncPtr notation // here, since gcc does not seem to parse that as a member @@ -109,10 +109,10 @@ namespace slideshow case animations::AnimationAdditiveMode::BASE: // FALTHROUGH intended case animations::AnimationAdditiveMode::REPLACE: - // TODO(F2): reverse-engineer the semantics of these + // TODO(F2): reverse-engineer the semantics of these // values - - // currently, treat them the same and replace + + // currently, treat them the same and replace // the child value by our own return rCurrValue; @@ -125,16 +125,16 @@ namespace slideshow } else { - // this object is the only one defining + // this object is the only one defining // the value, so take it return rCurrValue; } } else { - return bChildInstanceValueValid ? - ((*mpChild).*pGetValue)() : - T(); // pass on child value, regardless + return bChildInstanceValueValid ? + ((*mpChild).*pGetValue)() : + T(); // pass on child value, regardless // if it's valid or not. If not, it's // a default anyway } @@ -159,7 +159,7 @@ namespace slideshow meFillStyle( drawing::FillStyle_NONE ), meLineStyle( drawing::LineStyle_NONE ), - meCharPosture( awt::FontSlant_NONE ), + meCharPosture( awt::FontSlant_NONE ), mnUnderlineMode(), maDimColor(), @@ -178,33 +178,33 @@ namespace slideshow mbVisibility( false ), - mbWidthValid( false ), - mbHeightValid( false ), - mbPosXValid( false ), - mbPosYValid( false ), - mbClipValid( false ), + mbWidthValid( false ), + mbHeightValid( false ), + mbPosXValid( false ), + mbPosYValid( false ), + mbClipValid( false ), - mbFontFamilyValid( false ), + mbFontFamilyValid( false ), - mbRotationAngleValid( false ), - mbShearXAngleValid( false ), - mbShearYAngleValid( false ), + mbRotationAngleValid( false ), + mbShearXAngleValid( false ), + mbShearYAngleValid( false ), - mbAlphaValid( false ), + mbAlphaValid( false ), mbCharRotationAngleValid( false ), - mbCharScaleValid( false ), - - mbDimColorValid( false ), - mbFillColorValid( false ), - mbLineColorValid( false ), - mbCharColorValid( false ), - - mbFillStyleValid( false ), - mbLineStyleValid( false ), - mbCharWeightValid( false ), - mbUnderlineModeValid( false ), - mbCharPostureValid( false ), + mbCharScaleValid( false ), + + mbDimColorValid( false ), + mbFillColorValid( false ), + mbLineColorValid( false ), + mbCharColorValid( false ), + + mbFillStyleValid( false ), + mbLineStyleValid( false ), + mbCharWeightValid( false ), + mbUnderlineModeValid( false ), + mbCharPostureValid( false ), mbVisibilityValid( false ) { } @@ -222,7 +222,7 @@ namespace slideshow // we have it - replace by removed child's sibling. mpChild = rChildLayer->getChildLayer(); - // if we're now the first one, defensively increment _all_ + // if we're now the first one, defensively increment _all_ // state ids: possibly all underlying attributes have now // changed to default if( !haveChild() ) @@ -233,8 +233,8 @@ namespace slideshow ++mnClipState; ++mnAlphaState; ++mnPositionState; - ++mnContentState; - ++mnVisibilityState; + ++mnContentState; + ++mnVisibilityState; } } else @@ -249,12 +249,12 @@ namespace slideshow return true; } - + ShapeAttributeLayerSharedPtr ShapeAttributeLayer::getChildLayer() const { return mpChild; } - + void ShapeAttributeLayer::setAdditiveMode( sal_Int16 nMode ) { if( mnAdditiveMode != nMode ) @@ -262,15 +262,15 @@ namespace slideshow // TODO(P1): Check whether it pays off to check more // detailed, which attributes really change - // defensively increment all states - possibly each of them + // defensively increment all states - possibly each of them // will change with different additive mode ++mnTransformationState; ++mnClipState; ++mnAlphaState; ++mnPositionState; - ++mnContentState; - ++mnVisibilityState; - } + ++mnContentState; + ++mnVisibilityState; + } mnAdditiveMode = nMode; } @@ -279,13 +279,13 @@ namespace slideshow { return mbWidthValid ? true : haveChild() ? mpChild->isWidthValid() : false; } - + double ShapeAttributeLayer::getWidth() const { - return calcValue< double >( + return calcValue< double >( maSize.getX(), mbWidthValid, - &ShapeAttributeLayer::isWidthValid, + &ShapeAttributeLayer::isWidthValid, &ShapeAttributeLayer::getWidth ); } @@ -303,13 +303,13 @@ namespace slideshow { return mbHeightValid ? true : haveChild() ? mpChild->isHeightValid() : false; } - + double ShapeAttributeLayer::getHeight() const { - return calcValue< double >( + return calcValue< double >( maSize.getY(), mbHeightValid, - &ShapeAttributeLayer::isHeightValid, + &ShapeAttributeLayer::isHeightValid, &ShapeAttributeLayer::getHeight ); } @@ -341,10 +341,10 @@ namespace slideshow double ShapeAttributeLayer::getPosX() const { - return calcValue< double >( + return calcValue< double >( maPosition.getX(), mbPosXValid, - &ShapeAttributeLayer::isPosXValid, + &ShapeAttributeLayer::isPosXValid, &ShapeAttributeLayer::getPosX ); } @@ -365,10 +365,10 @@ namespace slideshow double ShapeAttributeLayer::getPosY() const { - return calcValue< double >( + return calcValue< double >( maPosition.getY(), mbPosYValid, - &ShapeAttributeLayer::isPosYValid, + &ShapeAttributeLayer::isPosYValid, &ShapeAttributeLayer::getPosY ); } @@ -396,10 +396,10 @@ namespace slideshow double ShapeAttributeLayer::getRotationAngle() const { - return calcValue< double >( + return calcValue< double >( mnRotationAngle, mbRotationAngleValid, - &ShapeAttributeLayer::isRotationAngleValid, + &ShapeAttributeLayer::isRotationAngleValid, &ShapeAttributeLayer::getRotationAngle ); } @@ -420,7 +420,7 @@ namespace slideshow double ShapeAttributeLayer::getShearXAngle() const { - return calcValue( mnShearXAngle, + return calcValue( mnShearXAngle, mbShearXAngleValid, &ShapeAttributeLayer::isShearXAngleValid, &ShapeAttributeLayer::getShearXAngle ); @@ -443,7 +443,7 @@ namespace slideshow double ShapeAttributeLayer::getShearYAngle() const { - return calcValue( mnShearYAngle, + return calcValue( mnShearYAngle, mbShearYAngleValid, &ShapeAttributeLayer::isShearYAngleValid, &ShapeAttributeLayer::getShearYAngle ); @@ -466,7 +466,7 @@ namespace slideshow double ShapeAttributeLayer::getAlpha() const { - return calcValue( mnAlpha, + return calcValue( mnAlpha, mbAlphaValid, &ShapeAttributeLayer::isAlphaValid, &ShapeAttributeLayer::getAlpha ); @@ -481,7 +481,7 @@ namespace slideshow mbAlphaValid = true; ++mnAlphaState; } - + bool ShapeAttributeLayer::isClipValid() const { return mbClipValid ? true : haveChild() ? mpChild->isClipValid() : false; @@ -509,10 +509,10 @@ namespace slideshow { return mbDimColorValid ? true : haveChild() ? mpChild->isDimColorValid() : false; } - + RGBColor ShapeAttributeLayer::getDimColor() const { - return calcValue( maDimColor, + return calcValue( maDimColor, mbDimColorValid, &ShapeAttributeLayer::isDimColorValid, &ShapeAttributeLayer::getDimColor ); @@ -529,10 +529,10 @@ namespace slideshow { return mbFillColorValid ? true : haveChild() ? mpChild->isFillColorValid() : false; } - + RGBColor ShapeAttributeLayer::getFillColor() const { - return calcValue( maFillColor, + return calcValue( maFillColor, mbFillColorValid, &ShapeAttributeLayer::isFillColorValid, &ShapeAttributeLayer::getFillColor ); @@ -552,7 +552,7 @@ namespace slideshow RGBColor ShapeAttributeLayer::getLineColor() const { - return calcValue( maLineColor, + return calcValue( maLineColor, mbLineColorValid, &ShapeAttributeLayer::isLineColorValid, &ShapeAttributeLayer::getLineColor ); @@ -569,10 +569,10 @@ namespace slideshow { return mbFillStyleValid ? true : haveChild() ? mpChild->isFillStyleValid() : false; } - + sal_Int16 ShapeAttributeLayer::getFillStyle() const { - // mnAdditiveMode is ignored, cannot combine strings in + // mnAdditiveMode is ignored, cannot combine strings in // any sensible way if( mbFillStyleValid ) return sal::static_int_cast<sal_Int16>(meFillStyle); @@ -597,7 +597,7 @@ namespace slideshow sal_Int16 ShapeAttributeLayer::getLineStyle() const { - // mnAdditiveMode is ignored, cannot combine strings in + // mnAdditiveMode is ignored, cannot combine strings in // any sensible way if( mbLineStyleValid ) return sal::static_int_cast<sal_Int16>(meLineStyle); @@ -646,7 +646,7 @@ namespace slideshow RGBColor ShapeAttributeLayer::getCharColor() const { - return calcValue( maCharColor, + return calcValue( maCharColor, mbCharColorValid, &ShapeAttributeLayer::isCharColorValid, &ShapeAttributeLayer::getCharColor ); @@ -658,7 +658,7 @@ namespace slideshow mbCharColorValid = true; ++mnContentState; } - + bool ShapeAttributeLayer::isCharRotationAngleValid() const { return mbCharRotationAngleValid ? true : haveChild() ? mpChild->isCharRotationAngleValid() : false; @@ -666,7 +666,7 @@ namespace slideshow double ShapeAttributeLayer::getCharRotationAngle() const { - return calcValue( mnCharRotationAngle, + return calcValue( mnCharRotationAngle, mbCharRotationAngleValid, &ShapeAttributeLayer::isCharRotationAngleValid, &ShapeAttributeLayer::getCharRotationAngle ); @@ -689,7 +689,7 @@ namespace slideshow double ShapeAttributeLayer::getCharWeight() const { - // mnAdditiveMode is ignored, cannot combine strings in + // mnAdditiveMode is ignored, cannot combine strings in // any sensible way if( mbCharWeightValid ) return mnCharWeight; @@ -706,7 +706,7 @@ namespace slideshow mbCharWeightValid = true; ++mnContentState; } - + bool ShapeAttributeLayer::isUnderlineModeValid() const { return mbUnderlineModeValid ? true : haveChild() ? mpChild->isUnderlineModeValid() : false; @@ -739,7 +739,7 @@ namespace slideshow ::rtl::OUString ShapeAttributeLayer::getFontFamily() const { - // mnAdditiveMode is ignored, cannot combine strings in + // mnAdditiveMode is ignored, cannot combine strings in // any sensible way if( mbFontFamilyValid ) return maFontFamily; @@ -763,7 +763,7 @@ namespace slideshow sal_Int16 ShapeAttributeLayer::getCharPosture() const { - // mnAdditiveMode is ignored, cannot combine strings in + // mnAdditiveMode is ignored, cannot combine strings in // any sensible way if( mbCharPostureValid ) return sal::static_int_cast<sal_Int16>(meCharPosture); @@ -788,7 +788,7 @@ namespace slideshow double ShapeAttributeLayer::getCharScale() const { - return calcValue( mnCharScale, + return calcValue( mnCharScale, mbCharScaleValid, &ShapeAttributeLayer::isCharScaleValid, &ShapeAttributeLayer::getCharScale ); @@ -804,53 +804,53 @@ namespace slideshow ++mnContentState; } - State::StateId ShapeAttributeLayer::getTransformationState() const - { - return haveChild() ? + State::StateId ShapeAttributeLayer::getTransformationState() const + { + return haveChild() ? ::std::max( mnTransformationState, - mpChild->getTransformationState() ) : - mnTransformationState; + mpChild->getTransformationState() ) : + mnTransformationState; } State::StateId ShapeAttributeLayer::getClipState() const - { - return haveChild() ? + { + return haveChild() ? ::std::max( mnClipState, - mpChild->getClipState() ) : - mnClipState; + mpChild->getClipState() ) : + mnClipState; } State::StateId ShapeAttributeLayer::getAlphaState() const - { - return haveChild() ? + { + return haveChild() ? ::std::max( mnAlphaState, - mpChild->getAlphaState() ) : - mnAlphaState; + mpChild->getAlphaState() ) : + mnAlphaState; } State::StateId ShapeAttributeLayer::getPositionState() const - { - return haveChild() ? + { + return haveChild() ? ::std::max( mnPositionState, - mpChild->getPositionState() ) : - mnPositionState; + mpChild->getPositionState() ) : + mnPositionState; } State::StateId ShapeAttributeLayer::getContentState() const - { - return haveChild() ? + { + return haveChild() ? ::std::max( mnContentState, - mpChild->getContentState() ) : - mnContentState; + mpChild->getContentState() ) : + mnContentState; } - + State::StateId ShapeAttributeLayer::getVisibilityState() const - { - return haveChild() ? + { + return haveChild() ? ::std::max( mnVisibilityState, - mpChild->getVisibilityState() ) : - mnVisibilityState; + mpChild->getVisibilityState() ) : + mnVisibilityState; } - + } } diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx index 339161e19ab6..dee9298e57e9 100644 --- a/slideshow/source/engine/shapes/appletshape.cxx +++ b/slideshow/source/engine/shapes/appletshape.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_slideshow.hxx" - + // must be first #include <canvas/debug.hxx> #include <canvas/verbosetrace.hxx> @@ -81,9 +81,9 @@ namespace slideshow @param nNumPropEntries Number of property table entries (in pPropCopyTable) */ - AppletShape( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape, - double nPrio, + AppletShape( const ::com::sun::star::uno::Reference< + ::com::sun::star::drawing::XShape >& xShape, + double nPrio, const ::rtl::OUString& rServiceName, const char** pPropCopyTable, sal_Size nNumPropEntries, @@ -94,11 +94,11 @@ namespace slideshow // View layer methods //------------------------------------------------------------------ - virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer, - bool bRedrawLayer ); - virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ); + virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer, + bool bRedrawLayer ); + virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ); virtual bool clearAllViewLayers(); - + // ExternalShapeBase methods //------------------------------------------------------------------ @@ -160,8 +160,8 @@ namespace slideshow // resize all ViewShapes ::std::for_each( maViewAppletShapes.begin(), maViewAppletShapes.end(), - ::boost::bind( - &ViewAppletShape::resize, + ::boost::bind( + &ViewAppletShape::resize, _1, ::boost::cref( AppletShape::getBounds())) ); } @@ -173,22 +173,22 @@ namespace slideshow { try { - maViewAppletShapes.push_back( - ViewAppletShapeSharedPtr( new ViewAppletShape( rNewLayer, + maViewAppletShapes.push_back( + ViewAppletShapeSharedPtr( new ViewAppletShape( rNewLayer, getXShape(), maServiceName, mpPropCopyTable, mnNumPropEntries, mxComponentContext ))); - + // push new size to view shape maViewAppletShapes.back()->resize( getBounds() ); - + // render the Shape on the newly added ViewLayer if( bRedrawLayer ) maViewAppletShapes.back()->render( getBounds() ); } - catch(uno::Exception&) + catch(uno::Exception&) { // ignore failed shapes - slideshow should run with // the remaining content @@ -196,14 +196,14 @@ namespace slideshow } // --------------------------------------------------------------------- - + bool AppletShape::removeViewLayer( const ViewLayerSharedPtr& rLayer ) { const ViewAppletShapeVector::iterator aEnd( maViewAppletShapes.end() ); - OSL_ENSURE( ::std::count_if(maViewAppletShapes.begin(), - aEnd, - ::boost::bind<bool>( + OSL_ENSURE( ::std::count_if(maViewAppletShapes.begin(), + aEnd, + ::boost::bind<bool>( ::std::equal_to< ViewLayerSharedPtr >(), ::boost::bind( &ViewAppletShape::getViewLayer, _1 ), ::boost::cref( rLayer ) ) ) < 2, @@ -211,9 +211,9 @@ namespace slideshow ViewAppletShapeVector::iterator aIter; - if( (aIter=::std::remove_if( maViewAppletShapes.begin(), - aEnd, - ::boost::bind<bool>( + if( (aIter=::std::remove_if( maViewAppletShapes.begin(), + aEnd, + ::boost::bind<bool>( ::std::equal_to< ViewLayerSharedPtr >(), ::boost::bind( &ViewAppletShape::getViewLayer, _1 ), @@ -230,7 +230,7 @@ namespace slideshow } // --------------------------------------------------------------------- - + bool AppletShape::clearAllViewLayers() { maViewAppletShapes.clear(); @@ -244,13 +244,13 @@ namespace slideshow // redraw all view shapes, by calling their update() method if( ::std::count_if( maViewAppletShapes.begin(), maViewAppletShapes.end(), - ::boost::bind<bool>( - ::boost::mem_fn( &ViewAppletShape::render ), + ::boost::bind<bool>( + ::boost::mem_fn( &ViewAppletShape::render ), _1, - ::boost::cref( rCurrBounds ) ) ) + ::boost::cref( rCurrBounds ) ) ) != static_cast<ViewAppletShapeVector::difference_type>(maViewAppletShapes.size()) ) { - // at least one of the ViewShape::update() calls did return + // at least one of the ViewShape::update() calls did return // false - update failed on at least one ViewLayer return false; } @@ -259,7 +259,7 @@ namespace slideshow } // --------------------------------------------------------------------- - + bool AppletShape::implStartIntrinsicAnimation() { ::std::for_each( maViewAppletShapes.begin(), @@ -268,12 +268,12 @@ namespace slideshow _1, ::boost::cref( getBounds() ))); mbIsPlaying = true; - + return true; } - + // --------------------------------------------------------------------- - + bool AppletShape::implEndIntrinsicAnimation() { ::std::for_each( maViewAppletShapes.begin(), @@ -286,7 +286,7 @@ namespace slideshow } // --------------------------------------------------------------------- - + bool AppletShape::implPauseIntrinsicAnimation() { // TODO(F1): any way of temporarily disabling/deactivating diff --git a/slideshow/source/engine/shapes/appletshape.hxx b/slideshow/source/engine/shapes/appletshape.hxx index 6ea4462d97af..fa006fe31ffe 100644 --- a/slideshow/source/engine/shapes/appletshape.hxx +++ b/slideshow/source/engine/shapes/appletshape.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ namespace slideshow class Shape; boost::shared_ptr<Shape> createAppletShape( - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, double nPrio, const ::rtl::OUString& rServiceName, diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx index fd6b0cfb1b68..bcfebf8f09e3 100644 --- a/slideshow/source/engine/shapes/backgroundshape.cxx +++ b/slideshow/source/engine/shapes/backgroundshape.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,20 +83,20 @@ namespace slideshow peculiarities of the draw API regarding background content. */ - BackgroundShape( const ::com::sun::star::uno::Reference< + BackgroundShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xMasterPage, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getXShape() const; // View layer methods //------------------------------------------------------------------ - virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer, - bool bRedrawLayer ); + virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer, + bool bRedrawLayer ); virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ); virtual bool clearAllViewLayers(); @@ -109,7 +109,7 @@ namespace slideshow virtual ::basegfx::B2DRectangle getUpdateArea() const; virtual bool isVisible() const; virtual double getPriority() const; - virtual bool isBackgroundDetached() const; + virtual bool isBackgroundDetached() const; // render methods @@ -118,17 +118,17 @@ namespace slideshow virtual bool update() const; virtual bool render() const; virtual bool isContentChanged() const; - + private: /// The metafile actually representing the Shape - GDIMetaFileSharedPtr mpMtf; + GDIMetaFileSharedPtr mpMtf; // The attributes of this Shape - ::basegfx::B2DRectangle maBounds; // always needed for rendering + ::basegfx::B2DRectangle maBounds; // always needed for rendering /// the list of active view shapes (one for each registered view layer) typedef ::std::vector< ViewBackgroundShapeSharedPtr > ViewBackgroundShapeVector; - ViewBackgroundShapeVector maViewShapes; + ViewBackgroundShapeVector maViewShapes; }; @@ -142,7 +142,7 @@ namespace slideshow maBounds(), maViewShapes() { - uno::Reference< beans::XPropertySet > xPropSet( xDrawPage, + uno::Reference< beans::XPropertySet > xPropSet( xDrawPage, uno::UNO_QUERY_THROW ); GDIMetaFileSharedPtr pMtf( new GDIMetaFile() ); @@ -177,15 +177,15 @@ namespace slideshow return uno::Reference< drawing::XShape >(); } - void BackgroundShape::addViewLayer( const ViewLayerSharedPtr& rNewLayer, - bool bRedrawLayer ) + void BackgroundShape::addViewLayer( const ViewLayerSharedPtr& rNewLayer, + bool bRedrawLayer ) { ViewBackgroundShapeVector::iterator aEnd( maViewShapes.end() ); // already added? - if( ::std::find_if( maViewShapes.begin(), - aEnd, - ::boost::bind<bool>( + if( ::std::find_if( maViewShapes.begin(), + aEnd, + ::boost::bind<bool>( ::std::equal_to< ViewLayerSharedPtr >(), ::boost::bind( &ViewBackgroundShape::getViewLayer, _1 ), @@ -195,8 +195,8 @@ namespace slideshow return; } - maViewShapes.push_back( - ViewBackgroundShapeSharedPtr( + maViewShapes.push_back( + ViewBackgroundShapeSharedPtr( new ViewBackgroundShape( rNewLayer, maBounds ) ) ); @@ -209,9 +209,9 @@ namespace slideshow { const ViewBackgroundShapeVector::iterator aEnd( maViewShapes.end() ); - OSL_ENSURE( ::std::count_if(maViewShapes.begin(), - aEnd, - ::boost::bind<bool>( + OSL_ENSURE( ::std::count_if(maViewShapes.begin(), + aEnd, + ::boost::bind<bool>( ::std::equal_to< ViewLayerSharedPtr >(), ::boost::bind( &ViewBackgroundShape::getViewLayer, _1 ), @@ -220,9 +220,9 @@ namespace slideshow ViewBackgroundShapeVector::iterator aIter; - if( (aIter=::std::remove_if( maViewShapes.begin(), - aEnd, - ::boost::bind<bool>( + if( (aIter=::std::remove_if( maViewShapes.begin(), + aEnd, + ::boost::bind<bool>( ::std::equal_to< ViewLayerSharedPtr >(), ::boost::bind( &ViewBackgroundShape::getViewLayer, _1 ), @@ -248,7 +248,7 @@ namespace slideshow { return maBounds; } - + ::basegfx::B2DRectangle BackgroundShape::getDomBounds() const { return maBounds; @@ -295,13 +295,13 @@ namespace slideshow // redraw all view shapes, by calling their render() method if( ::std::count_if( maViewShapes.begin(), - maViewShapes.end(), + maViewShapes.end(), ::boost::bind( &ViewBackgroundShape::render, _1, ::boost::cref( mpMtf ) ) ) != static_cast<ViewBackgroundShapeVector::difference_type>(maViewShapes.size()) ) { - // at least one of the ViewBackgroundShape::render() calls did return + // at least one of the ViewBackgroundShape::render() calls did return // false - update failed on at least one ViewLayer return false; } @@ -321,13 +321,13 @@ namespace slideshow ////////////////////////////////////////////////////////// - ShapeSharedPtr createBackgroundShape( + ShapeSharedPtr createBackgroundShape( const uno::Reference< drawing::XDrawPage >& xDrawPage, const uno::Reference< drawing::XDrawPage >& xMasterPage, const SlideShowContext& rContext ) { return ShapeSharedPtr( - new BackgroundShape( + new BackgroundShape( xDrawPage, xMasterPage, rContext )); diff --git a/slideshow/source/engine/shapes/backgroundshape.hxx b/slideshow/source/engine/shapes/backgroundshape.hxx index 5ce99da95a54..37bcb6b2426f 100644 --- a/slideshow/source/engine/shapes/backgroundshape.hxx +++ b/slideshow/source/engine/shapes/backgroundshape.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace slideshow namespace internal { class Shape; - struct SlideShowContext; + struct SlideShowContext; /** Representation of a draw document's background shape. @@ -50,10 +50,10 @@ namespace slideshow nor attributable, those more specialized derivations of the Shape interface are not implemented here. */ - boost::shared_ptr<Shape> createBackgroundShape( - const ::com::sun::star::uno::Reference< + boost::shared_ptr<Shape> createBackgroundShape( + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xMasterPage, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; } diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx index 6c1cab84e0eb..9dc00c2ec81b 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,7 +82,7 @@ class ScrollTextAnimNode sal_uInt32 mnFrequency; // in ms // forth and back change at mnRepeat%2: bool mbAlternate; - + public: ScrollTextAnimNode( sal_uInt32 nDuration, sal_uInt32 nRepeat, double fStart, double fStop, @@ -94,7 +94,7 @@ public: mnFrequency(nFrequency), mbAlternate(bAlternate) {} - + sal_uInt32 GetDuration() const { return mnDuration; } sal_uInt32 GetRepeat() const { return mnRepeat; } sal_uInt32 GetFullTime() const { return mnDuration * mnRepeat; } @@ -102,7 +102,7 @@ public: double GetStop() const { return mfStop; } sal_uInt32 GetFrequency() const { return mnFrequency; } bool DoAlternate() const { return mbAlternate; } - + double GetStateAtRelativeTime(sal_uInt32 nRelativeTime) const; }; @@ -113,31 +113,31 @@ double ScrollTextAnimNode::GetStateAtRelativeTime( if( mnDuration == 0 ) return mfStop; - if(mnRepeat) + if(mnRepeat) { // ending const sal_uInt32 nRepeatCount(nRelativeTime / mnDuration); sal_uInt32 nFrameTime(nRelativeTime - (nRepeatCount * mnDuration)); - - if(DoAlternate() && (nRepeatCount + 1L) % 2L) + + if(DoAlternate() && (nRepeatCount + 1L) % 2L) nFrameTime = mnDuration - nFrameTime; - + return mfStart + ((mfStop - mfStart) * (double(nFrameTime) / mnDuration)); } - else + else { // endless sal_uInt32 nFrameTime(nRelativeTime % mnDuration); - - if(DoAlternate()) + + if(DoAlternate()) { const sal_uInt32 nRepeatCount(nRelativeTime / mnDuration); - + if((nRepeatCount + 1L) % 2L) nFrameTime = mnDuration - nFrameTime; } - + return mfStart + ((mfStop - mfStart) * (double(nFrameTime) / mnDuration)); } } @@ -148,14 +148,14 @@ class ActivityImpl : public Activity, { public: virtual ~ActivityImpl(); - + ActivityImpl( SlideShowContext const& rContext, boost::shared_ptr<WakeupEvent> const& pWakeupEvent, boost::shared_ptr<DrawShape> const& pDrawShape ); bool enableAnimations(); - + // Disposable: virtual void dispose(); // Activity: @@ -165,23 +165,23 @@ public: virtual void dequeued(); virtual void end(); -private: +private: void updateShapeAttributes( double fTime, basegfx::B2DRectangle const& parentBounds ); - + // Access to VisibleWhenSTarted flags sal_Bool IsVisibleWhenStarted() const { return mbVisibleWhenStarted; } sal_Bool IsVisibleWhenStopped() const { return mbVisibleWhenStopped; } - + // scroll horizontal? if sal_False, scroll is vertical. bool ScrollHorizontal() const { return (drawing::TextAnimationDirection_LEFT == meDirection || drawing::TextAnimationDirection_RIGHT == meDirection); } - + // Access to StepWidth in logical units sal_uInt32 GetStepWidthLogic() const; - + // is the animation direction opposite? bool DoScrollForward() const { return (drawing::TextAnimationDirection_RIGHT == meDirection || @@ -190,10 +190,10 @@ private: // do alternate text directions? bool DoAlternate() const { return mbAlternate; } - + // do scroll in? bool DoScrollIn() const { return mbScrollIn; } - + // Scroll helper methods void ImpForceScrollTextAnimNodes(); ScrollTextAnimNode* ImpGetScrollTextAnimNode( @@ -205,7 +205,7 @@ private: double GetMixerState(sal_uInt32 nTime); //////////////////////////////////////////////////////////////////// - + SlideShowContext maContext; boost::shared_ptr<WakeupEvent> mpWakeupEvent; boost::weak_ptr<DrawShape> mpParentDrawShape; @@ -219,38 +219,38 @@ private: bool mbIsDisposed; bool mbIsActive; drawing::TextAnimationKind meAnimKind; - + // The blink frequency in ms sal_uInt32 mnFrequency; - + // The repeat count, init to 0L which means endless sal_uInt32 mnRepeat; - + // Flag to decide if text will be shown when animation has ended bool mbVisibleWhenStopped; bool mbVisibleWhenStarted; // Flag decides if TextScroll alternates. Default is sal_False. bool mbAlternate; - + // Flag to remember if this is a simple scrollin text bool mbScrollIn; - + // start time for this animation sal_uInt32 mnStartTime; - + // The AnimationDirection drawing::TextAnimationDirection meDirection; - + // Get width per Step. Negative means pixel, positive logical units sal_Int32 mnStepWidth; - + // The single anim steps std::vector< ScrollTextAnimNode > maVector; - + // the scroll rectangle Rectangle maScrollRectangleLogic; - + // the paint rectangle Rectangle maPaintRectangleLogic; }; @@ -277,60 +277,60 @@ private: double ActivityImpl::GetMixerState( sal_uInt32 nTime ) { - if( meAnimKind == drawing::TextAnimationKind_BLINK ) + if( meAnimKind == drawing::TextAnimationKind_BLINK ) { // from AInfoBlinkText: double fRetval(0.0); sal_Bool bDone(sal_False); const sal_uInt32 nLoopTime(2 * mnFrequency); - - if(mnRepeat) + + if(mnRepeat) { const sal_uInt32 nEndTime(mnRepeat * nLoopTime); - - if(nTime >= nEndTime) + + if(nTime >= nEndTime) { - if(mbVisibleWhenStopped) + if(mbVisibleWhenStopped) fRetval = 0.0; else fRetval = 1.0; - + bDone = sal_True; } } - - if(!bDone) + + if(!bDone) { sal_uInt32 nTimeInLoop(nTime % nLoopTime); fRetval = double(nTimeInLoop) / nLoopTime; } - + return fRetval; } - else + else { // from AInfoScrollText: double fRetval(0.0); ImpForceScrollTextAnimNodes(); - - if(!maVector.empty()) + + if(!maVector.empty()) { sal_uInt32 nRelativeTime; ScrollTextAnimNode* pNode = ImpGetScrollTextAnimNode(nTime, nRelativeTime); - - if(pNode) + + if(pNode) { // use node fRetval = pNode->GetStateAtRelativeTime(nRelativeTime); } - else + else { // end of animation, take last entry's end fRetval = maVector[maVector.size() - 1L].GetStop(); } } - + return fRetval; } } @@ -340,21 +340,21 @@ sal_uInt32 ActivityImpl::GetStepWidthLogic() const { // #i69847# Assuming higher DPI sal_uInt32 const PIXEL_TO_LOGIC = 30; - + sal_uInt32 nRetval(0L); - - if(mnStepWidth < 0L) + + if(mnStepWidth < 0L) { // is in pixels, convert to logical units nRetval = (-mnStepWidth * PIXEL_TO_LOGIC); } - else if(mnStepWidth > 0L) + else if(mnStepWidth > 0L) { // is in logical units nRetval = mnStepWidth; } - - if(0L == nRetval) + + if(0L == nRetval) { // step 1 pixel, canned value @@ -363,7 +363,7 @@ sal_uInt32 ActivityImpl::GetStepWidthLogic() const // from ainfoscrolltext.cxx) nRetval = 100L; } - + return nRetval; } @@ -376,7 +376,7 @@ void ActivityImpl::ImpForceScrollTextAnimNodes() double fZeroLogic, fOneLogic, fInitLogic, fDistanceLogic; double fZeroLogicAlternate = 0.0, fOneLogicAlternate = 0.0; double fZeroRelative, fOneRelative, fInitRelative,fDistanceRelative; - + if(ScrollHorizontal()) { if(DoAlternate()) @@ -387,18 +387,18 @@ void ActivityImpl::ImpForceScrollTextAnimNodes() fZeroLogicAlternate = maScrollRectangleLogic.Right() - maPaintRectangleLogic.GetWidth(); fOneLogicAlternate = maScrollRectangleLogic.Left(); } - else + else { fZeroLogicAlternate = maScrollRectangleLogic.Left(); fOneLogicAlternate = maScrollRectangleLogic.Right() - maPaintRectangleLogic.GetWidth(); } } - + fZeroLogic = maScrollRectangleLogic.Left() - maPaintRectangleLogic.GetWidth(); fOneLogic = maScrollRectangleLogic.Right(); fInitLogic = maPaintRectangleLogic.Left(); } - else + else { if(DoAlternate()) { @@ -407,22 +407,22 @@ void ActivityImpl::ImpForceScrollTextAnimNodes() fZeroLogicAlternate = maScrollRectangleLogic.Bottom() - maPaintRectangleLogic.GetHeight(); fOneLogicAlternate = maScrollRectangleLogic.Top(); } - else + else { fZeroLogicAlternate = maScrollRectangleLogic.Top(); fOneLogicAlternate = maScrollRectangleLogic.Bottom() - maPaintRectangleLogic.GetHeight(); } } - + fZeroLogic = maScrollRectangleLogic.Top() - maPaintRectangleLogic.GetHeight(); fOneLogic = maScrollRectangleLogic.Bottom(); fInitLogic = maPaintRectangleLogic.Top(); } - + fDistanceLogic = fOneLogic - fZeroLogic; fInitRelative = (fInitLogic - fZeroLogic) / fDistanceLogic; - - if(DoAlternate()) + + if(DoAlternate()) { fZeroRelative = (fZeroLogicAlternate - fZeroLogic) / fDistanceLogic; @@ -430,42 +430,42 @@ void ActivityImpl::ImpForceScrollTextAnimNodes() (fOneLogicAlternate - fZeroLogic) / fDistanceLogic; fDistanceRelative = fOneRelative - fZeroRelative; } - else + else { fZeroRelative = 0.0; fOneRelative = 1.0; fDistanceRelative = 1.0; } - - if(mnStartTime) + + if(mnStartTime) { // Start time loop ScrollTextAnimNode aStartNode( mnStartTime, 1L, 0.0, 0.0, mnStartTime, false); maVector.push_back(aStartNode); } - - if(IsVisibleWhenStarted()) + + if(IsVisibleWhenStarted()) { double fRelativeStartValue, fRelativeEndValue,fRelativeDistance; - - if(DoScrollForward()) + + if(DoScrollForward()) { fRelativeStartValue = fInitRelative; fRelativeEndValue = fOneRelative; fRelativeDistance = fRelativeEndValue - fRelativeStartValue; } - else + else { fRelativeStartValue = fInitRelative; fRelativeEndValue = fZeroRelative; fRelativeDistance = fRelativeStartValue - fRelativeEndValue; } - + const double fNumberSteps = (fRelativeDistance * fDistanceLogic) / GetStepWidthLogic(); nLoopTime = FRound(fNumberSteps * mnFrequency); - + // init loop ScrollTextAnimNode aInitNode( nLoopTime, 1L, @@ -473,31 +473,31 @@ void ActivityImpl::ImpForceScrollTextAnimNodes() mnFrequency, false); maVector.push_back(aInitNode); } - + // prepare main loop values { double fRelativeStartValue, fRelativeEndValue, fRelativeDistance; - - if(DoScrollForward()) + + if(DoScrollForward()) { fRelativeStartValue = fZeroRelative; fRelativeEndValue = fOneRelative; fRelativeDistance = fRelativeEndValue - fRelativeStartValue; } - else + else { fRelativeStartValue = fOneRelative; fRelativeEndValue = fZeroRelative; fRelativeDistance = fRelativeStartValue - fRelativeEndValue; } - + const double fNumberSteps = (fRelativeDistance * fDistanceLogic) / GetStepWidthLogic(); nLoopTime = FRound(fNumberSteps * mnFrequency); - - if(0L == mnRepeat) + + if(0L == mnRepeat) { - if(!DoScrollIn()) + if(!DoScrollIn()) { // endless main loop ScrollTextAnimNode aMainNode( @@ -507,13 +507,13 @@ void ActivityImpl::ImpForceScrollTextAnimNodes() maVector.push_back(aMainNode); } } - else + else { sal_uInt32 nNumRepeat(mnRepeat); - + if(DoAlternate() && (nNumRepeat + 1L) % 2L) nNumRepeat += 1L; - + // ending main loop ScrollTextAnimNode aMainNode( nLoopTime, nNumRepeat, @@ -522,28 +522,28 @@ void ActivityImpl::ImpForceScrollTextAnimNodes() maVector.push_back(aMainNode); } } - - if(IsVisibleWhenStopped()) + + if(IsVisibleWhenStopped()) { double fRelativeStartValue, fRelativeEndValue, fRelativeDistance; - - if(DoScrollForward()) + + if(DoScrollForward()) { fRelativeStartValue = fZeroRelative; fRelativeEndValue = fInitRelative; fRelativeDistance = fRelativeEndValue - fRelativeStartValue; } - else + else { fRelativeStartValue = fOneRelative; fRelativeEndValue = fInitRelative; fRelativeDistance = fRelativeStartValue - fRelativeEndValue; } - + const double fNumberSteps = (fRelativeDistance * fDistanceLogic) / GetStepWidthLogic(); nLoopTime = FRound(fNumberSteps * mnFrequency); - + // exit loop ScrollTextAnimNode aExitNode( nLoopTime, 1L, @@ -558,32 +558,32 @@ ScrollTextAnimNode* ActivityImpl::ImpGetScrollTextAnimNode( { ScrollTextAnimNode* pRetval = 0L; ImpForceScrollTextAnimNodes(); - + if(!maVector.empty()) { rRelativeTime = nTime; - + for(sal_uInt32 a(0L); !pRetval && a < maVector.size(); a++) { ScrollTextAnimNode & rNode = maVector[a]; - if(!rNode.GetRepeat()) + if(!rNode.GetRepeat()) { // endless loop, use it pRetval = &rNode; } - else if(rNode.GetFullTime() > rRelativeTime) + else if(rNode.GetFullTime() > rRelativeTime) { // ending node pRetval = &rNode; } - else + else { // look at next rRelativeTime -= rNode.GetFullTime(); } } } - + return pRetval; } @@ -591,38 +591,38 @@ sal_uInt32 ActivityImpl::ImpRegisterAgainScrollTextMixerState(sal_uInt32 nTime) { sal_uInt32 nRetval(0L); ImpForceScrollTextAnimNodes(); - + if(maVector.size()) { sal_uInt32 nRelativeTime; ScrollTextAnimNode* pNode = ImpGetScrollTextAnimNode(nTime, nRelativeTime); - + if(pNode) { - // take register time + // take register time nRetval = pNode->GetFrequency(); } } else { - // #i38135# not initialized, return default + // #i38135# not initialized, return default nRetval = mnFrequency; } - + return nRetval; } -void ActivityImpl::updateShapeAttributes( +void ActivityImpl::updateShapeAttributes( double fTime, basegfx::B2DRectangle const& parentBounds ) { OSL_ASSERT( meAnimKind != drawing::TextAnimationKind_NONE ); if( meAnimKind == drawing::TextAnimationKind_NONE ) return; - + double const fMixerState = GetMixerState( static_cast<sal_uInt32>(fTime * 1000.0) ); - - if( meAnimKind == drawing::TextAnimationKind_BLINK ) + + if( meAnimKind == drawing::TextAnimationKind_BLINK ) { // show/hide text: maShapeAttrLayer.get()->setVisibility( fMixerState < 0.5 ); @@ -632,23 +632,23 @@ void ActivityImpl::updateShapeAttributes( // // keep care: the below code is highly sensible to changes... // - + // rectangle of the pure text: double const fPaintWidth = maPaintRectangleLogic.GetWidth(); double const fPaintHeight = maPaintRectangleLogic.GetHeight(); // rectangle where the scrolling takes place (-> clipping): double const fScrollWidth = maScrollRectangleLogic.GetWidth(); double const fScrollHeight = maScrollRectangleLogic.GetHeight(); - + basegfx::B2DPoint pos, clipPos; - - if(ScrollHorizontal()) + + if(ScrollHorizontal()) { double const fOneEquiv( fScrollWidth ); double const fZeroEquiv( -fPaintWidth ); pos.setX( fZeroEquiv + (fMixerState * (fOneEquiv - fZeroEquiv)) ); - + clipPos.setX( -pos.getX() ); clipPos.setY( -pos.getY() ); @@ -657,7 +657,7 @@ void ActivityImpl::updateShapeAttributes( pos.setX( pos.getX() + (fPaintWidth-fScrollWidth) / 2.0 ); } else - { + { // scroll vertical: double const fOneEquiv( fScrollHeight ); double const fZeroEquiv( -fPaintHeight ); @@ -671,15 +671,15 @@ void ActivityImpl::updateShapeAttributes( if( fPaintHeight > fScrollHeight ) pos.setY( pos.getY() + (fPaintHeight-fScrollHeight) / 2.0 ); } - + basegfx::B2DPolygon clipPoly( basegfx::tools::createPolygonFromRect( basegfx::B2DRectangle( clipPos.getX(), clipPos.getY(), clipPos.getX() + fScrollWidth, clipPos.getY() + fScrollHeight ) ) ); - - if( !::basegfx::fTools::equalZero( mfRotationAngle )) + + if( !::basegfx::fTools::equalZero( mfRotationAngle )) { maShapeAttrLayer.get()->setRotationAngle( mfRotationAngle ); double const fRotate = (mfRotationAngle * M_PI / 180.0); @@ -688,7 +688,7 @@ void ActivityImpl::updateShapeAttributes( aTransform.rotate( fRotate ); pos *= aTransform; } - + pos += parentBounds.getCenter(); maShapeAttrLayer.get()->setPosition( pos ); maShapeAttrLayer.get()->setClip( basegfx::B2DPolyPolygon(clipPoly) ); @@ -699,15 +699,15 @@ bool ActivityImpl::perform() { if( !isActive() ) return false; - + ENSURE_OR_RETURN_FALSE( mpDrawShape, "ActivityImpl::perform(): still active, but NULL draw shape" ); - + DrawShapeSharedPtr const pParentDrawShape( mpParentDrawShape ); if( !pParentDrawShape ) return false; // parent has vanished - + if( pParentDrawShape->isVisible() ) { if( !mbIsShapeAnimated ) @@ -723,15 +723,15 @@ bool ActivityImpl::perform() const double nCurrTime( maTimer.getElapsedTime() ); updateShapeAttributes( nCurrTime, parentBounds ); - - const sal_uInt32 nFrequency( + + const sal_uInt32 nFrequency( ImpRegisterAgainScrollTextMixerState( static_cast<sal_uInt32>(nCurrTime * 1000.0)) ); if(nFrequency) { mpWakeupEvent->start(); - mpWakeupEvent->setNextTimeout( + mpWakeupEvent->setNextTimeout( std::max(0.1,nFrequency/1000.0) ); maContext.mrEventQueue.addEvent( mpWakeupEvent ); @@ -779,59 +779,59 @@ ActivityImpl::ActivityImpl( pParentDrawShape->getTreeNode( nNodes - 1, DocTreeNode::NODETYPE_LOGICAL_PARAGRAPH ).getEndIndex()); - + // TODO(Q3): Doing this manually, instead of using // ShapeSubset. This is because of lifetime issues (ShapeSubset // generates circular references to parent shape) mpDrawShape = boost::dynamic_pointer_cast<DrawShape>( - maContext.mpSubsettableShapeManager->getSubsetShape( - pParentDrawShape, + maContext.mpSubsettableShapeManager->getSubsetShape( + pParentDrawShape, scrollTextNode )); mpMetaFile = mpDrawShape->forceScrollTextMetaFile(); - + // make scroll text invisible for slide transition bitmaps - mpDrawShape->setVisibility(false); + mpDrawShape->setVisibility(false); basegfx::B2DRectangle aScrollRect, aPaintRect; - ENSURE_OR_THROW( getRectanglesFromScrollMtf( aScrollRect, + ENSURE_OR_THROW( getRectanglesFromScrollMtf( aScrollRect, aPaintRect, mpMetaFile ), "ActivityImpl::ActivityImpl(): Could not extract " "scroll anim rectangles from mtf" ); - + maScrollRectangleLogic = vcl::unotools::rectangleFromB2DRectangle( aScrollRect ); maPaintRectangleLogic = vcl::unotools::rectangleFromB2DRectangle( aPaintRect ); - + maShapeAttrLayer.createAttributeLayer(mpDrawShape); uno::Reference<drawing::XShape> const xShape( mpDrawShape->getXShape() ); uno::Reference<beans::XPropertySet> const xProps( xShape, uno::UNO_QUERY_THROW ); - + getPropertyValue( meAnimKind, xProps, OUSTR("TextAnimationKind") ); - OSL_ASSERT( meAnimKind != drawing::TextAnimationKind_NONE ); + OSL_ASSERT( meAnimKind != drawing::TextAnimationKind_NONE ); mbAlternate = (meAnimKind == drawing::TextAnimationKind_ALTERNATE); mbScrollIn = (meAnimKind == drawing::TextAnimationKind_SLIDE); - + // adopted from in AInfoBlinkText::ImplInit(): sal_Int16 nRepeat(0); getPropertyValue( nRepeat, xProps, OUSTR("TextAnimationCount") ); mnRepeat = nRepeat; - - if(mbAlternate) + + if(mbAlternate) { // force visible when started for scroll-forth-and-back, because // slide has been coming in with visible text in the middle: mbVisibleWhenStarted = true; } - else + else { getPropertyValue( mbVisibleWhenStarted, xProps, OUSTR("TextAnimationStartInside") ); } - + // set visible when stopped getPropertyValue( mbVisibleWhenStopped, xProps, OUSTR("TextAnimatiogonStopInside") ); @@ -839,7 +839,7 @@ ActivityImpl::ActivityImpl( getPropertyValue( mfRotationAngle, xProps, OUSTR("RotateAngle") ); mfRotationAngle /= -100.0; // (switching direction) - + // set frequency sal_Int16 nDelay(0); getPropertyValue( nDelay, xProps, OUSTR("TextAnimationDelay") ); @@ -848,11 +848,11 @@ ActivityImpl::ActivityImpl( // default: meAnimKind == drawing::TextAnimationKind_BLINK ? 250L : 50L ); - + // adopted from in AInfoScrollText::ImplInit(): - + // If it is a simple m_bScrollIn, reset some parameters - if( DoScrollIn() ) + if( DoScrollIn() ) { // most parameters are set correctly from the dialog logic, but // eg VisisbleWhenStopped is grayed out and needs to be corrected here. @@ -860,14 +860,14 @@ ActivityImpl::ActivityImpl( mbVisibleWhenStarted = false; mnRepeat = 0L; } - + // Get animation direction getPropertyValue( meDirection, xProps, OUSTR("TextAnimationDirection") ); - + // Get step width. Negative means pixel, positive logical units getPropertyValue( mnStepWidth, xProps, OUSTR("TextAnimationAmount") ); - maContext.mpSubsettableShapeManager->addIntrinsicAnimationHandler( + maContext.mpSubsettableShapeManager->addIntrinsicAnimationHandler( mpListener ); } @@ -900,7 +900,7 @@ void ActivityImpl::dispose() // shape) DrawShapeSharedPtr pParent( mpParentDrawShape.lock() ); if( pParent ) - maContext.mpSubsettableShapeManager->revokeSubset( + maContext.mpSubsettableShapeManager->revokeSubset( pParent, mpDrawShape ); } @@ -912,7 +912,7 @@ void ActivityImpl::dispose() maContext.dispose(); mbIsDisposed = true; - maContext.mpSubsettableShapeManager->removeIntrinsicAnimationHandler( + maContext.mpSubsettableShapeManager->removeIntrinsicAnimationHandler( mpListener ); } } @@ -973,7 +973,7 @@ boost::shared_ptr<Activity> createDrawingLayerAnimActivity( OSL_ENSURE( false, rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); + RTL_TEXTENCODING_UTF8 ).getStr() ); } return pActivity; diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.hxx b/slideshow/source/engine/shapes/drawinglayeranimation.hxx index 956e411ac95d..7e68f14409c3 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.hxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index dc8fe959a0e8..39105eb6d350 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,7 +91,7 @@ namespace slideshow //#i75867# poor quality of ole's alternative view with 3D scenes and zoomfactors besides 100% //metafiles are resolution dependent when bitmaps are contained with is the case for 3D scenes for example //in addition a chart has resolution dependent content as it might skip points that are not visible for a given resolution (this is done for performance reasons) - bool local_getMetafileForChart( const uno::Reference< lang::XComponent >& xSource, + bool local_getMetafileForChart( const uno::Reference< lang::XComponent >& xSource, const uno::Reference< drawing::XDrawPage >& xContainingPage, GDIMetaFile& rMtf ) { @@ -155,7 +155,7 @@ namespace slideshow if(nMaxPixWidth>1 && nMaxPixHeight>1) aPixelPerChart = awt::Size( nMaxPixWidth, nMaxPixHeight );//this is still to much (but costs only seldom performance), correct would be pixel per chart object } - + try { uno::Sequence< beans::PropertyValue > aZoomFactors(4); @@ -171,7 +171,7 @@ namespace slideshow xChartViewProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ZoomFactors") ), uno::makeAny( aZoomFactors )); xChartViewProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Resolution") ), uno::makeAny( aPixelPerChart )); } - catch (uno::Exception &) + catch (uno::Exception &) { OSL_ENSURE( false, rtl::OUStringToOString( comphelper::anyToString( @@ -197,7 +197,7 @@ namespace slideshow //same as getMetafile with an exception for charts //for charts a metafile with a higher resolution is created, because charts have resolution dependent content - bool local_getMetaFile_WithSpecialChartHandling( const uno::Reference< lang::XComponent >& xSource, + bool local_getMetaFile_WithSpecialChartHandling( const uno::Reference< lang::XComponent >& xSource, const uno::Reference< drawing::XDrawPage >& xContainingPage, GDIMetaFile& rMtf, int mtfLoadFlags, @@ -220,7 +220,7 @@ namespace slideshow GDIMetaFileSharedPtr DrawShape::forceScrollTextMetaFile() { - if ((mnCurrMtfLoadFlags & MTF_LOAD_SCROLL_TEXT_MTF) != MTF_LOAD_SCROLL_TEXT_MTF) + if ((mnCurrMtfLoadFlags & MTF_LOAD_SCROLL_TEXT_MTF) != MTF_LOAD_SCROLL_TEXT_MTF) { // reload with added flags: mpCurrMtf.reset( new GDIMetaFile ); @@ -234,13 +234,13 @@ namespace slideshow // never contain any verbose text comments. Thus, // can only display the full mtf content, no // subsets. - maSubsetting.reset( mpCurrMtf ); + maSubsetting.reset( mpCurrMtf ); // adapt maBounds. the requested scroll text metafile // will typically have dimension different from the // actual shape ::basegfx::B2DRectangle aScrollRect, aPaintRect; - ENSURE_OR_THROW( getRectanglesFromScrollMtf( aScrollRect, + ENSURE_OR_THROW( getRectanglesFromScrollMtf( aScrollRect, aPaintRect, mpCurrMtf ), "DrawShape::forceScrollTextMetaFile(): Could " @@ -256,7 +256,7 @@ namespace slideshow } return mpCurrMtf; } - + void DrawShape::updateStateIds() const { // Update the states, we've just redrawn or created a new @@ -349,12 +349,12 @@ namespace slideshow _1, ::boost::cref( mpCurrMtf ), ::boost::cref( - getViewRenderArgs() ), + getViewRenderArgs() ), nUpdateFlags, - isVisible() ) ) + isVisible() ) ) != static_cast<ViewShapeVector::difference_type>(maViewShapes.size()) ) { - // at least one of the ViewShape::update() calls did return + // at least one of the ViewShape::update() calls did return // false - update failed on at least one ViewLayer return false; } @@ -396,7 +396,7 @@ namespace slideshow nUpdateFlags |= ViewShape::CONTENT; } - // TODO(P1): This can be done without conditional branching. + // TODO(P1): This can be done without conditional branching. // See HAKMEM. if( mpAttributeLayer->getPositionState() != mnAttributePositionState ) { @@ -411,11 +411,11 @@ namespace slideshow nUpdateFlags |= ViewShape::CLIP; } if( mpAttributeLayer->getTransformationState() != mnAttributeTransformationState ) - { + { nUpdateFlags |= ViewShape::TRANSFORMATION; } if( mpAttributeLayer->getContentState() != mnAttributeContentState ) - { + { nUpdateFlags |= ViewShape::CONTENT; } } @@ -429,7 +429,7 @@ namespace slideshow ENSURE_OR_THROW( !maViewShapes.empty(), "DrawShape::getActualUnitShapeBounds(): called on DrawShape without views" ); - const VectorOfDocTreeNodes& rSubsets( + const VectorOfDocTreeNodes& rSubsets( maSubsetting.getActiveSubsets() ); const ::basegfx::B2DRectangle aDefaultBounds( 0.0,0.0,1.0,1.0 ); @@ -466,15 +466,15 @@ namespace slideshow // added or removed). Maybe we should exclude it here, // always assuming full bounds? - ::cppcanvas::CanvasSharedPtr pDestinationCanvas( + ::cppcanvas::CanvasSharedPtr pDestinationCanvas( maViewShapes.front()->getViewLayer()->getCanvas() ); // TODO(Q2): Although this _is_ currently // view-agnostic, it might not stay like // that. Maybe this method should again be moved // to the ViewShape - ::cppcanvas::RendererSharedPtr pRenderer( - maViewShapes.front()->getRenderer( + ::cppcanvas::RendererSharedPtr pRenderer( + maViewShapes.front()->getRenderer( pDestinationCanvas, mpCurrMtf, mpAttributeLayer ) ); // If we cannot not prefetch, be defensive and assume @@ -484,11 +484,11 @@ namespace slideshow // temporarily, switch total transformation to identity // (need the bounds in the [0,1]x[0,1] unit coordinate // system. - ::basegfx::B2DHomMatrix aEmptyTransformation; + ::basegfx::B2DHomMatrix aEmptyTransformation; - ::basegfx::B2DHomMatrix aOldTransform( pDestinationCanvas->getTransformation() ); + ::basegfx::B2DHomMatrix aOldTransform( pDestinationCanvas->getTransformation() ); pDestinationCanvas->setTransformation( aEmptyTransformation ); - pRenderer->setTransformation( aEmptyTransformation ); + pRenderer->setTransformation( aEmptyTransformation ); // restore old transformation when leaving the scope const ::comphelper::ScopeGuard aGuard( @@ -503,16 +503,16 @@ namespace slideshow // cannot use ::boost::bind, ::basegfx::B2DRange::expand() // is overloaded. - VectorOfDocTreeNodes::const_iterator aCurr( rSubsets.begin() ); - const VectorOfDocTreeNodes::const_iterator aEnd( rSubsets.end() ); + VectorOfDocTreeNodes::const_iterator aCurr( rSubsets.begin() ); + const VectorOfDocTreeNodes::const_iterator aEnd( rSubsets.end() ); while( aCurr != aEnd ) { - aTotalBounds.expand( pRenderer->getSubsetArea( + aTotalBounds.expand( pRenderer->getSubsetArea( aCurr->getStartIndex(), aCurr->getEndIndex() ) ); ++aCurr; } - + OSL_ENSURE( aTotalBounds.getMinX() >= -0.1 && aTotalBounds.getMinY() >= -0.1 && aTotalBounds.getMaxX() <= 1.1 && @@ -523,7 +523,7 @@ namespace slideshow // original bounds (there _are_ some pathologic cases, // especially when imported from PPT, that have // e.g. obscenely large polygon bounds) - aTotalBounds.intersect( + aTotalBounds.intersect( ::basegfx::B2DRange( 0.0, 0.0, 1.0, 1.0 )); @@ -535,10 +535,10 @@ namespace slideshow } } - DrawShape::DrawShape( const uno::Reference< drawing::XShape >& xShape, - const uno::Reference< drawing::XDrawPage >& xContainingPage, - double nPrio, - bool bForeignSource, + DrawShape::DrawShape( const uno::Reference< drawing::XShape >& xShape, + const uno::Reference< drawing::XDrawPage >& xContainingPage, + double nPrio, + bool bForeignSource, const SlideShowContext& rContext ) : mxShape( xShape ), mxPage( xContainingPage ), @@ -573,16 +573,16 @@ namespace slideshow { ENSURE_OR_THROW( mxShape.is(), "DrawShape::DrawShape(): Invalid XShape" ); ENSURE_OR_THROW( mxPage.is(), "DrawShape::DrawShape(): Invalid containing page" ); - + // check for drawing layer animations: drawing::TextAnimationKind eKind = drawing::TextAnimationKind_NONE; - uno::Reference<beans::XPropertySet> xPropSet( mxShape, + uno::Reference<beans::XPropertySet> xPropSet( mxShape, uno::UNO_QUERY ); if( xPropSet.is() ) getPropertyValue( eKind, xPropSet, OUSTR("TextAnimationKind") ); mbDrawingLayerAnim = (eKind != drawing::TextAnimationKind_NONE); - + // must NOT be called from within initializer list, uses // state from mnCurrMtfLoadFlags! mpCurrMtf.reset( new GDIMetaFile ); @@ -593,14 +593,14 @@ namespace slideshow ENSURE_OR_THROW( mpCurrMtf, "DrawShape::DrawShape(): Invalid metafile" ); maSubsetting.reset( mpCurrMtf ); - + prepareHyperlinkIndices(); } - DrawShape::DrawShape( const uno::Reference< drawing::XShape >& xShape, - const uno::Reference< drawing::XDrawPage >& xContainingPage, - double nPrio, - const Graphic& rGraphic, + DrawShape::DrawShape( const uno::Reference< drawing::XShape >& xShape, + const uno::Reference< drawing::XDrawPage >& xContainingPage, + double nPrio, + const Graphic& rGraphic, const SlideShowContext& rContext ) : mxShape( xShape ), mxPage( xContainingPage ), @@ -650,9 +650,9 @@ namespace slideshow ENSURE_OR_THROW( mpCurrMtf, "DrawShape::DrawShape(): Invalid metafile" ); } - DrawShape::DrawShape( const DrawShape& rSrc, - const DocTreeNode& rTreeNode, - double nPrio ) : + DrawShape::DrawShape( const DrawShape& rSrc, + const DocTreeNode& rTreeNode, + double nPrio ) : mxShape( rSrc.mxShape ), mxPage( rSrc.mxPage ), maAnimationFrames(), // don't copy animations for subsets, @@ -689,7 +689,7 @@ namespace slideshow // xxx todo: currently not implemented for subsetted shapes; // would mean modifying set of hyperlink regions when - // subsetting text portions. N.B.: there's already an + // subsetting text portions. N.B.: there's already an // issue for this #i72828# } @@ -700,10 +700,10 @@ namespace slideshow ////////////////////////////////////////////////////////////////////// DrawShapeSharedPtr DrawShape::create( - const uno::Reference< drawing::XShape >& xShape, - const uno::Reference< drawing::XDrawPage >& xContainingPage, - double nPrio, - bool bForeignSource, + const uno::Reference< drawing::XShape >& xShape, + const uno::Reference< drawing::XDrawPage >& xContainingPage, + double nPrio, + bool bForeignSource, const SlideShowContext& rContext ) { DrawShapeSharedPtr pShape( new DrawShape(xShape, @@ -715,10 +715,10 @@ namespace slideshow if( pShape->hasIntrinsicAnimation() ) { OSL_ASSERT( pShape->maAnimationFrames.empty() ); - if( pShape->getNumberOfTreeNodes( + if( pShape->getNumberOfTreeNodes( DocTreeNode::NODETYPE_LOGICAL_PARAGRAPH) > 0 ) { - pShape->mpIntrinsicAnimationActivity = + pShape->mpIntrinsicAnimationActivity = createDrawingLayerAnimActivity( rContext, pShape); @@ -731,17 +731,17 @@ namespace slideshow return pShape; } - DrawShapeSharedPtr DrawShape::create( - const uno::Reference< drawing::XShape >& xShape, - const uno::Reference< drawing::XDrawPage >& xContainingPage, - double nPrio, - const Graphic& rGraphic, + DrawShapeSharedPtr DrawShape::create( + const uno::Reference< drawing::XShape >& xShape, + const uno::Reference< drawing::XDrawPage >& xContainingPage, + double nPrio, + const Graphic& rGraphic, const SlideShowContext& rContext ) { - DrawShapeSharedPtr pShape( new DrawShape(xShape, - xContainingPage, - nPrio, - rGraphic, + DrawShapeSharedPtr pShape( new DrawShape(xShape, + xContainingPage, + nPrio, + rGraphic, rContext) ); if( pShape->hasIntrinsicAnimation() ) @@ -754,12 +754,12 @@ namespace slideshow pShape->maAnimationFrames.end(), std::back_insert_iterator< std::vector<double> >( aTimeout ), boost::mem_fn(&MtfAnimationFrame::getDuration) ); - + WakeupEventSharedPtr pWakeupEvent( new WakeupEvent( rContext.mrEventQueue.getTimer(), rContext.mrActivitiesQueue ) ); - - ActivitySharedPtr pActivity = + + ActivitySharedPtr pActivity = createIntrinsicAnimationActivity( rContext, pShape, @@ -771,7 +771,7 @@ namespace slideshow pWakeupEvent->setActivity( pActivity ); pShape->mpIntrinsicAnimationActivity = pActivity; } - + OSL_ENSURE( !pShape->hasHyperlinks(), "DrawShape::create(): graphic-only shapes must not have hyperlinks!" ); @@ -782,13 +782,13 @@ namespace slideshow { try { - // dispose intrinsic animation activity, else, it will - // linger forever + // dispose intrinsic animation activity, else, it will + // linger forever ActivitySharedPtr pActivity( mpIntrinsicAnimationActivity.lock() ); if( pActivity ) pActivity->dispose(); } - catch (uno::Exception &) + catch (uno::Exception &) { OSL_ENSURE( false, rtl::OUStringToOString( comphelper::anyToString( @@ -803,14 +803,14 @@ namespace slideshow } void DrawShape::addViewLayer( const ViewLayerSharedPtr& rNewLayer, - bool bRedrawLayer ) + bool bRedrawLayer ) { ViewShapeVector::iterator aEnd( maViewShapes.end() ); // already added? - if( ::std::find_if( maViewShapes.begin(), - aEnd, - ::boost::bind<bool>( + if( ::std::find_if( maViewShapes.begin(), + aEnd, + ::boost::bind<bool>( ::std::equal_to< ViewLayerSharedPtr >(), ::boost::bind( &ViewShape::getViewLayer, _1 ), @@ -834,9 +834,9 @@ namespace slideshow // render the Shape on the newly added ViewLayer if( bRedrawLayer ) { - pNewShape->update( mpCurrMtf, + pNewShape->update( mpCurrMtf, getViewRenderArgs(), - ViewShape::FORCE, + ViewShape::FORCE, isVisible() ); } } @@ -845,9 +845,9 @@ namespace slideshow { const ViewShapeVector::iterator aEnd( maViewShapes.end() ); - OSL_ENSURE( ::std::count_if(maViewShapes.begin(), - aEnd, - ::boost::bind<bool>( + OSL_ENSURE( ::std::count_if(maViewShapes.begin(), + aEnd, + ::boost::bind<bool>( ::std::equal_to< ViewLayerSharedPtr >(), ::boost::bind( &ViewShape::getViewLayer, _1 ), @@ -856,9 +856,9 @@ namespace slideshow ViewShapeVector::iterator aIter; - if( (aIter=::std::remove_if( maViewShapes.begin(), - aEnd, - ::boost::bind<bool>( + if( (aIter=::std::remove_if( maViewShapes.begin(), + aEnd, + ::boost::bind<bool>( ::std::equal_to< ViewLayerSharedPtr >(), ::boost::bind( &ViewShape::getViewLayer, _1 ), @@ -904,8 +904,8 @@ namespace slideshow bool DrawShape::isContentChanged() const { - return mbForceUpdate ? - true : + return mbForceUpdate ? + true : getUpdateFlags() != ViewShape::NONE; } @@ -934,7 +934,7 @@ namespace slideshow */ class Expander { - public: + public: Expander( ::basegfx::B2DSize& rBounds ) : mrBounds( rBounds ) { @@ -944,11 +944,11 @@ namespace slideshow { const ::basegfx::B2DSize& rShapeBorder( rShape->getAntialiasingBorder() ); - mrBounds.setX( + mrBounds.setX( ::std::max( rShapeBorder.getX(), mrBounds.getX() ) ); - mrBounds.setY( + mrBounds.setY( ::std::max( rShapeBorder.getY(), mrBounds.getY() ) ); @@ -1143,7 +1143,7 @@ namespace slideshow { return ! maHyperlinkRegions.empty(); } - + HyperlinkArea::HyperlinkRegions DrawShape::getHyperlinkRegions() const { OSL_ASSERT( !maViewShapes.empty() ); @@ -1166,13 +1166,13 @@ namespace slideshow pViewShape->getViewLayer()->getCanvas() ); // reuse Renderer of first view shape: - cppcanvas::RendererSharedPtr const pRenderer( + cppcanvas::RendererSharedPtr const pRenderer( pViewShape->getRenderer( pCanvas, mpCurrMtf, mpAttributeLayer ) ); OSL_ASSERT( pRenderer ); - if (pRenderer) + if (pRenderer) { basegfx::B2DHomMatrix const aOldTransform( pCanvas->getTransformation() ); @@ -1188,8 +1188,8 @@ namespace slideshow maBounds.getHeight() ); pRenderer->setTransformation( aTransform ); pRenderer->setClip(); - - for( std::size_t pos = maHyperlinkRegions.size(); pos--; ) + + for( std::size_t pos = maHyperlinkRegions.size(); pos--; ) { // get region: HyperlinkIndexPair const& rIndices = maHyperlinkIndices[pos]; @@ -1290,7 +1290,7 @@ namespace slideshow { // it's the toplevel layer mpAttributeLayer = mpAttributeLayer->getChildLayer(); - + // force content redraw, all state variables have // possibly changed mbAttributeLayerRevoked = true; @@ -1340,13 +1340,13 @@ namespace slideshow { ENSURE_OR_THROW( (mnCurrMtfLoadFlags & MTF_LOAD_VERBOSE_COMMENTS) != 0, "DrawShape::getSubset(): subset query on shape with apparently no subsets" ); - + // forward to delegate return maSubsetting.getSubsetShape( rTreeNode ); } - bool DrawShape::createSubset( AttributableShapeSharedPtr& o_rSubset, - const DocTreeNode& rTreeNode ) + bool DrawShape::createSubset( AttributableShapeSharedPtr& o_rSubset, + const DocTreeNode& rTreeNode ) { ENSURE_OR_THROW( (mnCurrMtfLoadFlags & MTF_LOAD_VERBOSE_COMMENTS) != 0, "DrawShape::createSubset(): subset query on shape with apparently no subsets" ); @@ -1367,14 +1367,14 @@ namespace slideshow else { // not yet created, init entry - o_rSubset.reset( new DrawShape( *this, - rTreeNode, + o_rSubset.reset( new DrawShape( *this, + rTreeNode, // TODO(Q3): That's a // hack. We assume // that start and end // index will always // be less than 65535 - mnPriority + + mnPriority + rTreeNode.getStartIndex()/double(SAL_MAX_INT16) )); bNewlyCreated = true; // subset newly created @@ -1383,7 +1383,7 @@ namespace slideshow // always register shape at DrawShapeSubsetting, to keep // refcount up-to-date maSubsetting.addSubsetShape( o_rSubset ); - + // flush bounds cache maCurrentShapeUnitBounds.reset(); @@ -1407,7 +1407,7 @@ namespace slideshow mbForceUpdate = true; // #i47428# TEMP FIX: synchronize visibility of subset - // with parent. + // with parent. // TODO(F3): Remove here, and implement // TEXT_ONLY/BACKGROUND_ONLY with the proverbial @@ -1415,7 +1415,7 @@ namespace slideshow // persistent subset, containing all text/only the // background respectively. From _that_ object, // generate the temporary character subset shapes. - const ShapeAttributeLayerSharedPtr& rAttrLayer( + const ShapeAttributeLayerSharedPtr& rAttrLayer( rShape->getTopmostAttributeLayer() ); if( rAttrLayer && rAttrLayer->isVisibilityValid() && @@ -1429,7 +1429,7 @@ namespace slideshow else mbIsVisible = bVisibility; } - + // END TEMP FIX return true; @@ -1445,8 +1445,8 @@ namespace slideshow return maSubsetting.getNumberOfTreeNodes( eNodeType ); } - DocTreeNode DrawShape::getTreeNode( sal_Int32 nNodeIndex, - DocTreeNode::NodeType eNodeType ) const // throw ShapeLoadFailedException + DocTreeNode DrawShape::getTreeNode( sal_Int32 nNodeIndex, + DocTreeNode::NodeType eNodeType ) const // throw ShapeLoadFailedException { ensureVerboseMtfComments(); @@ -1458,7 +1458,7 @@ namespace slideshow return maSubsetting.getTreeNode( nNodeIndex, eNodeType ); } - sal_Int32 DrawShape::getNumberOfSubsetTreeNodes ( const DocTreeNode& rParentNode, + sal_Int32 DrawShape::getNumberOfSubsetTreeNodes ( const DocTreeNode& rParentNode, DocTreeNode::NodeType eNodeType ) const // throw ShapeLoadFailedException { ensureVerboseMtfComments(); @@ -1466,9 +1466,9 @@ namespace slideshow return maSubsetting.getNumberOfSubsetTreeNodes( rParentNode, eNodeType ); } - DocTreeNode DrawShape::getSubsetTreeNode( const DocTreeNode& rParentNode, - sal_Int32 nNodeIndex, - DocTreeNode::NodeType eNodeType ) const // throw ShapeLoadFailedException + DocTreeNode DrawShape::getSubsetTreeNode( const DocTreeNode& rParentNode, + sal_Int32 nNodeIndex, + DocTreeNode::NodeType eNodeType ) const // throw ShapeLoadFailedException { ensureVerboseMtfComments(); diff --git a/slideshow/source/engine/shapes/drawshape.hxx b/slideshow/source/engine/shapes/drawshape.hxx index b3c985d3fddc..e6c5e69613ea 100644 --- a/slideshow/source/engine/shapes/drawshape.hxx +++ b/slideshow/source/engine/shapes/drawshape.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,15 +88,15 @@ namespace slideshow unsupported content, and, if necessary, returned as a pre-rendererd bitmap. */ - static DrawShapeSharedPtr create( - const ::com::sun::star::uno::Reference< + static DrawShapeSharedPtr create( + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xContainingPage, double nPrio, bool bForeignSource, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; - + /** Create a shape for the given XShape and graphic content @param xShape @@ -117,16 +117,16 @@ namespace slideshow DrawShape will register itself for intrinsic animation events. */ - static DrawShapeSharedPtr create( - const ::com::sun::star::uno::Reference< + static DrawShapeSharedPtr create( + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xContainingPage, double nPrio, const Graphic& rGraphic, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getXShape() const; virtual ~DrawShape(); @@ -148,7 +148,7 @@ namespace slideshow virtual ShapeAttributeLayerSharedPtr getTopmostAttributeLayer() const; virtual void setVisibility( bool bVisible ); virtual ::basegfx::B2DRectangle getBounds() const; - virtual ::basegfx::B2DRectangle getDomBounds() const; + virtual ::basegfx::B2DRectangle getDomBounds() const; virtual ::basegfx::B2DRectangle getUpdateArea() const; virtual bool isVisible() const; virtual double getPriority() const; @@ -176,7 +176,7 @@ namespace slideshow virtual DocTreeNode getSubsetNode() const; virtual AttributableShapeSharedPtr getSubset( const DocTreeNode& rTreeNode ) const; - virtual bool createSubset( AttributableShapeSharedPtr& o_rSubset, + virtual bool createSubset( AttributableShapeSharedPtr& o_rSubset, const DocTreeNode& rTreeNode ); virtual bool revokeSubset( const AttributableShapeSharedPtr& rShape ); @@ -209,13 +209,13 @@ namespace slideshow animation frame. */ bool setIntrinsicAnimationFrame( ::std::size_t nCurrFrame ); - + /** forces the drawshape to load and return a specially crafted metafile, usable to display drawing layer text animations. */ GDIMetaFileSharedPtr forceScrollTextMetaFile(); - + private: /** Create a shape for the given XShape @@ -237,9 +237,9 @@ namespace slideshow unsupported content, and, if necessary, returned as a pre-rendererd bitmap. */ - DrawShape( const ::com::sun::star::uno::Reference< + DrawShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xContainingPage, double nPrio, bool bForeignSource, @@ -265,9 +265,9 @@ namespace slideshow DrawShape will register itself for intrinsic animation events. */ - DrawShape( const ::com::sun::star::uno::Reference< + DrawShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xContainingPage, double nPrio, const Graphic& rGraphic, @@ -278,7 +278,7 @@ namespace slideshow Used to create subsetted shapes */ DrawShape( const DrawShape&, const DocTreeNode& rTreeNode, double nPrio ); - + int getUpdateFlags() const; bool implRender( int nUpdateFlags ) const; void updateStateIds() const; @@ -290,11 +290,11 @@ namespace slideshow bool hasIntrinsicAnimation() const; bool hasHyperlinks() const; void prepareHyperlinkIndices() const; - + /// The associated XShape - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape; - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > mxPage; /** A vector of metafiles actually representing the Shape. @@ -317,7 +317,7 @@ namespace slideshow // The attributes of this Shape const double mnPriority; ::basegfx::B2DRectangle maBounds; // always needed for rendering. - // for subset shapes, this member + // for subset shapes, this member // might change when views are // added, as minimal bounds are // calculated @@ -340,8 +340,8 @@ namespace slideshow /// the list of active view shapes (one for each registered view layer) typedef ::std::vector< ViewShapeSharedPtr > ViewShapeVector; ViewShapeVector maViewShapes; - - ::com::sun::star::uno::Reference< + + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> mxComponentContext; /// hyperlink support @@ -350,7 +350,7 @@ namespace slideshow typedef ::std::vector<HyperlinkIndexPair> HyperlinkIndexPairVector; mutable HyperlinkIndexPairVector maHyperlinkIndices; mutable HyperlinkRegions maHyperlinkRegions; - + /// Delegated subset handling mutable DrawShapeSubsetting maSubsetting; @@ -371,10 +371,10 @@ namespace slideshow /// Whether attribute layer was revoked (making a redraw necessary) mutable bool mbAttributeLayerRevoked; - + /// whether a drawing layer animation has to be performed bool mbDrawingLayerAnim; - + }; } } diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx index 1c4409e99c77..c59dc1feade3 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -254,14 +254,14 @@ namespace slideshow maCurrentSubsets(), mbNodeTreeInitialized( false ) { - ENSURE_OR_THROW( mpMtf, + ENSURE_OR_THROW( mpMtf, "DrawShapeSubsetting::DrawShapeSubsetting(): Invalid metafile" ); initCurrentSubsets(); } - DrawShapeSubsetting::DrawShapeSubsetting( const DocTreeNode& rShapeSubset, - const GDIMetaFileSharedPtr& rMtf ) : + DrawShapeSubsetting::DrawShapeSubsetting( const DocTreeNode& rShapeSubset, + const GDIMetaFileSharedPtr& rMtf ) : maActionClassVector(), mpMtf( rMtf ), maSubset( rShapeSubset ), @@ -271,7 +271,7 @@ namespace slideshow maCurrentSubsets(), mbNodeTreeInitialized( false ) { - ENSURE_OR_THROW( mpMtf, + ENSURE_OR_THROW( mpMtf, "DrawShapeSubsetting::DrawShapeSubsetting(): Invalid metafile" ); initCurrentSubsets(); @@ -332,9 +332,9 @@ namespace slideshow // subset shape already created for this DocTreeNode? SubsetEntry aEntry; - - aEntry.mnStartActionIndex = rTreeNode.getStartIndex(); - aEntry.mnEndActionIndex = rTreeNode.getEndIndex(); + + aEntry.mnStartActionIndex = rTreeNode.getStartIndex(); + aEntry.mnEndActionIndex = rTreeNode.getEndIndex(); ShapeSet::const_iterator aIter; if( (aIter=maSubsetShapes.find( aEntry )) != maSubsetShapes.end() ) @@ -353,9 +353,9 @@ namespace slideshow // subset shape already created for this DocTreeNode? SubsetEntry aEntry; const DocTreeNode& rEffectiveSubset( rShape->getSubsetNode() ); - - aEntry.mnStartActionIndex = rEffectiveSubset.getStartIndex(); - aEntry.mnEndActionIndex = rEffectiveSubset.getEndIndex(); + + aEntry.mnStartActionIndex = rEffectiveSubset.getStartIndex(); + aEntry.mnEndActionIndex = rEffectiveSubset.getEndIndex(); ShapeSet::const_iterator aIter; if( (aIter=maSubsetShapes.find( aEntry )) != maSubsetShapes.end() ) @@ -371,9 +371,9 @@ namespace slideshow // not yet created, init entry aEntry.mnSubsetQueriedCount = 1; aEntry.mpShape = rShape; - + maSubsetShapes.insert( aEntry ); - + // update cached subset borders updateSubsetBounds( aEntry ); updateSubsets(); @@ -387,9 +387,9 @@ namespace slideshow // lookup subset shape SubsetEntry aEntry; const DocTreeNode& rEffectiveSubset( rShape->getSubsetNode() ); - - aEntry.mnStartActionIndex = rEffectiveSubset.getStartIndex(); - aEntry.mnEndActionIndex = rEffectiveSubset.getEndIndex(); + + aEntry.mnStartActionIndex = rEffectiveSubset.getStartIndex(); + aEntry.mnEndActionIndex = rEffectiveSubset.getEndIndex(); ShapeSet::iterator aIter; if( (aIter=maSubsetShapes.find( aEntry )) == maSubsetShapes.end() ) @@ -429,7 +429,7 @@ namespace slideshow mnMinSubsetActionIndex = SAL_MAX_INT32; mnMaxSubsetActionIndex = 0; - // TODO(P2): This is quite expensive, when + // TODO(P2): This is quite expensive, when // after every subset effect end, we have to scan // the whole shape set @@ -466,8 +466,8 @@ namespace slideshow element (i.e. the iterators from the start to the end of this element). <pre> - bool operator()( IndexClassificator eCurrElemClassification - sal_Int32 nCurrElemCount, + bool operator()( IndexClassificator eCurrElemClassification + sal_Int32 nCurrElemCount, const IndexClassificatorVector::const_iterator& rCurrElemBegin, const IndexClassificatorVector::const_iterator& rCurrElemEnd ); </pre> @@ -486,7 +486,7 @@ namespace slideshow @return the number of shapes found in the metafile */ template< typename FunctorT > void iterateActionClassifications( - FunctorT& io_rFunctor, + FunctorT& io_rFunctor, const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& rBegin, const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& rEnd ) { @@ -539,7 +539,7 @@ namespace slideshow case DrawShapeSubsetting::CLASS_SHAPE_END: if( !io_rFunctor( DrawShapeSubsetting::CLASS_SHAPE_END, - nCurrShapeCount, + nCurrShapeCount, aLastShapeStart, aNext ) ) { @@ -551,7 +551,7 @@ namespace slideshow // ends lines case DrawShapeSubsetting::CLASS_PARAGRAPH_END: if( !io_rFunctor( DrawShapeSubsetting::CLASS_PARAGRAPH_END, - nCurrParaCount, + nCurrParaCount, aLastParaStart, aNext ) ) { @@ -564,7 +564,7 @@ namespace slideshow // ends line case DrawShapeSubsetting::CLASS_LINE_END: if( !io_rFunctor( DrawShapeSubsetting::CLASS_LINE_END, - nCurrLineCount, + nCurrLineCount, aLastLineStart, aNext ) ) { @@ -591,7 +591,7 @@ namespace slideshow // FALLTHROUGH intended case DrawShapeSubsetting::CLASS_SENTENCE_END: if( !io_rFunctor( DrawShapeSubsetting::CLASS_SENTENCE_END, - nCurrSentenceCount, + nCurrSentenceCount, aLastSentenceStart, aNext ) ) { @@ -603,7 +603,7 @@ namespace slideshow // FALLTHROUGH intended case DrawShapeSubsetting::CLASS_WORD_END: if( !io_rFunctor( DrawShapeSubsetting::CLASS_WORD_END, - nCurrWordCount, + nCurrWordCount, aLastWordStart, aNext ) ) { @@ -615,7 +615,7 @@ namespace slideshow // FALLTHROUGH intended case DrawShapeSubsetting::CLASS_CHARACTER_CELL_END: if( !io_rFunctor( DrawShapeSubsetting::CLASS_CHARACTER_CELL_END, - nCurrCharCount, + nCurrCharCount, aLastCharStart, aNext ) ) { @@ -668,16 +668,16 @@ namespace slideshow class CountClassFunctor { public: - CountClassFunctor( DrawShapeSubsetting::IndexClassificator eClass ) : + CountClassFunctor( DrawShapeSubsetting::IndexClassificator eClass ) : meClass( eClass ), mnCurrCount(0) { } - bool operator()( DrawShapeSubsetting::IndexClassificator eCurrElemClassification, - sal_Int32 /*nCurrElemCount*/, - const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& /*rCurrElemBegin*/, - const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& /*rCurrElemEnd*/ ) + bool operator()( DrawShapeSubsetting::IndexClassificator eCurrElemClassification, + sal_Int32 /*nCurrElemCount*/, + const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& /*rCurrElemBegin*/, + const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& /*rCurrElemEnd*/ ) { if( eCurrElemClassification == meClass ) ++mnCurrCount; @@ -692,15 +692,15 @@ namespace slideshow private: DrawShapeSubsetting::IndexClassificator meClass; - sal_Int32 mnCurrCount; + sal_Int32 mnCurrCount; }; } sal_Int32 DrawShapeSubsetting::implGetNumberOfTreeNodes( const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& rBegin, const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& rEnd, - DocTreeNode::NodeType eNodeType ) const + DocTreeNode::NodeType eNodeType ) const { - const IndexClassificator eRequestedClass( + const IndexClassificator eRequestedClass( mapDocTreeNode( eNodeType ) ); // create a counting functor for the requested class of @@ -735,17 +735,17 @@ namespace slideshow class FindNthElementFunctor { public: - FindNthElementFunctor( sal_Int32 nNodeIndex, - DrawShapeSubsetting::IndexClassificator eClass ) : + FindNthElementFunctor( sal_Int32 nNodeIndex, + DrawShapeSubsetting::IndexClassificator eClass ) : mnNodeIndex( nNodeIndex ), meClass( eClass ) { } - bool operator()( DrawShapeSubsetting::IndexClassificator eCurrElemClassification, - sal_Int32 nCurrElemCount, - const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& rCurrElemBegin, - const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& rCurrElemEnd ) + bool operator()( DrawShapeSubsetting::IndexClassificator eCurrElemClassification, + sal_Int32 nCurrElemCount, + const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& rCurrElemBegin, + const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& rCurrElemEnd ) { if( eCurrElemClassification == meClass && nCurrElemCount == mnNodeIndex ) @@ -772,16 +772,16 @@ namespace slideshow } private: - sal_Int32 mnNodeIndex; - DrawShapeSubsetting::IndexClassificatorVector::const_iterator maLastBegin; - DrawShapeSubsetting::IndexClassificatorVector::const_iterator maLastEnd; - DrawShapeSubsetting::IndexClassificator meClass; + sal_Int32 mnNodeIndex; + DrawShapeSubsetting::IndexClassificatorVector::const_iterator maLastBegin; + DrawShapeSubsetting::IndexClassificatorVector::const_iterator maLastEnd; + DrawShapeSubsetting::IndexClassificator meClass; }; DocTreeNode makeTreeNode( const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& rBegin, const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& rStart, const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& rEnd, - DocTreeNode::NodeType eNodeType ) + DocTreeNode::NodeType eNodeType ) { return DocTreeNode( ::std::distance(rBegin, rStart), @@ -791,12 +791,12 @@ namespace slideshow } } - DocTreeNode DrawShapeSubsetting::implGetTreeNode( const IndexClassificatorVector::const_iterator& rBegin, - const IndexClassificatorVector::const_iterator& rEnd, - sal_Int32 nNodeIndex, - DocTreeNode::NodeType eNodeType ) const + DocTreeNode DrawShapeSubsetting::implGetTreeNode( const IndexClassificatorVector::const_iterator& rBegin, + const IndexClassificatorVector::const_iterator& rEnd, + sal_Int32 nNodeIndex, + DocTreeNode::NodeType eNodeType ) const { - const IndexClassificator eRequestedClass( + const IndexClassificator eRequestedClass( mapDocTreeNode( eNodeType ) ); // create a nth element functor for the requested class of @@ -813,8 +813,8 @@ namespace slideshow eNodeType ); } - DocTreeNode DrawShapeSubsetting::getTreeNode( sal_Int32 nNodeIndex, - DocTreeNode::NodeType eNodeType ) const + DocTreeNode DrawShapeSubsetting::getTreeNode( sal_Int32 nNodeIndex, + DocTreeNode::NodeType eNodeType ) const { ensureInitializedNodeTree(); @@ -824,8 +824,8 @@ namespace slideshow eNodeType ); } - sal_Int32 DrawShapeSubsetting::getNumberOfSubsetTreeNodes( const DocTreeNode& rParentNode, - DocTreeNode::NodeType eNodeType ) const + sal_Int32 DrawShapeSubsetting::getNumberOfSubsetTreeNodes( const DocTreeNode& rParentNode, + DocTreeNode::NodeType eNodeType ) const { ensureInitializedNodeTree(); @@ -839,9 +839,9 @@ namespace slideshow eNodeType ); } - DocTreeNode DrawShapeSubsetting::getSubsetTreeNode( const DocTreeNode& rParentNode, - sal_Int32 nNodeIndex, - DocTreeNode::NodeType eNodeType ) const + DocTreeNode DrawShapeSubsetting::getSubsetTreeNode( const DocTreeNode& rParentNode, + sal_Int32 nNodeIndex, + DocTreeNode::NodeType eNodeType ) const { ensureInitializedNodeTree(); @@ -860,6 +860,6 @@ namespace slideshow { return maCurrentSubsets; } - + } } diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.hxx b/slideshow/source/engine/shapes/drawshapesubsetting.hxx index 24ce3c0b2c60..9a1572c4e8da 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.hxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ namespace slideshow @param rMtf Metafile to retrieve subset info from (must have been - generated with verbose text comments switched on). + generated with verbose text comments switched on). */ DrawShapeSubsetting(); @@ -66,7 +66,7 @@ namespace slideshow @param rMtf Metafile to retrieve subset info from (must have been - generated with verbose text comments switched on). + generated with verbose text comments switched on). */ explicit DrawShapeSubsetting( const ::boost::shared_ptr< GDIMetaFile >& rMtf ); @@ -78,10 +78,10 @@ namespace slideshow @param rMtf Metafile to retrieve subset info from (must have been - generated with verbose text comments switched on). + generated with verbose text comments switched on). */ - DrawShapeSubsetting( const DocTreeNode& rShapeSubset, - const ::boost::shared_ptr< GDIMetaFile >& rMtf ); + DrawShapeSubsetting( const DocTreeNode& rShapeSubset, + const ::boost::shared_ptr< GDIMetaFile >& rMtf ); /** Reset metafile. @@ -92,7 +92,7 @@ namespace slideshow @param rMtf Metafile to retrieve subset info from (must have been - generated with verbose text comments switched on). + generated with verbose text comments switched on). */ void reset( const ::boost::shared_ptr< GDIMetaFile >& rMtf ); @@ -109,7 +109,7 @@ namespace slideshow @param rMtf Metafile to retrieve subset info from (must have been - generated with verbose text comments switched on). + generated with verbose text comments switched on). */ void reset( const DocTreeNode& rShapeSubset, const ::boost::shared_ptr< GDIMetaFile >& rMtf ); @@ -119,16 +119,16 @@ namespace slideshow // ======================================================== /// Return subset node for this shape - DocTreeNode getSubsetNode () const; + DocTreeNode getSubsetNode () const; /// Return true, if any child subset shapes exist - bool hasSubsetShapes () const; + bool hasSubsetShapes () const; /// Get subset shape for given node, if any - AttributableShapeSharedPtr getSubsetShape ( const DocTreeNode& rTreeNode ) const; + AttributableShapeSharedPtr getSubsetShape ( const DocTreeNode& rTreeNode ) const; /// Add child subset shape (or increase use count, if already existent) - void addSubsetShape ( const AttributableShapeSharedPtr& rShape ); + void addSubsetShape ( const AttributableShapeSharedPtr& rShape ); /** Revoke subset shape @@ -146,33 +146,33 @@ namespace slideshow decremented, or there was no such subset found, in the first place). */ - bool revokeSubsetShape ( const AttributableShapeSharedPtr& rShape ); + bool revokeSubsetShape ( const AttributableShapeSharedPtr& rShape ); // Doc tree methods // ======================================================== /// Return overall number of nodes for given type - sal_Int32 getNumberOfTreeNodes ( DocTreeNode::NodeType eNodeType ) const; + sal_Int32 getNumberOfTreeNodes ( DocTreeNode::NodeType eNodeType ) const; /// Return tree node of given index and given type - DocTreeNode getTreeNode ( sal_Int32 nNodeIndex, - DocTreeNode::NodeType eNodeType ) const; + DocTreeNode getTreeNode ( sal_Int32 nNodeIndex, + DocTreeNode::NodeType eNodeType ) const; /// Return number of nodes of given type, below parent node - sal_Int32 getNumberOfSubsetTreeNodes ( const DocTreeNode& rParentNode, + sal_Int32 getNumberOfSubsetTreeNodes ( const DocTreeNode& rParentNode, DocTreeNode::NodeType eNodeType ) const; /// Return tree node of given index and given type, relative to parent node - DocTreeNode getSubsetTreeNode ( const DocTreeNode& rParentNode, - sal_Int32 nNodeIndex, - DocTreeNode::NodeType eNodeType ) const; - + DocTreeNode getSubsetTreeNode ( const DocTreeNode& rParentNode, + sal_Int32 nNodeIndex, + DocTreeNode::NodeType eNodeType ) const; + // Helper // ======================================================== /** Return a vector of currently active subsets. - + Needed when rendering a shape, this method provides a vector of subsets currently visible (the range as returned by getEffectiveSubset(), minus the parts that @@ -213,12 +213,12 @@ namespace slideshow */ struct SubsetEntry { - AttributableShapeSharedPtr mpShape; - sal_Int32 mnStartActionIndex; - sal_Int32 mnEndActionIndex; + AttributableShapeSharedPtr mpShape; + sal_Int32 mnStartActionIndex; + sal_Int32 mnEndActionIndex; /// Number of times this subset was queried, and not yet revoked - int mnSubsetQueriedCount; + int mnSubsetQueriedCount; sal_Int32 getHashValue() const { @@ -234,10 +234,10 @@ namespace slideshow { return getHashValue() < rOther.getHashValue(); } - + }; - typedef ::std::set< SubsetEntry > ShapeSet; + typedef ::std::set< SubsetEntry > ShapeSet; void ensureInitializedNodeTree() const; void updateSubsetBounds( const SubsetEntry& rSubsetEntry ); @@ -245,30 +245,30 @@ namespace slideshow void initCurrentSubsets(); void reset(); - sal_Int32 implGetNumberOfTreeNodes( const IndexClassificatorVector::const_iterator& rBegin, - const IndexClassificatorVector::const_iterator& rEnd, - DocTreeNode::NodeType eNodeType ) const; - DocTreeNode implGetTreeNode( const IndexClassificatorVector::const_iterator& rBegin, - const IndexClassificatorVector::const_iterator& rEnd, - sal_Int32 nNodeIndex, - DocTreeNode::NodeType eNodeType ) const; + sal_Int32 implGetNumberOfTreeNodes( const IndexClassificatorVector::const_iterator& rBegin, + const IndexClassificatorVector::const_iterator& rEnd, + DocTreeNode::NodeType eNodeType ) const; + DocTreeNode implGetTreeNode( const IndexClassificatorVector::const_iterator& rBegin, + const IndexClassificatorVector::const_iterator& rEnd, + sal_Int32 nNodeIndex, + DocTreeNode::NodeType eNodeType ) const; - mutable IndexClassificatorVector maActionClassVector; + mutable IndexClassificatorVector maActionClassVector; /// Metafile to retrieve subset info from - ::boost::shared_ptr< GDIMetaFile > mpMtf; + ::boost::shared_ptr< GDIMetaFile > mpMtf; /// Subset of the metafile represented by this object DocTreeNode maSubset; - /// the list of subset shapes spawned from this one. - ShapeSet maSubsetShapes; + /// the list of subset shapes spawned from this one. + ShapeSet maSubsetShapes; /// caches minimal subset index from maSubsetShapes - sal_Int32 mnMinSubsetActionIndex; + sal_Int32 mnMinSubsetActionIndex; /// caches maximal subset index from maSubsetShapes - sal_Int32 mnMaxSubsetActionIndex; + sal_Int32 mnMaxSubsetActionIndex; /** Current number of subsets to render (calculated from maSubset and mnMin/MaxSubsetActionIndex). @@ -276,10 +276,10 @@ namespace slideshow Note that this is generally _not_ equivalent to maSubset, as it excludes all active subset children! */ - mutable VectorOfDocTreeNodes maCurrentSubsets; - + mutable VectorOfDocTreeNodes maCurrentSubsets; + /// Whether the shape's doc tree has been initialized successfully, or not - mutable bool mbNodeTreeInitialized; + mutable bool mbNodeTreeInitialized; }; } diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx index 1a6970bad5dc..8c24c0ee96a4 100644 --- a/slideshow/source/engine/shapes/externalshapebase.cxx +++ b/slideshow/source/engine/shapes/externalshapebase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,13 +68,13 @@ namespace slideshow virtual void viewAdded( const UnoViewSharedPtr& ) {} virtual void viewRemoved( const UnoViewSharedPtr& ) {} - virtual void viewChanged( const UnoViewSharedPtr& rView ) - { - mrBase.implViewChanged(rView); + virtual void viewChanged( const UnoViewSharedPtr& rView ) + { + mrBase.implViewChanged(rView); } virtual void viewsChanged() - { - mrBase.implViewsChanged(); + { + mrBase.implViewsChanged(); } @@ -82,20 +82,20 @@ namespace slideshow // ------------------------------------------------- virtual bool enableAnimations() - { - return mrBase.implStartIntrinsicAnimation(); + { + return mrBase.implStartIntrinsicAnimation(); } virtual bool disableAnimations() - { - return mrBase.implEndIntrinsicAnimation(); + { + return mrBase.implEndIntrinsicAnimation(); } ExternalShapeBase& mrBase; }; - ExternalShapeBase::ExternalShapeBase( const uno::Reference< drawing::XShape >& xShape, - double nPrio, + ExternalShapeBase::ExternalShapeBase( const uno::Reference< drawing::XShape >& xShape, + double nPrio, const SlideShowContext& rContext ) : mxComponentContext( rContext.mxComponentContext ), mxShape( xShape ), @@ -120,7 +120,7 @@ namespace slideshow mrEventMultiplexer.removeViewHandler( mpListener ); mpShapeManager->removeIntrinsicAnimationHandler( mpListener ); } - catch (uno::Exception &) + catch (uno::Exception &) { OSL_ENSURE( false, rtl::OUStringToOString( comphelper::anyToString( @@ -137,7 +137,7 @@ namespace slideshow } // --------------------------------------------------------------------- - + void ExternalShapeBase::play() { implStartIntrinsicAnimation(); @@ -158,7 +158,7 @@ namespace slideshow } // --------------------------------------------------------------------- - + bool ExternalShapeBase::isPlaying() const { return implIsIntrinsicAnimationPlaying(); @@ -179,7 +179,7 @@ namespace slideshow } // --------------------------------------------------------------------- - + bool ExternalShapeBase::render() const { if( maBounds.getRange().equalZero() ) @@ -193,14 +193,14 @@ namespace slideshow } // --------------------------------------------------------------------- - + bool ExternalShapeBase::isContentChanged() const { return true; } // --------------------------------------------------------------------- - + ::basegfx::B2DRectangle ExternalShapeBase::getBounds() const { return maBounds; @@ -214,28 +214,28 @@ namespace slideshow } // --------------------------------------------------------------------- - + ::basegfx::B2DRectangle ExternalShapeBase::getUpdateArea() const { return maBounds; } // --------------------------------------------------------------------- - + bool ExternalShapeBase::isVisible() const { return true; } // --------------------------------------------------------------------- - + double ExternalShapeBase::getPriority() const { return mnPriority; } // --------------------------------------------------------------------- - + bool ExternalShapeBase::isBackgroundDetached() const { // external shapes always have their own window/surface diff --git a/slideshow/source/engine/shapes/externalshapebase.hxx b/slideshow/source/engine/shapes/externalshapebase.hxx index d0d9f89de739..25abcb6c3cac 100644 --- a/slideshow/source/engine/shapes/externalshapebase.hxx +++ b/slideshow/source/engine/shapes/externalshapebase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,13 +64,13 @@ namespace slideshow Externally-determined shape priority (used e.g. for paint ordering). This number _must be_ unique! */ - ExternalShapeBase( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape, - double nPrio, + ExternalShapeBase( const ::com::sun::star::uno::Reference< + ::com::sun::star::drawing::XShape >& xShape, + double nPrio, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; virtual ~ExternalShapeBase(); - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getXShape() const; // animation methods @@ -92,7 +92,7 @@ namespace slideshow // Shape attributes //------------------------------------------------------------------ - + virtual ::basegfx::B2DRectangle getBounds() const; virtual ::basegfx::B2DRectangle getDomBounds() const; virtual ::basegfx::B2DRectangle getUpdateArea() const; @@ -101,7 +101,7 @@ namespace slideshow virtual bool isBackgroundDetached() const; protected: - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> mxComponentContext; private: @@ -128,7 +128,7 @@ namespace slideshow /// The associated XShape - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape; + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape; boost::shared_ptr<ExternalShapeBaseListener> mpListener; @@ -136,8 +136,8 @@ namespace slideshow EventMultiplexer& mrEventMultiplexer; // The attributes of this Shape - const double mnPriority; - ::basegfx::B2DRectangle maBounds; + const double mnPriority; + ::basegfx::B2DRectangle maBounds; }; } } diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index ea58ec2af9d7..9dc82cbc224a 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ using namespace ::com::sun::star; namespace slideshow { -namespace internal +namespace internal { // TODO(E2): Detect the case when svx/drawing layer is not // in-process, or even not on the same machine, and @@ -86,8 +86,8 @@ bool hasUnsupportedActions( const GDIMetaFile& rMtf ) MetaAction* pCurrAct; // TODO(Q3): avoid const-cast - for( pCurrAct = const_cast<GDIMetaFile&>(rMtf).FirstAction(); - pCurrAct; + for( pCurrAct = const_cast<GDIMetaFile&>(rMtf).FirstAction(); + pCurrAct; pCurrAct = const_cast<GDIMetaFile&>(rMtf).NextAction() ) { switch( pCurrAct->GetType() ) @@ -117,12 +117,12 @@ namespace { typedef ::cppu::WeakComponentImplHelper1< graphic::XGraphicRenderer > DummyRenderer_Base; -class DummyRenderer : +class DummyRenderer : public DummyRenderer_Base, public cppu::BaseMutex { public: - DummyRenderer() : + DummyRenderer() : DummyRenderer_Base( m_aMutex ), mxGraphic() { @@ -146,18 +146,18 @@ public: GDIMetaFile getMtf( bool bForeignSource ) const { ::osl::MutexGuard aGuard( m_aMutex ); - + Graphic aGraphic( mxGraphic ); if( aGraphic.GetType() == GRAPHIC_BITMAP || - (bForeignSource && + (bForeignSource && hasUnsupportedActions(aGraphic.GetGDIMetaFile()) ) ) { // wrap bitmap into GDIMetafile - GDIMetaFile aMtf; - ::Point aEmptyPoint; + GDIMetaFile aMtf; + ::Point aEmptyPoint; - ::BitmapEx aBmpEx( aGraphic.GetBitmapEx() ); + ::BitmapEx aBmpEx( aGraphic.GetBitmapEx() ); aMtf.AddAction( new MetaBmpExAction( aEmptyPoint, aBmpEx ) ); @@ -173,14 +173,14 @@ public: } private: - uno::Reference< graphic::XGraphic > mxGraphic; + uno::Reference< graphic::XGraphic > mxGraphic; }; } // anon namespace - + // Quick'n'dirty way: tunnel Graphic (only works for // in-process slideshow, of course) -bool getMetaFile( const uno::Reference< lang::XComponent >& xSource, +bool getMetaFile( const uno::Reference< lang::XComponent >& xSource, const uno::Reference< drawing::XDrawPage >& xContainingPage, GDIMetaFile& rMtf, int mtfLoadFlags, @@ -195,11 +195,11 @@ bool getMetaFile( const uno::Reference< lang::XComponent >& xSource, // TODO(P3): Move creation of DummyRenderer out of the // loop! Either by making it static, or transforming // the whole thing here into a class. - DummyRenderer* pRenderer( new DummyRenderer() ); + DummyRenderer* pRenderer( new DummyRenderer() ); uno::Reference< graphic::XGraphicRenderer > xRenderer( pRenderer ); // -> stuff that into UnoGraphicExporter. - uno::Reference<lang::XMultiComponentFactory> xFactory( + uno::Reference<lang::XMultiComponentFactory> xFactory( rxContext->getServiceManager() ); OSL_ENSURE( xFactory.is(), "### no UNO?!" ); @@ -208,7 +208,7 @@ bool getMetaFile( const uno::Reference< lang::XComponent >& xSource, // creating the graphic exporter uno::Reference< document::XExporter > xExporter( - xFactory->createInstanceWithContext( + xFactory->createInstanceWithContext( OUSTR("com.sun.star.drawing.GraphicExportFilter"), rxContext), uno::UNO_QUERY ); @@ -231,7 +231,7 @@ bool getMetaFile( const uno::Reference< lang::XComponent >& xSource, aFilterData[1].Name = OUSTR("ScrollText"); aFilterData[1].Value <<= ((mtfLoadFlags & MTF_LOAD_SCROLL_TEXT_MTF) != 0); - + aFilterData[2].Name = OUSTR("ExportOnlyBackground"); aFilterData[2].Value <<= ((mtfLoadFlags & MTF_LOAD_BACKGROUND_ONLY) != 0); @@ -266,7 +266,7 @@ void removeTextActions( GDIMetaFile& rMtf ) MetaAction* pCurrAct; int nActionIndex(0); - pCurrAct = rMtf.FirstAction(); + pCurrAct = rMtf.FirstAction(); while( pCurrAct ) { switch( pCurrAct->GetType() ) @@ -303,7 +303,7 @@ sal_Int32 getNextActionOffset( MetaAction * pCurrAct ) // Special handling for actions that represent // more than one indexable action // =========================================== - + switch (pCurrAct->GetType()) { case META_TEXT_ACTION: { MetaTextAction * pAct = static_cast<MetaTextAction *>(pCurrAct); @@ -347,9 +347,9 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames, return false; // some loop invariants - Animation aAnimation( rGraphic.GetAnimation() ); + Animation aAnimation( rGraphic.GetAnimation() ); const Point aEmptyPoint; - const Size aAnimSize( aAnimation.GetDisplaySizePixel() ); + const Size aAnimSize( aAnimation.GetDisplaySizePixel() ); // setup VDev, into which all bitmaps are painted (want to // normalize animations to n bitmaps of same size. An Animation, @@ -398,24 +398,24 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames, { case DISPOSE_NOT: { - aVDev.DrawBitmapEx(rAnimBmp.aPosPix, + aVDev.DrawBitmapEx(rAnimBmp.aPosPix, rAnimBmp.aBmpEx); Bitmap aMask = rAnimBmp.aBmpEx.GetMask(); if( aMask.IsEmpty() ) { const Point aEmpty; - const Rectangle aRect(aEmptyPoint, + const Rectangle aRect(aEmptyPoint, aVDevMask.GetOutputSizePixel()); const Wallpaper aWallpaper(COL_BLACK); - aVDevMask.DrawWallpaper(aRect, + aVDevMask.DrawWallpaper(aRect, aWallpaper); } else { - BitmapEx aTmpMask = BitmapEx(aMask, + BitmapEx aTmpMask = BitmapEx(aMask, aMask); - aVDevMask.DrawBitmapEx(rAnimBmp.aPosPix, + aVDevMask.DrawBitmapEx(rAnimBmp.aPosPix, aTmpMask ); } break; @@ -446,16 +446,16 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames, case DISPOSE_FULL: { - aVDev.DrawBitmapEx(rAnimBmp.aPosPix, + aVDev.DrawBitmapEx(rAnimBmp.aPosPix, rAnimBmp.aBmpEx); break; } case DISPOSE_PREVIOUS : { - aVDev.DrawBitmapEx(rAnimBmp.aPosPix, + aVDev.DrawBitmapEx(rAnimBmp.aPosPix, rAnimBmp.aBmpEx); - aVDevMask.DrawBitmap(rAnimBmp.aPosPix, + aVDevMask.DrawBitmap(rAnimBmp.aPosPix, rAnimBmp.aBmpEx.GetMask()); break; } @@ -464,7 +464,7 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames, // extract current aVDev content into a new animation // frame GDIMetaFileSharedPtr pMtf( new GDIMetaFile() ); - pMtf->AddAction( + pMtf->AddAction( new MetaBmpExAction( aEmptyPoint, BitmapEx( aVDev.GetBitmap( @@ -490,12 +490,12 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames, // time to show first page (whole day) nWaitTime100thSeconds = 100 * 60 * 60 * 24; } - + // There are animated GIFs with no WaitTime set. Take 1 sec, then. if( nWaitTime100thSeconds == 0 ) nWaitTime100thSeconds = 100; - o_rFrames.push_back( MtfAnimationFrame( pMtf, + o_rFrames.push_back( MtfAnimationFrame( pMtf, nWaitTime100thSeconds / 100.0 ) ); } @@ -505,7 +505,7 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames, bool getRectanglesFromScrollMtf( ::basegfx::B2DRectangle& o_rScrollRect, ::basegfx::B2DRectangle& o_rPaintRect, const GDIMetaFileSharedPtr& rMtf ) -{ +{ // extract bounds: scroll rect, paint rect bool bScrollRectSet(false); bool bPaintRectSet(false); diff --git a/slideshow/source/engine/shapes/gdimtftools.hxx b/slideshow/source/engine/shapes/gdimtftools.hxx index 0e34cce9a62f..4cecbb338d32 100644 --- a/slideshow/source/engine/shapes/gdimtftools.hxx +++ b/slideshow/source/engine/shapes/gdimtftools.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,14 +67,14 @@ namespace slideshow /// retrieve the drawing layer scroll text metafile MTF_LOAD_SCROLL_TEXT_MTF = 8 }; - + // Animation info // ============== struct MtfAnimationFrame { MtfAnimationFrame( const GDIMetaFileSharedPtr& rMtf, - double nDuration ) : + double nDuration ) : mpMtf( rMtf ), mnDuration( nDuration ) { @@ -86,10 +86,10 @@ namespace slideshow return mnDuration; } - GDIMetaFileSharedPtr mpMtf; - double mnDuration; + GDIMetaFileSharedPtr mpMtf; + double mnDuration; }; - + typedef ::std::vector< MtfAnimationFrame > VectorOfMtfAnimationFrames; @@ -97,7 +97,7 @@ namespace slideshow @param xShape XShape to retrieve a metafile for. - + @param xContainingPage The page that contains this shape. Needed for proper import (currently, the UnoGraphicExporter needs this @@ -106,11 +106,11 @@ namespace slideshow @param o_rMtf Metafile to extract shape content into */ - bool getMetaFile( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xSource, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xContainingPage, - GDIMetaFile& o_rMtf, + bool getMetaFile( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xSource, + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xContainingPage, + GDIMetaFile& o_rMtf, int mtfLoadFlags, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); /** Remove all text actions from the given metafile. @@ -121,7 +121,7 @@ namespace slideshow often returns 1. */ sal_Int32 getNextActionOffset( MetaAction * pCurrAct ); - + /** Extract a vector of animation frames from given Graphic. @param o_rFrames diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx index dd3b977ef624..013c9099b673 100644 --- a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx +++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,10 +77,10 @@ namespace slideshow Vector of timeout values, to wait before the next frame is shown. */ - IntrinsicAnimationActivity( const SlideShowContext& rContext, - const DrawShapeSharedPtr& rDrawShape, - const WakeupEventSharedPtr& rWakeupEvent, - const ::std::vector<double>& rTimeouts, + IntrinsicAnimationActivity( const SlideShowContext& rContext, + const DrawShapeSharedPtr& rDrawShape, + const WakeupEventSharedPtr& rWakeupEvent, + const ::std::vector<double>& rTimeouts, ::std::size_t nNumLoops, CycleMode eCycleMode ); @@ -126,10 +126,10 @@ namespace slideshow ////////////////////////////////////////////////////////////////////// - IntrinsicAnimationActivity::IntrinsicAnimationActivity( const SlideShowContext& rContext, - const DrawShapeSharedPtr& rDrawShape, - const WakeupEventSharedPtr& rWakeupEvent, - const ::std::vector<double>& rTimeouts, + IntrinsicAnimationActivity::IntrinsicAnimationActivity( const SlideShowContext& rContext, + const DrawShapeSharedPtr& rDrawShape, + const WakeupEventSharedPtr& rWakeupEvent, + const ::std::vector<double>& rTimeouts, ::std::size_t nNumLoops, CycleMode eCycleMode ) : maContext( rContext ), @@ -142,7 +142,7 @@ namespace slideshow mnNumLoops(nNumLoops), mnLoopCount(0), mbIsActive(false) - { + { ENSURE_OR_THROW( rContext.mpSubsettableShapeManager, "IntrinsicAnimationActivity::IntrinsicAnimationActivity(): Invalid shape manager" ); ENSURE_OR_THROW( rDrawShape, @@ -152,7 +152,7 @@ namespace slideshow ENSURE_OR_THROW( !rTimeouts.empty(), "IntrinsicAnimationActivity::IntrinsicAnimationActivity(): Empty timeout vector" ); - maContext.mpSubsettableShapeManager->addIntrinsicAnimationHandler( + maContext.mpSubsettableShapeManager->addIntrinsicAnimationHandler( mpListener ); } @@ -169,7 +169,7 @@ namespace slideshow maTimeouts.clear(); mnCurrIndex = 0; - maContext.mpSubsettableShapeManager->removeIntrinsicAnimationHandler( + maContext.mpSubsettableShapeManager->removeIntrinsicAnimationHandler( mpListener ); } @@ -230,13 +230,13 @@ namespace slideshow mpWakeupEvent->start(); mpWakeupEvent->setNextTimeout( maTimeouts[nTrueIndex] ); - + mnLoopCount += (mnCurrIndex + 1) / (2*nNumFrames); nNewIndex = (mnCurrIndex + 1) % 2*nNumFrames; break; } } - + maContext.mrEventQueue.addEvent( mpWakeupEvent ); maContext.mpSubsettableShapeManager->notifyShapeUpdate( pDrawShape ); mnCurrIndex = nNewIndex; @@ -271,14 +271,14 @@ namespace slideshow ////////////////////////////////////////////////////////////////////// ActivitySharedPtr createIntrinsicAnimationActivity( - const SlideShowContext& rContext, - const DrawShapeSharedPtr& rDrawShape, - const WakeupEventSharedPtr& rWakeupEvent, - const ::std::vector<double>& rTimeouts, + const SlideShowContext& rContext, + const DrawShapeSharedPtr& rDrawShape, + const WakeupEventSharedPtr& rWakeupEvent, + const ::std::vector<double>& rTimeouts, ::std::size_t nNumLoops, CycleMode eCycleMode ) { - return ActivitySharedPtr( + return ActivitySharedPtr( new IntrinsicAnimationActivity(rContext, rDrawShape, rWakeupEvent, diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx index 6d44ebc45d4e..ea7031c943ce 100644 --- a/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx +++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,10 +64,10 @@ namespace slideshow frame is shown. */ ActivitySharedPtr createIntrinsicAnimationActivity( - const SlideShowContext& rContext, - const DrawShapeSharedPtr& rDrawShape, - const WakeupEventSharedPtr& rWakeupEvent, - const ::std::vector<double>& rTimeouts, + const SlideShowContext& rContext, + const DrawShapeSharedPtr& rDrawShape, + const WakeupEventSharedPtr& rWakeupEvent, + const ::std::vector<double>& rTimeouts, ::std::size_t nNumLoops, CycleMode eCycleMode ); } diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx index fbab6d252b4f..e98c4ed45f40 100644 --- a/slideshow/source/engine/shapes/mediashape.cxx +++ b/slideshow/source/engine/shapes/mediashape.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,9 +70,9 @@ namespace slideshow Externally-determined shape priority (used e.g. for paint ordering). This number _must be_ unique! */ - MediaShape( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& xShape, - double nPrio, + MediaShape( const ::com::sun::star::uno::Reference< + ::com::sun::star::drawing::XShape >& xShape, + double nPrio, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; private: @@ -80,15 +80,15 @@ namespace slideshow // View layer methods //------------------------------------------------------------------ - virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer, - bool bRedrawLayer ); - virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ); + virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer, + bool bRedrawLayer ); + virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ); virtual bool clearAllViewLayers(); // ExternalShapeBase methods //------------------------------------------------------------------ - + virtual bool implRender( const ::basegfx::B2DRange& rCurrBounds ) const; virtual void implViewChanged( const UnoViewSharedPtr& rView ); virtual void implViewsChanged(); @@ -106,7 +106,7 @@ namespace slideshow MediaShape::MediaShape( const uno::Reference< drawing::XShape >& xShape, - double nPrio, + double nPrio, const SlideShowContext& rContext ) : ExternalShapeBase( xShape, nPrio, rContext ), maViewMediaShapes(), @@ -114,7 +114,7 @@ namespace slideshow { } - // --------------------------------------------------------------------- + // --------------------------------------------------------------------- void MediaShape::implViewChanged( const UnoViewSharedPtr& rView ) { @@ -137,8 +137,8 @@ namespace slideshow // resize all ViewShapes ::std::for_each( maViewMediaShapes.begin(), maViewMediaShapes.end(), - ::boost::bind( - &ViewMediaShape::resize, + ::boost::bind( + &ViewMediaShape::resize, _1, ::boost::cref( getBounds())) ); } @@ -146,30 +146,30 @@ namespace slideshow // --------------------------------------------------------------------- void MediaShape::addViewLayer( const ViewLayerSharedPtr& rNewLayer, - bool bRedrawLayer ) + bool bRedrawLayer ) { - maViewMediaShapes.push_back( - ViewMediaShapeSharedPtr( new ViewMediaShape( rNewLayer, + maViewMediaShapes.push_back( + ViewMediaShapeSharedPtr( new ViewMediaShape( rNewLayer, getXShape(), mxComponentContext ))); - - // push new size to view shape + + // push new size to view shape maViewMediaShapes.back()->resize( getBounds() ); - - // render the Shape on the newly added ViewLayer + + // render the Shape on the newly added ViewLayer if( bRedrawLayer ) maViewMediaShapes.back()->render( getBounds() ); } // --------------------------------------------------------------------- - + bool MediaShape::removeViewLayer( const ViewLayerSharedPtr& rLayer ) { const ViewMediaShapeVector::iterator aEnd( maViewMediaShapes.end() ); - OSL_ENSURE( ::std::count_if(maViewMediaShapes.begin(), - aEnd, - ::boost::bind<bool>( + OSL_ENSURE( ::std::count_if(maViewMediaShapes.begin(), + aEnd, + ::boost::bind<bool>( ::std::equal_to< ViewLayerSharedPtr >(), ::boost::bind( &ViewMediaShape::getViewLayer, _1 ), ::boost::cref( rLayer ) ) ) < 2, @@ -177,9 +177,9 @@ namespace slideshow ViewMediaShapeVector::iterator aIter; - if( (aIter=::std::remove_if( maViewMediaShapes.begin(), - aEnd, - ::boost::bind<bool>( + if( (aIter=::std::remove_if( maViewMediaShapes.begin(), + aEnd, + ::boost::bind<bool>( ::std::equal_to< ViewLayerSharedPtr >(), ::boost::bind( &ViewMediaShape::getViewLayer, _1 ), @@ -196,7 +196,7 @@ namespace slideshow } // --------------------------------------------------------------------- - + bool MediaShape::clearAllViewLayers() { maViewMediaShapes.clear(); @@ -210,13 +210,13 @@ namespace slideshow // redraw all view shapes, by calling their update() method if( ::std::count_if( maViewMediaShapes.begin(), maViewMediaShapes.end(), - ::boost::bind<bool>( - ::boost::mem_fn( &ViewMediaShape::render ), + ::boost::bind<bool>( + ::boost::mem_fn( &ViewMediaShape::render ), _1, - ::boost::cref( rCurrBounds ) ) ) + ::boost::cref( rCurrBounds ) ) ) != static_cast<ViewMediaShapeVector::difference_type>(maViewMediaShapes.size()) ) { - // at least one of the ViewShape::update() calls did return + // at least one of the ViewShape::update() calls did return // false - update failed on at least one ViewLayer return false; } @@ -225,7 +225,7 @@ namespace slideshow } // --------------------------------------------------------------------- - + bool MediaShape::implStartIntrinsicAnimation() { ::std::for_each( maViewMediaShapes.begin(), @@ -236,9 +236,9 @@ namespace slideshow return true; } - + // --------------------------------------------------------------------- - + bool MediaShape::implEndIntrinsicAnimation() { ::std::for_each( maViewMediaShapes.begin(), diff --git a/slideshow/source/engine/shapes/mediashape.hxx b/slideshow/source/engine/shapes/mediashape.hxx index 3e1ec6e5629f..ce1e7ad18303 100644 --- a/slideshow/source/engine/shapes/mediashape.hxx +++ b/slideshow/source/engine/shapes/mediashape.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace slideshow class Shape; boost::shared_ptr<Shape> createMediaShape( - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, double nPrio, const SlideShowContext& rContext); diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index f793dfed7e7e..bbfcfe2cb497 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,46 +86,46 @@ bool importShapeGraphic( // no or empty property - cannot import shape graphic return false; } - - rtl::OUString const aVndUrl( + + rtl::OUString const aVndUrl( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.GraphicObject:" ) ); sal_Int32 nIndex( aURL.indexOf( aVndUrl ) ); - - if(nIndex != -1) + + if(nIndex != -1) { // skip past the end of the "vnd..." prefix nIndex += aVndUrl.getLength(); - - if(nIndex >= aURL.getLength()) + + if(nIndex >= aURL.getLength()) { OSL_ENSURE( false, "ShapeImporter::importShape(): " "embedded graphic has no graphic ID" ); return false; } - + // unique ID string found in URL, extract // to separate string rtl::OUString const aUniqueId( aURL.copy( nIndex, aURL.getLength() - nIndex ) ); - + // TODO(T2): Creating a GraphicObject is not // thread safe (internally calls VCL, and has // unguarded internal singleton mpGlobalMgr) - + // fetch already loaded graphic from graphic manager. ByteString const aOldString( static_cast<String>(aUniqueId), RTL_TEXTENCODING_UTF8 ); o_rGraphic = GraphicObject( aOldString ); - if( GRAPHIC_DEFAULT == o_rGraphic.GetType() + if( GRAPHIC_DEFAULT == o_rGraphic.GetType() || GRAPHIC_NONE == o_rGraphic.GetType() ) { // even the GrfMgr does not seem to know this graphic return false; - } + } } - else + else { // no special string found, graphic must be // external. Load via GraphicIm porter @@ -134,17 +134,17 @@ bool importShapeGraphic( utl::UcbStreamHelper::CreateStream( aTmp.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ ) ); - if( !pGraphicStream ) + if( !pGraphicStream ) { OSL_ENSURE( false, "ShapeImporter::importShape(): " "cannot create input stream for graphic" ); return false; } - + Graphic aTmpGraphic; if( GraphicConverter::Import( *pGraphicStream, aTmpGraphic ) != ERRCODE_NONE ) - { + { OSL_ENSURE( false, "ShapeImporter::importShape(): " "Failed to import shape graphic from given URL" ); return false; @@ -165,7 +165,7 @@ public: uno::Reference<drawing::XShape> const& xShape, uno::Reference<beans::XPropertySet> const& xPropSet, double nPrio ); - + // Shape: virtual uno::Reference<drawing::XShape> getXShape() const; virtual void addViewLayer( ViewLayerSharedPtr const& pNewLayer, @@ -181,7 +181,7 @@ public: virtual bool isVisible() const; virtual double getPriority() const; virtual bool isBackgroundDetached() const; - + private: ShapeSharedPtr const mpGroupShape; uno::Reference<drawing::XShape> const mxShape; @@ -195,8 +195,8 @@ ShapeOfGroup::ShapeOfGroup( ShapeSharedPtr const& pGroupSha uno::Reference<drawing::XShape> const& xShape, uno::Reference<beans::XPropertySet> const& xPropSet, double nPrio ) : - mpGroupShape(pGroupShape), - mxShape(xShape), + mpGroupShape(pGroupShape), + mxShape(xShape), mnPrio(nPrio) { // read bound rect @@ -284,11 +284,11 @@ ShapeSharedPtr ShapeImporter::createShape( uno::Reference<beans::XPropertySet> const& xPropSet, rtl::OUString const& shapeType ) const { - if( shapeType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.MediaShape") )) + if( shapeType.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.MediaShape") )) { // Media shape (video etc.). This is a special object - return createMediaShape(xCurrShape, + return createMediaShape(xCurrShape, mnAscendingPrio, mrContext); } @@ -296,7 +296,7 @@ ShapeSharedPtr ShapeImporter::createShape( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.PluginShape") )) { // PropertyValues to copy from XShape to plugin - static const char* aPropertyValues[] = + static const char* aPropertyValues[] = { "PluginURL", "PluginMimeType", @@ -304,10 +304,10 @@ ShapeSharedPtr ShapeImporter::createShape( }; // (Netscape)Plugin shape. This is a special object - return createAppletShape( xCurrShape, + return createAppletShape( xCurrShape, mnAscendingPrio, - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( + ::rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sfx2.PluginObject" )), aPropertyValues, sizeof(aPropertyValues)/sizeof(*aPropertyValues), @@ -317,7 +317,7 @@ ShapeSharedPtr ShapeImporter::createShape( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.AppletShape") )) { // PropertyValues to copy from XShape to applet - static const char* aPropertyValues[] = + static const char* aPropertyValues[] = { "AppletCodeBase", "AppletName", @@ -327,10 +327,10 @@ ShapeSharedPtr ShapeImporter::createShape( }; // (Java)Applet shape. This is a special object - return createAppletShape( xCurrShape, + return createAppletShape( xCurrShape, mnAscendingPrio, - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( + ::rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sfx2.AppletObject" )), aPropertyValues, sizeof(aPropertyValues)/sizeof(*aPropertyValues), @@ -341,7 +341,7 @@ ShapeSharedPtr ShapeImporter::createShape( { // #i46224# Mark OLE shapes as foreign content - scan them for // unsupported actions, and fallback to bitmap, if necessary - return DrawShape::create( xCurrShape, + return DrawShape::create( xCurrShape, mxPage, mnAscendingPrio, true, @@ -349,10 +349,10 @@ ShapeSharedPtr ShapeImporter::createShape( } else if( shapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.drawing.GraphicObjectShape") )) + "com.sun.star.drawing.GraphicObjectShape") )) { GraphicObject aGraphicObject; - + // to get hold of GIF animations, inspect Graphic // objects more thoroughly (the plain-jane shape // metafile of course would only contain the first @@ -365,21 +365,21 @@ ShapeSharedPtr ShapeImporter::createShape( if( !aGraphicObject.IsAnimated() ) { // no animation - simply utilize plain draw shape import - + // import shape as bitmap - either its a bitmap // anyway, or its a metafile, which currently the // metafile renderer might not display correctly. - return DrawShape::create( xCurrShape, + return DrawShape::create( xCurrShape, mxPage, mnAscendingPrio, - true, + true, mrContext ); } - - + + // now extract relevant shape attributes via API // --------------------------------------------- - + drawing::ColorMode eColorMode( drawing::ColorMode_STANDARD ); sal_Int16 nLuminance(0); sal_Int16 nContrast(0); @@ -389,7 +389,7 @@ ShapeSharedPtr ShapeImporter::createShape( double nGamma(1.0); sal_Int16 nTransparency(0); sal_Int32 nRotation(0); - + getPropertyValue( eColorMode, xPropSet, OUSTR("GraphicColorMode") ); getPropertyValue( nLuminance, xPropSet, OUSTR("AdjustLuminance") ); getPropertyValue( nContrast, xPropSet, OUSTR("AdjustContrast") ); @@ -399,7 +399,7 @@ ShapeSharedPtr ShapeImporter::createShape( getPropertyValue( nGamma, xPropSet, OUSTR("Gamma") ); getPropertyValue( nTransparency, xPropSet, OUSTR("Transparency") ); getPropertyValue( nRotation, xPropSet, OUSTR("RotateAngle") ); - + GraphicAttr aGraphAttrs; aGraphAttrs.SetDrawMode( (GraphicDrawMode)eColorMode ); aGraphAttrs.SetLuminance( nLuminance ); @@ -410,35 +410,35 @@ ShapeSharedPtr ShapeImporter::createShape( aGraphAttrs.SetGamma( nGamma ); aGraphAttrs.SetTransparency( static_cast<BYTE>(nTransparency) ); aGraphAttrs.SetRotation( static_cast<USHORT>(nRotation*10) ); - + text::GraphicCrop aGraphCrop; - if( getPropertyValue( aGraphCrop, xPropSet, OUSTR("GraphicCrop") )) + if( getPropertyValue( aGraphCrop, xPropSet, OUSTR("GraphicCrop") )) { aGraphAttrs.SetCrop( aGraphCrop.Left, aGraphCrop.Top, aGraphCrop.Right, aGraphCrop.Bottom ); } - + // fetch readily transformed and color-modified // graphic // --------------------------------------------- - - Graphic aGraphic( + + Graphic aGraphic( aGraphicObject.GetTransformedGraphic( aGraphicObject.GetPrefSize(), aGraphicObject.GetPrefMapMode(), aGraphAttrs ) ); - - return DrawShape::create( xCurrShape, + + return DrawShape::create( xCurrShape, mxPage, mnAscendingPrio, aGraphic, mrContext ); } - else + else { - return DrawShape::create( xCurrShape, + return DrawShape::create( xCurrShape, mxPage, mnAscendingPrio, false, @@ -455,12 +455,12 @@ bool ShapeImporter::isSkip( bool bEmpty = false; if( getPropertyValue( bEmpty, xPropSet, - OUSTR("IsEmptyPresentationObject")) && + OUSTR("IsEmptyPresentationObject")) && bEmpty ) { return true; } - + //skip shapes which corresponds to annotations if(xLayer.is()) { @@ -473,17 +473,17 @@ bool ShapeImporter::isSkip( { if( layerName.equals(rtl::OUString::createFromAscii("DrawnInSlideshow"))) { - //Transform shapes into PolyPolygons + //Transform shapes into PolyPolygons importPolygons(xPropSet); - + return true; } } } - + // don't export presentation placeholders on masterpage // they can be non empty when user edits the default texts - if(mbConvertingMasterPage) + if(mbConvertingMasterPage) { if(shapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation." @@ -498,19 +498,19 @@ bool ShapeImporter::isSkip( return false; } - + void ShapeImporter::importPolygons(uno::Reference<beans::XPropertySet> const& xPropSet) { drawing::PointSequenceSequence aRetval; - sal_Int32 nLineColor=0; - double fLineWidth; + sal_Int32 nLineColor=0; + double fLineWidth; getPropertyValue( aRetval, xPropSet, OUSTR("PolyPolygon") ); getPropertyValue( nLineColor, xPropSet, OUSTR("LineColor") ); getPropertyValue( fLineWidth, xPropSet, OUSTR("LineWidth") ); drawing::PointSequence* pOuterSequence = aRetval.getArray(); awt::Point* pInnerSequence = pOuterSequence->getArray(); - + ::basegfx::B2DPolygon aPoly; basegfx::B2DPoint aPoint; for( sal_Int32 nCurrPoly=0; nCurrPoly<pOuterSequence->getLength(); ++nCurrPoly ) @@ -537,21 +537,21 @@ void ShapeImporter::importPolygons(uno::Reference<beans::XPropertySet> const& xP aIter++; } } - + ShapeSharedPtr ShapeImporter::importBackgroundShape() // throw (ShapeLoadFailedException) { if( maShapesStack.empty() ) throw ShapeLoadFailedException(); XShapesEntry& rTop = maShapesStack.top(); - ShapeSharedPtr pBgShape( + ShapeSharedPtr pBgShape( createBackgroundShape(mxPage, uno::Reference<drawing::XDrawPage>( rTop.mxShapes, uno::UNO_QUERY_THROW), mrContext) ); mnAscendingPrio += 1.0; - + return pBgShape; } @@ -559,20 +559,20 @@ ShapeSharedPtr ShapeImporter::importShape() // throw (ShapeLoadFailedException) { ShapeSharedPtr pRet; bool bIsGroupShape = false; - + while( !maShapesStack.empty() && !pRet ) { XShapesEntry& rTop = maShapesStack.top(); if( rTop.mnPos < rTop.mnCount ) - { + { uno::Reference<drawing::XShape> const xCurrShape( rTop.mxShapes->getByIndex( rTop.mnPos ), uno::UNO_QUERY ); ++rTop.mnPos; uno::Reference<beans::XPropertySet> xPropSet( xCurrShape, uno::UNO_QUERY ); - if( !xPropSet.is() ) + if( !xPropSet.is() ) { - // we definitely need the properties of + // we definitely need the properties of // the shape here. This will also fail, // if getByIndex did not return a valid // shape @@ -586,21 +586,21 @@ ShapeSharedPtr ShapeImporter::importShape() // throw (ShapeLoadFailedException) if(xLayerSupplier.is()) { uno::Reference< container::XNameAccess > xNameAccess = xLayerSupplier->getLayerManager(); - + uno::Reference< drawing::XLayerManager > xLayerManager(xNameAccess, uno::UNO_QUERY); - + xDrawnInSlideshow = xLayerManager->getLayerForShape(xCurrShape); } rtl::OUString const shapeType( xCurrShape->getShapeType()); - + // is this shape presentation-invisible? if( !isSkip(xPropSet, shapeType, xDrawnInSlideshow) ) { bIsGroupShape = shapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.GroupShape") ); - + if( rTop.mpGroupShape ) // in group particle mode? { pRet.reset( new ShapeOfGroup( @@ -608,14 +608,14 @@ ShapeSharedPtr ShapeImporter::importShape() // throw (ShapeLoadFailedException) xCurrShape, xPropSet, mnAscendingPrio ) ); } - else + else { pRet = createShape( xCurrShape, xPropSet, shapeType ); } mnAscendingPrio += 1.0; } } - if( rTop.mnPos >= rTop.mnCount ) + if( rTop.mnPos >= rTop.mnCount ) { // group or top-level shapes finished: maShapesStack.pop(); @@ -626,7 +626,7 @@ ShapeSharedPtr ShapeImporter::importShape() // throw (ShapeLoadFailedException) maShapesStack.push( XShapesEntry( pRet ) ); } } - + return pRet; } @@ -639,8 +639,8 @@ PolyPolygonVector ShapeImporter::getPolygons() { return maPolygons; } - -ShapeImporter::ShapeImporter( uno::Reference<drawing::XDrawPage> const& xPage, + +ShapeImporter::ShapeImporter( uno::Reference<drawing::XDrawPage> const& xPage, uno::Reference<drawing::XDrawPage> const& xActualPage, uno::Reference<drawing::XDrawPagesSupplier> const& xPagesSupplier, const SlideShowContext& rContext, diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index fe15638edef9..ed65a9bef1b1 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,12 +86,12 @@ namespace slideshow ENSURE_OR_THROW( mpViewLayer->getCanvas(), "ViewAppletShape::ViewAppletShape(): Invalid ViewLayer canvas" ); ENSURE_OR_THROW( mxComponentContext.is(), "ViewAppletShape::ViewAppletShape(): Invalid component context" ); - uno::Reference<lang::XMultiComponentFactory> xFactory( + uno::Reference<lang::XMultiComponentFactory> xFactory( mxComponentContext->getServiceManager(), uno::UNO_QUERY_THROW ); mxViewer.set( xFactory->createInstanceWithContext( rServiceName, - mxComponentContext), + mxComponentContext), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xShapePropSet( rxShape, @@ -105,20 +105,20 @@ namespace slideshow { aPropName = ::rtl::OUString::createFromAscii( pPropCopyTable[i] ); mxViewerPropSet->setPropertyValue( aPropName, - xShapePropSet->getPropertyValue( + xShapePropSet->getPropertyValue( aPropName )); } } // --------------------------------------------------------------------- - + ViewAppletShape::~ViewAppletShape() - { + { try { endApplet(); } - catch (uno::Exception &) + catch (uno::Exception &) { OSL_ENSURE( false, rtl::OUStringToOString( comphelper::anyToString( @@ -135,7 +135,7 @@ namespace slideshow } // --------------------------------------------------------------------- - + bool ViewAppletShape::startApplet( const ::basegfx::B2DRectangle& rBounds ) { ENSURE_OR_RETURN_FALSE( mpViewLayer && mpViewLayer->getCanvas() && mpViewLayer->getCanvas()->getUNOCanvas().is(), @@ -143,25 +143,25 @@ namespace slideshow try { ::cppcanvas::CanvasSharedPtr pCanvas = mpViewLayer->getCanvas(); - + uno::Reference< beans::XPropertySet > xPropSet( pCanvas->getUNOCanvas()->getDevice(), uno::UNO_QUERY_THROW ); - - uno::Reference< awt::XWindow2 > xParentWindow( - xPropSet->getPropertyValue( + + uno::Reference< awt::XWindow2 > xParentWindow( + xPropSet->getPropertyValue( ::rtl::OUString::createFromAscii( "Window" )), uno::UNO_QUERY_THROW ); - uno::Reference<lang::XMultiComponentFactory> xFactory( + uno::Reference<lang::XMultiComponentFactory> xFactory( mxComponentContext->getServiceManager() ); - + if( xFactory.is() ) { // create an awt window to contain the applet // ========================================== uno::Reference< awt::XToolkit > xToolkit( - xFactory->createInstanceWithContext( + xFactory->createInstanceWithContext( ::rtl::OUString::createFromAscii( "com.sun.star.awt.Toolkit" ), mxComponentContext ), uno::UNO_QUERY_THROW ); @@ -172,12 +172,12 @@ namespace slideshow uno::UNO_QUERY_THROW), 0, awt::Rectangle(), - awt::WindowAttribute::SHOW + awt::WindowAttribute::SHOW | awt::VclWindowPeerAttribute::CLIPCHILDREN ); - uno::Reference< awt::XWindowPeer > xNewWinPeer( + uno::Reference< awt::XWindowPeer > xNewWinPeer( xToolkit->createWindow( aOwnWinDescriptor )); - uno::Reference< awt::XWindow > xOwnWindow( xNewWinPeer, + uno::Reference< awt::XWindow > xOwnWindow( xNewWinPeer, uno::UNO_QUERY_THROW ); @@ -185,16 +185,16 @@ namespace slideshow // =========================================== mxFrame.set( - xFactory->createInstanceWithContext( + xFactory->createInstanceWithContext( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Frame" ), mxComponentContext ), uno::UNO_QUERY_THROW ); mxFrame->initialize( xOwnWindow ); - uno::Reference < frame::XSynchronousFrameLoader > xLoader( mxViewer, + uno::Reference < frame::XSynchronousFrameLoader > xLoader( mxViewer, uno::UNO_QUERY_THROW ); - xLoader->load( uno::Sequence < beans::PropertyValue >(), + xLoader->load( uno::Sequence < beans::PropertyValue >(), mxFrame ); @@ -202,29 +202,29 @@ namespace slideshow // ========================================================== ::basegfx::B2DRange aTmpRange; - ::canvas::tools::calcTransformedRectBounds( aTmpRange, - rBounds, + ::canvas::tools::calcTransformedRectBounds( aTmpRange, + rBounds, mpViewLayer->getTransformation() ); const ::basegfx::B2IRange& rPixelBounds( ::basegfx::unotools::b2ISurroundingRangeFromB2DRange( aTmpRange )); uno::Reference< awt::XWindow > xSurroundingWindow( mxFrame->getContainerWindow() ); if( xSurroundingWindow.is() ) - xSurroundingWindow->setPosSize( static_cast<sal_Int32>(rPixelBounds.getMinX()), + xSurroundingWindow->setPosSize( static_cast<sal_Int32>(rPixelBounds.getMinX()), static_cast<sal_Int32>(rPixelBounds.getMinY()), - static_cast<sal_Int32>(rPixelBounds.getWidth()), + static_cast<sal_Int32>(rPixelBounds.getWidth()), static_cast<sal_Int32>(rPixelBounds.getHeight()), awt::PosSize::POSSIZE ); uno::Reference< awt::XWindow > xAppletWindow( mxFrame->getComponentWindow() ); if( xAppletWindow.is() ) - xAppletWindow->setPosSize( 0, 0, - static_cast<sal_Int32>(rPixelBounds.getWidth()), + xAppletWindow->setPosSize( 0, 0, + static_cast<sal_Int32>(rPixelBounds.getWidth()), static_cast<sal_Int32>(rPixelBounds.getHeight()), awt::PosSize::POSSIZE ); } } - catch (uno::Exception &) + catch (uno::Exception &) { return false; } @@ -233,7 +233,7 @@ namespace slideshow } // --------------------------------------------------------------------- - + void ViewAppletShape::endApplet() { uno::Reference<util::XCloseable> xCloseable( @@ -248,11 +248,11 @@ namespace slideshow } // --------------------------------------------------------------------- - + bool ViewAppletShape::render( const ::basegfx::B2DRectangle& rBounds ) const { ::cppcanvas::CanvasSharedPtr pCanvas = mpViewLayer->getCanvas(); - + if( !pCanvas ) return false; @@ -273,24 +273,24 @@ namespace slideshow return false; ::basegfx::B2DRange aTmpRange; - ::canvas::tools::calcTransformedRectBounds( aTmpRange, - rBounds, + ::canvas::tools::calcTransformedRectBounds( aTmpRange, + rBounds, mpViewLayer->getTransformation() ); const ::basegfx::B2IRange& rPixelBounds( ::basegfx::unotools::b2ISurroundingRangeFromB2DRange( aTmpRange )); - + uno::Reference< awt::XWindow > xFrameWindow( mxFrame->getContainerWindow() ); if( xFrameWindow.is() ) - xFrameWindow->setPosSize( static_cast<sal_Int32>(rPixelBounds.getMinX()), - static_cast<sal_Int32>(rPixelBounds.getMinY()), - static_cast<sal_Int32>(rPixelBounds.getWidth()), + xFrameWindow->setPosSize( static_cast<sal_Int32>(rPixelBounds.getMinX()), + static_cast<sal_Int32>(rPixelBounds.getMinY()), + static_cast<sal_Int32>(rPixelBounds.getWidth()), static_cast<sal_Int32>(rPixelBounds.getHeight()), awt::PosSize::POSSIZE ); uno::Reference< awt::XWindow > xAppletWindow( mxFrame->getComponentWindow() ); if( xAppletWindow.is() ) - xAppletWindow->setPosSize( 0, 0, - static_cast<sal_Int32>(rPixelBounds.getWidth()), + xAppletWindow->setPosSize( 0, 0, + static_cast<sal_Int32>(rPixelBounds.getWidth()), static_cast<sal_Int32>(rPixelBounds.getHeight()), awt::PosSize::POSSIZE ); diff --git a/slideshow/source/engine/shapes/viewappletshape.hxx b/slideshow/source/engine/shapes/viewappletshape.hxx index 86782fe64f7b..36bc5627e209 100644 --- a/slideshow/source/engine/shapes/viewappletshape.hxx +++ b/slideshow/source/engine/shapes/viewappletshape.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ namespace com { namespace sun { namespace star { namespace frame { class XSynchronousFrameLoader; class XFrame; -} +} namespace uno { class XComponentContext; } @@ -80,19 +80,19 @@ namespace slideshow @param nNumPropEntries Number of property table entries (in pPropCopyTable) */ - ViewAppletShape( const ViewLayerSharedPtr& rViewLayer, - const ::com::sun::star::uno::Reference< + ViewAppletShape( const ViewLayerSharedPtr& rViewLayer, + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, const ::rtl::OUString& rServiceName, const char** pPropCopyTable, sal_Size nNumPropEntries, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); /** destroy the object */ virtual ~ViewAppletShape(); - + /** Query the associated view layer of this shape */ ViewLayerSharedPtr getViewLayer() const; @@ -125,14 +125,14 @@ namespace slideshow /** Render the ViewShape - This method renders the ViewAppletShape on the associated view. + This method renders the ViewAppletShape on the associated view. @param rBounds The current applet shape bounds @return whether the rendering finished successfully. */ - bool render( const ::basegfx::B2DRectangle& rBounds ) const; + bool render( const ::basegfx::B2DRectangle& rBounds ) const; /** Resize the ViewShape @@ -157,7 +157,7 @@ namespace slideshow /// the frame containing the applet ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame> mxFrame; - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> mxComponentContext; }; diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx index bbaef1f486e0..f8939186721b 100644 --- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx +++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,15 +63,15 @@ namespace slideshow { namespace internal { - - bool ViewBackgroundShape::prefetch( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, - const GDIMetaFileSharedPtr& rMtf ) const + + bool ViewBackgroundShape::prefetch( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, + const GDIMetaFileSharedPtr& rMtf ) const { RTL_LOGFILE_CONTEXT( aLog, "::presentation::internal::ViewBackgroundShape::prefetch()" ); ENSURE_OR_RETURN_FALSE( rMtf, "ViewBackgroundShape::prefetch(): no valid metafile!" ); - const ::basegfx::B2DHomMatrix& rCanvasTransform( + const ::basegfx::B2DHomMatrix& rCanvasTransform( mpViewLayer->getTransformation() ); if( !mxBitmap.is() || @@ -82,21 +82,21 @@ namespace slideshow // determine transformed page bounds ::basegfx::B2DRectangle aTmpRect; - ::canvas::tools::calcTransformedRectBounds( aTmpRect, - maBounds, + ::canvas::tools::calcTransformedRectBounds( aTmpRect, + maBounds, rCanvasTransform ); // determine pixel size of bitmap (choose it one pixel // larger, as polygon rendering takes one pixel more // to the right and to the bottom) - const ::basegfx::B2ISize aBmpSizePixel( + const ::basegfx::B2ISize aBmpSizePixel( ::basegfx::fround( aTmpRect.getRange().getX() + 1), ::basegfx::fround( aTmpRect.getRange().getY() + 1) ); // create a bitmap of appropriate size - ::cppcanvas::BitmapSharedPtr pBitmap( - ::cppcanvas::BaseGfxFactory::getInstance().createBitmap( - rDestinationCanvas, + ::cppcanvas::BitmapSharedPtr pBitmap( + ::cppcanvas::BaseGfxFactory::getInstance().createBitmap( + rDestinationCanvas, aBmpSizePixel ) ); ENSURE_OR_THROW( pBitmap, @@ -111,7 +111,7 @@ namespace slideshow initSlideBackground( pBitmapCanvas, aBmpSizePixel ); - // apply linear part of destination canvas transformation (linear means in this context: + // apply linear part of destination canvas transformation (linear means in this context: // transformation without any translational components) ::basegfx::B2DHomMatrix aLinearTransform( rCanvasTransform ); aLinearTransform.set( 0, 2, 0.0 ); @@ -123,8 +123,8 @@ namespace slideshow maBounds.getMinX(), maBounds.getMinY())); ::cppcanvas::RendererSharedPtr pRenderer( - ::cppcanvas::VCLFactory::getInstance().createRenderer( - pBitmapCanvas, + ::cppcanvas::VCLFactory::getInstance().createRenderer( + pBitmapCanvas, *rMtf.get(), ::cppcanvas::Renderer::Parameters() ) ); @@ -137,14 +137,14 @@ namespace slideshow mxBitmap = pBitmap->getUNOBitmap(); } - mpLastMtf = rMtf; + mpLastMtf = rMtf; maLastTransformation = rCanvasTransform; return mxBitmap.is(); } - ViewBackgroundShape::ViewBackgroundShape( const ViewLayerSharedPtr& rViewLayer, - const ::basegfx::B2DRectangle& rShapeBounds ) : + ViewBackgroundShape::ViewBackgroundShape( const ViewLayerSharedPtr& rViewLayer, + const ::basegfx::B2DRectangle& rShapeBounds ) : mpViewLayer( rViewLayer ), mxBitmap(), mpLastMtf(), @@ -164,12 +164,12 @@ namespace slideshow { RTL_LOGFILE_CONTEXT( aLog, "::presentation::internal::ViewBackgroundShape::draw()" ); - const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas( mpViewLayer->getCanvas() ); - + const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas( mpViewLayer->getCanvas() ); + if( !prefetch( rDestinationCanvas, rMtf ) ) return false; - ENSURE_OR_RETURN_FALSE( mxBitmap.is(), + ENSURE_OR_RETURN_FALSE( mxBitmap.is(), "ViewBackgroundShape::draw(): Invalid background bitmap" ); ::basegfx::B2DHomMatrix aTransform( mpViewLayer->getTransformation() ); @@ -186,13 +186,13 @@ namespace slideshow rendering::RenderState aRenderState; ::canvas::tools::initRenderState( aRenderState ); - + ::canvas::tools::setRenderStateTransform( aRenderState, aTransform ); try { - rDestinationCanvas->getUNOCanvas()->drawBitmap( mxBitmap, - rDestinationCanvas->getViewState(), + rDestinationCanvas->getUNOCanvas()->drawBitmap( mxBitmap, + rDestinationCanvas->getViewState(), aRenderState ); } catch( uno::Exception& ) diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.hxx b/slideshow/source/engine/shapes/viewbackgroundshape.hxx index a7b6ff36406e..5ecc17c339c5 100644 --- a/slideshow/source/engine/shapes/viewbackgroundshape.hxx +++ b/slideshow/source/engine/shapes/viewbackgroundshape.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,8 +64,8 @@ namespace slideshow Bounds of the background shape, in document coordinate system. */ - ViewBackgroundShape( const ViewLayerSharedPtr& rViewLayer, - const ::basegfx::B2DRectangle& rShapeBounds ); + ViewBackgroundShape( const ViewLayerSharedPtr& rViewLayer, + const ::basegfx::B2DRectangle& rShapeBounds ); /** Query the associated view layer of this shape */ @@ -76,24 +76,24 @@ namespace slideshow private: /** Prefetch bitmap for given canvas */ - bool prefetch( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, - const GDIMetaFileSharedPtr& rMtf ) const; + bool prefetch( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, + const GDIMetaFileSharedPtr& rMtf ) const; - /** The view layer this object is part of. + /** The view layer this object is part of. */ - ViewLayerSharedPtr mpViewLayer; + ViewLayerSharedPtr mpViewLayer; /// Generated content bitmap, already with correct output size - mutable ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmap > mxBitmap; + mutable ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XBitmap > mxBitmap; /// The last metafile a render object was generated for - mutable GDIMetaFileSharedPtr mpLastMtf; + mutable GDIMetaFileSharedPtr mpLastMtf; /// The canvas, mpRenderer is associated with - mutable ::basegfx::B2DHomMatrix maLastTransformation; + mutable ::basegfx::B2DHomMatrix maLastTransformation; - const ::basegfx::B2DRectangle maBounds; + const ::basegfx::B2DRectangle maBounds; }; typedef ::boost::shared_ptr< ViewBackgroundShape > ViewBackgroundShapeSharedPtr; diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index 1c0b6f9b71a1..9e3406bf9856 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,14 +102,14 @@ namespace slideshow } // --------------------------------------------------------------------- - + ViewMediaShape::~ViewMediaShape() - { + { try { endMedia(); } - catch (uno::Exception &) + catch (uno::Exception &) { OSL_ENSURE( false, rtl::OUStringToOString( comphelper::anyToString( @@ -126,7 +126,7 @@ namespace slideshow } // --------------------------------------------------------------------- - + bool ViewMediaShape::startMedia() { if( !mxPlayer.is() ) @@ -134,43 +134,43 @@ namespace slideshow if( mxPlayer.is() && ( mxPlayer->getDuration() > 0.0 ) ) mxPlayer->start(); - + return true; } // --------------------------------------------------------------------- - + void ViewMediaShape::endMedia() { // shutdown player window if( mxPlayerWindow.is() ) { uno::Reference< lang::XComponent > xComponent( mxPlayerWindow, uno::UNO_QUERY ); - + if( xComponent.is() ) xComponent->dispose(); - + mxPlayerWindow.clear(); } mpMediaWindow = ::std::auto_ptr< JavaChildWindow >(); - + // shutdown player if( mxPlayer.is() ) { mxPlayer->stop(); uno::Reference< lang::XComponent > xComponent( mxPlayer, uno::UNO_QUERY ); - + if( xComponent.is() ) xComponent->dispose(); - + mxPlayer.clear(); } } // --------------------------------------------------------------------- - + void ViewMediaShape::pauseMedia() { if( mxPlayer.is() && ( mxPlayer->getDuration() > 0.0 ) ) @@ -186,8 +186,8 @@ namespace slideshow } // --------------------------------------------------------------------- - - bool ViewMediaShape::render( const ::basegfx::B2DRectangle& rBounds ) const + + bool ViewMediaShape::render( const ::basegfx::B2DRectangle& rBounds ) const { ::cppcanvas::CanvasSharedPtr pCanvas = mpViewLayer->getCanvas();; @@ -205,7 +205,7 @@ namespace slideshow return true; } - bool ViewMediaShape::resize( const ::basegfx::B2DRectangle& rNewBounds ) const + bool ViewMediaShape::resize( const ::basegfx::B2DRectangle& rNewBounds ) const { maBounds = rNewBounds; @@ -219,7 +219,7 @@ namespace slideshow uno::Reference< beans::XPropertySet > xPropSet( pCanvas->getUNOCanvas()->getDevice(), uno::UNO_QUERY ); - + uno::Reference< awt::XWindow > xParentWindow; if( xPropSet.is() && getPropertyValue( xParentWindow, @@ -227,96 +227,96 @@ namespace slideshow ::rtl::OUString::createFromAscii( "Window" )) ) { const awt::Rectangle aRect( xParentWindow->getPosSize() ); - + maWindowOffset.X = aRect.X; maWindowOffset.Y = aRect.Y; } ::basegfx::B2DRange aTmpRange; - ::canvas::tools::calcTransformedRectBounds( aTmpRange, - rNewBounds, + ::canvas::tools::calcTransformedRectBounds( aTmpRange, + rNewBounds, mpViewLayer->getTransformation() ); const ::basegfx::B2IRange& rRangePix( ::basegfx::unotools::b2ISurroundingRangeFromB2DRange( aTmpRange )); - + mxPlayerWindow->setEnable( !rRangePix.isEmpty() ); - + if( rRangePix.isEmpty() ) - return true; - + return true; + const Point aPosPixel( rRangePix.getMinX() + maWindowOffset.X, rRangePix.getMinY() + maWindowOffset.Y ); - const Size aSizePixel( rRangePix.getMaxX() - rRangePix.getMinX(), + const Size aSizePixel( rRangePix.getMaxX() - rRangePix.getMinX(), rRangePix.getMaxY() - rRangePix.getMinY() ); - + if( mpMediaWindow.get() ) { mpMediaWindow->SetPosSizePixel( aPosPixel, aSizePixel ); - mxPlayerWindow->setPosSize( 0, 0, - aSizePixel.Width(), aSizePixel.Height(), + mxPlayerWindow->setPosSize( 0, 0, + aSizePixel.Width(), aSizePixel.Height(), 0 ); } else { - mxPlayerWindow->setPosSize( aPosPixel.X(), aPosPixel.Y(), - aSizePixel.Width(), aSizePixel.Height(), + mxPlayerWindow->setPosSize( aPosPixel.X(), aPosPixel.Y(), + aSizePixel.Width(), aSizePixel.Height(), 0 ); } return true; } - + // --------------------------------------------------------------------- - + bool ViewMediaShape::implInitialize( const ::basegfx::B2DRectangle& rBounds ) { if( !mxPlayer.is() && mxShape.is() ) { - ENSURE_OR_RETURN_FALSE( mpViewLayer->getCanvas(), + ENSURE_OR_RETURN_FALSE( mpViewLayer->getCanvas(), "ViewMediaShape::update(): Invalid layer canvas" ); uno::Reference< rendering::XCanvas > xCanvas( mpViewLayer->getCanvas()->getUNOCanvas() ); if( xCanvas.is() ) { - uno::Reference< beans::XPropertySet > xPropSet; - ::rtl::OUString aURL; - + uno::Reference< beans::XPropertySet > xPropSet; + ::rtl::OUString aURL; + try { xPropSet.set( mxShape, uno::UNO_QUERY ); // create Player - if( xPropSet.is() && - ( xPropSet->getPropertyValue( + if( xPropSet.is() && + ( xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaURL" ) ) ) >>=aURL ) ) { implInitializeMediaPlayer( aURL ); } - + // create visible object uno::Sequence< uno::Any > aDeviceParams; - + if( ::canvas::tools::getDeviceInfo( xCanvas, aDeviceParams ).getLength() > 1 ) { ::rtl::OUString aImplName; - + aDeviceParams[ 0 ] >>= aImplName; - - if( aImplName.endsWithIgnoreAsciiCaseAsciiL( + + if( aImplName.endsWithIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM("VCL") )) { implInitializeVCLBasedPlayerWindow( rBounds, aDeviceParams ); } - else if( aImplName.endsWithIgnoreAsciiCaseAsciiL( + else if( aImplName.endsWithIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM("DX")) || - aImplName.endsWithIgnoreAsciiCaseAsciiL( + aImplName.endsWithIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM("DX9"))) { implInitializeDXBasedPlayerWindow( rBounds, aDeviceParams ); } } - + // set player properties implSetMediaProperties( xPropSet ); } @@ -329,22 +329,22 @@ namespace slideshow OSL_ENSURE( false, rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); + RTL_TEXTENCODING_UTF8 ).getStr() ); } } } - + return mxPlayer.is() || mxPlayerWindow.is(); } // --------------------------------------------------------------------- - + void ViewMediaShape::implSetMediaProperties( const uno::Reference< beans::XPropertySet >& rxProps ) { if( mxPlayer.is() ) { mxPlayer->setMediaTime( 0.0 ); - + if( rxProps.is() ) { sal_Bool bLoop( false ); @@ -364,7 +364,7 @@ namespace slideshow rxProps, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VolumeDB" ))); mxPlayer->setVolumeDB( nVolumeDB ); - + if( mxPlayerWindow.is() ) { media::ZoomLevel eZoom(media::ZoomLevel_FIT_TO_WINDOW); @@ -376,9 +376,9 @@ namespace slideshow } } } - + // --------------------------------------------------------------------- - + void ViewMediaShape::implInitializeMediaPlayer( const ::rtl::OUString& rMediaURL ) { if( !mxPlayer.is() ) @@ -387,7 +387,7 @@ namespace slideshow { if( rMediaURL.getLength() ) { - mxPlayer.set( avmedia::MediaWindow::createPlayer( rMediaURL ), + mxPlayer.set( avmedia::MediaWindow::createPlayer( rMediaURL ), uno::UNO_QUERY ); } } @@ -406,7 +406,7 @@ namespace slideshow } // --------------------------------------------------------------------- - + bool ViewMediaShape::implInitializeVCLBasedPlayerWindow( const ::basegfx::B2DRectangle& rBounds, const uno::Sequence< uno::Any >& rVCLDeviceParams) { @@ -415,47 +415,47 @@ namespace slideshow try { sal_Int64 aVal=0; - + rVCLDeviceParams[ 1 ] >>= aVal; - + Window* pWindow = reinterpret_cast< Window* >( aVal ); - + if( pWindow ) { ::basegfx::B2DRange aTmpRange; - ::canvas::tools::calcTransformedRectBounds( aTmpRange, - rBounds, + ::canvas::tools::calcTransformedRectBounds( aTmpRange, + rBounds, mpViewLayer->getTransformation() ); const ::basegfx::B2IRange& rRangePix( ::basegfx::unotools::b2ISurroundingRangeFromB2DRange( aTmpRange )); - + if( !rRangePix.isEmpty() ) { - uno::Sequence< uno::Any > aArgs( 2 ); - awt::Rectangle aAWTRect( rRangePix.getMinX(), + uno::Sequence< uno::Any > aArgs( 2 ); + awt::Rectangle aAWTRect( rRangePix.getMinX(), rRangePix.getMinY(), rRangePix.getMaxX() - rRangePix.getMinX(), rRangePix.getMaxY() - rRangePix.getMinY() ); mpMediaWindow = ::std::auto_ptr< JavaChildWindow >( new JavaChildWindow( pWindow, WB_CLIPCHILDREN ) ); mpMediaWindow->SetBackground( Color( COL_BLACK ) ); - mpMediaWindow->SetPosSizePixel( Point( aAWTRect.X, + mpMediaWindow->SetPosSizePixel( Point( aAWTRect.X, aAWTRect.Y ), - Size( aAWTRect.Width, + Size( aAWTRect.Width, aAWTRect.Height )); mpMediaWindow->Show(); - + if( mxPlayer.is() ) { - aArgs[ 0 ] = uno::makeAny( + aArgs[ 0 ] = uno::makeAny( sal::static_int_cast<sal_IntPtr>( mpMediaWindow->getParentWindowHandleForJava()) ); - + aAWTRect.X = aAWTRect.Y = 0; aArgs[ 1 ] = uno::makeAny( aAWTRect ); - + mxPlayerWindow.set( mxPlayer->createPlayerWindow( aArgs ) ); - + if( mxPlayerWindow.is() ) { mxPlayerWindow->setVisible( true ); @@ -474,15 +474,15 @@ namespace slideshow OSL_ENSURE( false, rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); + RTL_TEXTENCODING_UTF8 ).getStr() ); } } - + return mxPlayerWindow.is(); } - + // --------------------------------------------------------------------- - + bool ViewMediaShape::implInitializeDXBasedPlayerWindow( const ::basegfx::B2DRectangle& rBounds, const uno::Sequence< uno::Any >& rDXDeviceParams ) { @@ -493,33 +493,33 @@ namespace slideshow if( rDXDeviceParams.getLength() == 2 ) { sal_Int64 aWNDVal=0; - + rDXDeviceParams[ 1 ] >>= aWNDVal; - + if( aWNDVal ) { ::basegfx::B2DRange aTmpRange; - ::canvas::tools::calcTransformedRectBounds( aTmpRange, - rBounds, + ::canvas::tools::calcTransformedRectBounds( aTmpRange, + rBounds, mpViewLayer->getTransformation() ); const ::basegfx::B2IRange& rRangePix( ::basegfx::unotools::b2ISurroundingRangeFromB2DRange( aTmpRange )); - + if( !rRangePix.isEmpty() ) { - uno::Sequence< uno::Any > aArgs( 2 ); - awt::Rectangle aAWTRect( rRangePix.getMinX() + maWindowOffset.X, + uno::Sequence< uno::Any > aArgs( 2 ); + awt::Rectangle aAWTRect( rRangePix.getMinX() + maWindowOffset.X, rRangePix.getMinY() + maWindowOffset.Y, rRangePix.getMaxX() - rRangePix.getMinX(), rRangePix.getMaxY() - rRangePix.getMinY() ); if( mxPlayer.is() ) { - aArgs[ 0 ] = uno::makeAny( + aArgs[ 0 ] = uno::makeAny( sal::static_int_cast<sal_Int32>( aWNDVal) ); aArgs[ 1 ] = uno::makeAny( aAWTRect ); - + mxPlayerWindow.set( mxPlayer->createPlayerWindow( aArgs ) ); } } @@ -535,10 +535,10 @@ namespace slideshow OSL_ENSURE( false, rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); + RTL_TEXTENCODING_UTF8 ).getStr() ); } } - + return mxPlayerWindow.is(); } } diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx index 5e2568bbd98e..baab2d1dc500 100644 --- a/slideshow/source/engine/shapes/viewmediashape.hxx +++ b/slideshow/source/engine/shapes/viewmediashape.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,15 +40,15 @@ class JavaChildWindow; namespace com { namespace sun { namespace star { namespace drawing { class XShape; -} -namespace media { +} +namespace media { class XPlayer; class XPlayerWindow; -} +} namespace uno { class XComponentContext; } -namespace beans{ +namespace beans{ class XPropertySet; } } } } @@ -70,16 +70,16 @@ namespace slideshow @param rView The associated View object. */ - ViewMediaShape( const ViewLayerSharedPtr& rViewLayer, - const ::com::sun::star::uno::Reference< + ViewMediaShape( const ViewLayerSharedPtr& rViewLayer, + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); /** destroy the object */ virtual ~ViewMediaShape(); - + /** Query the associated view layer of this shape */ ViewLayerSharedPtr getViewLayer() const; @@ -123,14 +123,14 @@ namespace slideshow /** Render the ViewShape - This method renders the ViewMediaShape on the associated view. + This method renders the ViewMediaShape on the associated view. @param rBounds The current media shape bounds @return whether the rendering finished successfully. */ - bool render( const ::basegfx::B2DRectangle& rBounds ) const; + bool render( const ::basegfx::B2DRectangle& rBounds ) const; /** Resize the ViewShape @@ -142,10 +142,10 @@ namespace slideshow @return whether the resize finished successfully. */ - bool resize( const ::basegfx::B2DRectangle& rNewBounds ) const; + bool resize( const ::basegfx::B2DRectangle& rNewBounds ) const; private: - + bool implInitialize( const ::basegfx::B2DRectangle& rBounds ); void implSetMediaProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rxProps ); void implInitializeMediaPlayer( const ::rtl::OUString& rMediaURL ); @@ -153,16 +153,16 @@ namespace slideshow const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rVCLDeviceParams ); bool implInitializeDXBasedPlayerWindow( const ::basegfx::B2DRectangle& rBounds, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rDXDeviceParams ); - - ViewLayerSharedPtr mpViewLayer; + + ViewLayerSharedPtr mpViewLayer; ::std::auto_ptr< JavaChildWindow > mpMediaWindow; mutable ::com::sun::star::awt::Point maWindowOffset; mutable ::basegfx::B2DRectangle maBounds; - - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape; - ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer; - ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > mxPlayerWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> mxComponentContext; + + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape; + ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer; + ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > mxPlayerWindow; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> mxComponentContext; bool mbIsSoundEnabled; }; diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx index 00a4ef4006f8..778f974ae941 100644 --- a/slideshow/source/engine/shapes/viewshape.cxx +++ b/slideshow/source/engine/shapes/viewshape.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,10 +71,10 @@ namespace slideshow // TODO(F2): Provide sensible setup for mtf-related attributes (fill mode, // char rotation etc.). Do that via mtf argument at this object - bool ViewShape::prefetch( RendererCacheEntry& io_rCacheEntry, - const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, - const GDIMetaFileSharedPtr& rMtf, - const ShapeAttributeLayerSharedPtr& rAttr ) const + bool ViewShape::prefetch( RendererCacheEntry& io_rCacheEntry, + const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, + const GDIMetaFileSharedPtr& rMtf, + const ShapeAttributeLayerSharedPtr& rAttr ) const { RTL_LOGFILE_CONTEXT( aLog, "::presentation::internal::ViewShape::prefetch()" ); ENSURE_OR_RETURN_FALSE( rMtf, @@ -123,9 +123,9 @@ namespace slideshow // out-of-range values appropriately // dim color overrides all other colors - aParms.maFillColor = - aParms.maLineColor = - aParms.maTextColor = + aParms.maFillColor = + aParms.maLineColor = + aParms.maTextColor = rAttr->getDimColor().getIntegerColor(); } if( rAttr->isFontFamilyValid() ) @@ -174,7 +174,7 @@ namespace slideshow *rMtf.get(), aParms ); - io_rCacheEntry.mpMtf = rMtf; + io_rCacheEntry.mpMtf = rMtf; io_rCacheEntry.mpDestinationCanvas = rDestinationCanvas; // also invalidate alpha compositing bitmap (created @@ -191,16 +191,16 @@ namespace slideshow return io_rCacheEntry.mpRenderer; } - bool ViewShape::draw( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, - const GDIMetaFileSharedPtr& rMtf, - const ShapeAttributeLayerSharedPtr& rAttr, - const ::basegfx::B2DHomMatrix& rTransform, - const ::basegfx::B2DPolyPolygon* pClip, - const VectorOfDocTreeNodes& rSubsets ) const + bool ViewShape::draw( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, + const GDIMetaFileSharedPtr& rMtf, + const ShapeAttributeLayerSharedPtr& rAttr, + const ::basegfx::B2DHomMatrix& rTransform, + const ::basegfx::B2DPolyPolygon* pClip, + const VectorOfDocTreeNodes& rSubsets ) const { RTL_LOGFILE_CONTEXT( aLog, "::presentation::internal::ViewShape::draw()" ); - ::cppcanvas::RendererSharedPtr pRenderer( + ::cppcanvas::RendererSharedPtr pRenderer( getRenderer( rDestinationCanvas, rMtf, rAttr ) ); ENSURE_OR_RETURN_FALSE( pRenderer, "ViewShape::draw(): Invalid renderer" ); @@ -248,8 +248,8 @@ namespace slideshow // -------------------------------- bool bRet(true); - VectorOfDocTreeNodes::const_iterator aIter( rSubsets.begin() ); - const VectorOfDocTreeNodes::const_iterator aEnd ( rSubsets.end() ); + VectorOfDocTreeNodes::const_iterator aIter( rSubsets.begin() ); + const VectorOfDocTreeNodes::const_iterator aEnd ( rSubsets.end() ); while( aIter != aEnd ) { if( !pRenderer->drawSubset( aIter->getStartIndex(), @@ -266,8 +266,8 @@ namespace slideshow namespace { /// Convert untransformed shape update area to device pixel. - ::basegfx::B2DRectangle shapeArea2AreaPixel( const ::basegfx::B2DHomMatrix& rCanvasTransformation, - const ::basegfx::B2DRectangle& rUntransformedArea ) + ::basegfx::B2DRectangle shapeArea2AreaPixel( const ::basegfx::B2DHomMatrix& rCanvasTransformation, + const ::basegfx::B2DRectangle& rUntransformedArea ) { // convert area to pixel, and add anti-aliasing border @@ -290,14 +290,14 @@ namespace slideshow } /// Convert shape unit rect to device pixel. - ::basegfx::B2DRectangle calcUpdateAreaPixel( const ::basegfx::B2DRectangle& rUnitBounds, - const ::basegfx::B2DHomMatrix& rShapeTransformation, - const ::basegfx::B2DHomMatrix& rCanvasTransformation, - const ShapeAttributeLayerSharedPtr& pAttr ) + ::basegfx::B2DRectangle calcUpdateAreaPixel( const ::basegfx::B2DRectangle& rUnitBounds, + const ::basegfx::B2DHomMatrix& rShapeTransformation, + const ::basegfx::B2DHomMatrix& rCanvasTransformation, + const ShapeAttributeLayerSharedPtr& pAttr ) { // calc update area for whole shape (including // character scaling) - return shapeArea2AreaPixel( rCanvasTransformation, + return shapeArea2AreaPixel( rCanvasTransformation, getShapeUpdateArea( rUnitBounds, rShapeTransformation, pAttr ) ); @@ -305,15 +305,15 @@ namespace slideshow } bool ViewShape::renderSprite( const ViewLayerSharedPtr& rViewLayer, - const GDIMetaFileSharedPtr& rMtf, - const ::basegfx::B2DRectangle& rOrigBounds, - const ::basegfx::B2DRectangle& rBounds, - const ::basegfx::B2DRectangle& rUnitBounds, - int nUpdateFlags, - const ShapeAttributeLayerSharedPtr& pAttr, - const VectorOfDocTreeNodes& rSubsets, + const GDIMetaFileSharedPtr& rMtf, + const ::basegfx::B2DRectangle& rOrigBounds, + const ::basegfx::B2DRectangle& rBounds, + const ::basegfx::B2DRectangle& rUnitBounds, + int nUpdateFlags, + const ShapeAttributeLayerSharedPtr& pAttr, + const VectorOfDocTreeNodes& rSubsets, double nPrio, - bool bIsVisible ) const + bool bIsVisible ) const { RTL_LOGFILE_CONTEXT( aLog, "::presentation::internal::ViewShape::renderSprite()" ); @@ -343,7 +343,7 @@ namespace slideshow // else is handled via the sprite transformation ::basegfx::B2DHomMatrix aNonTranslationalShapeTransformation; aNonTranslationalShapeTransformation.scale( rOrigBounds.getWidth(), - rOrigBounds.getHeight() ); + rOrigBounds.getHeight() ); ::basegfx::B2DHomMatrix aShapeTransformation( aNonTranslationalShapeTransformation ); aShapeTransformation.translate( rOrigBounds.getMinX(), rOrigBounds.getMinY() ); @@ -370,11 +370,11 @@ namespace slideshow // char scaling). NOTE: to cancel the shape translation, // contained in rSpriteBoundsPixel, this is _without_ any // translational component (fixed along with #121921#). - ::basegfx::B2DRectangle aLogShapeBounds; + ::basegfx::B2DRectangle aLogShapeBounds; const ::basegfx::B2DRectangle& rNominalShapeBoundsPixel( - shapeArea2AreaPixel( rCanvasTransform, - ::canvas::tools::calcTransformedRectBounds( - aLogShapeBounds, + shapeArea2AreaPixel( rCanvasTransform, + ::canvas::tools::calcTransformedRectBounds( + aLogShapeBounds, ::basegfx::B2DRectangle(0.0,0.0,1.0,1.0), aNonTranslationalShapeTransformation ) ) ); @@ -419,7 +419,7 @@ namespace slideshow // rSpriteBoundsPixel upper, left corner is: the offset we // have to move sprite output to the right, top (to make // the desired subset content visible at all) - const ::basegfx::B2DSize& rSpriteCorrectionOffset( + const ::basegfx::B2DSize& rSpriteCorrectionOffset( rSpriteBoundsPixel.getMinimum() - rNominalShapeBoundsPixel.getMinimum() ); // offset added top, left for anti-aliasing (otherwise, @@ -438,8 +438,8 @@ namespace slideshow // NOTE: As for now, sprites are always positioned on // integer pixel positions on screen, have to round to // nearest integer here, too (fixed along with #121921#) - mpSprite->setPixelOffset( - aAAOffset - ::basegfx::B2DSize( + mpSprite->setPixelOffset( + aAAOffset - ::basegfx::B2DSize( ::basegfx::fround( rSpriteCorrectionOffset.getX() ), ::basegfx::fround( rSpriteCorrectionOffset.getY() ) ) ); @@ -460,8 +460,8 @@ namespace slideshow if( mbForceUpdate || (nUpdateFlags & ALPHA) ) { mpSprite->setAlpha( (pAttr && pAttr->isAlphaValid()) ? - ::basegfx::clamp(pAttr->getAlpha(), - 0.0, + ::basegfx::clamp(pAttr->getAlpha(), + 0.0, 1.0) : 1.0 ); } @@ -473,7 +473,7 @@ namespace slideshow // extract linear part of canvas view transformation // (linear means: without translational components) - ::basegfx::B2DHomMatrix aViewTransform( + ::basegfx::B2DHomMatrix aViewTransform( mpViewLayer->getTransformation() ); aViewTransform.set( 0, 2, 0.0 ); aViewTransform.set( 1, 2, 0.0 ); @@ -484,11 +484,11 @@ namespace slideshow (rSpriteSizePixel.getX()-2*::cppcanvas::Canvas::ANTIALIASING_EXTRA_SIZE), rSpriteSizePixel.getY()/ (rSpriteSizePixel.getY()-2*::cppcanvas::Canvas::ANTIALIASING_EXTRA_SIZE)); - + // transform clip polygon from view to device // coordinate space aClipPoly.transform( aViewTransform ); - + mpSprite->clip( aClipPoly ); } else @@ -525,14 +525,14 @@ namespace slideshow rSubsets ); } - bool ViewShape::render( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, - const GDIMetaFileSharedPtr& rMtf, - const ::basegfx::B2DRectangle& rBounds, - const ::basegfx::B2DRectangle& rUpdateBounds, - int nUpdateFlags, - const ShapeAttributeLayerSharedPtr& pAttr, - const VectorOfDocTreeNodes& rSubsets, - bool bIsVisible ) const + bool ViewShape::render( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, + const GDIMetaFileSharedPtr& rMtf, + const ::basegfx::B2DRectangle& rBounds, + const ::basegfx::B2DRectangle& rUpdateBounds, + int nUpdateFlags, + const ShapeAttributeLayerSharedPtr& pAttr, + const VectorOfDocTreeNodes& rSubsets, + bool bIsVisible ) const { RTL_LOGFILE_CONTEXT( aLog, "::presentation::internal::ViewShape::render()" ); @@ -600,7 +600,7 @@ namespace slideshow // alpha // ------------------------------------------- - const ::basegfx::B2DHomMatrix aTransform( + const ::basegfx::B2DHomMatrix aTransform( getShapeTransformation( rBounds, pAttr ) ); @@ -629,7 +629,7 @@ namespace slideshow // blend effect, have to first render shape as // a whole, then blit that surface with global // alpha to the destination) - const RendererCacheVector::iterator aCompositingSurface( + const RendererCacheVector::iterator aCompositingSurface( getCacheEntry( rDestinationCanvas ) ); if( !aCompositingSurface->mpLastBitmapCanvas || @@ -645,17 +645,17 @@ namespace slideshow "ViewShape::render(): Could not create compositing surface"); aCompositingSurface->mpDestinationCanvas = rDestinationCanvas; - aCompositingSurface->mpLastBitmap = pBitmap; - aCompositingSurface->mpLastBitmapCanvas = pBitmap->getBitmapCanvas(); + aCompositingSurface->mpLastBitmap = pBitmap; + aCompositingSurface->mpLastBitmapCanvas = pBitmap->getBitmapCanvas(); } // buffer aCompositingSurface iterator content // - said one might get invalidated during // draw() below. - ::cppcanvas::BitmapCanvasSharedPtr pBitmapCanvas( + ::cppcanvas::BitmapCanvasSharedPtr pBitmapCanvas( aCompositingSurface->mpLastBitmapCanvas ); - ::cppcanvas::BitmapSharedPtr pBitmap( + ::cppcanvas::BitmapSharedPtr pBitmap( aCompositingSurface->mpLastBitmap); // setup bitmap canvas transformation - @@ -726,7 +726,7 @@ namespace slideshow // retrieve shape transformation, _with_ shape translation // to actual page position. - const ::basegfx::B2DHomMatrix aTransform( + const ::basegfx::B2DHomMatrix aTransform( getShapeTransformation( rBounds, pAttr ) ); @@ -738,7 +738,7 @@ namespace slideshow rSubsets ); } - + // ------------------------------------------------------------------------------------- ViewShape::ViewShape( const ViewLayerSharedPtr& rViewLayer ) : @@ -756,16 +756,16 @@ namespace slideshow return mpViewLayer; } - ViewShape::RendererCacheVector::iterator ViewShape::getCacheEntry( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas ) const + ViewShape::RendererCacheVector::iterator ViewShape::getCacheEntry( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas ) const { // lookup destination canvas - is there already a renderer // created for that target? - RendererCacheVector::iterator aIter; + RendererCacheVector::iterator aIter; const RendererCacheVector::iterator aEnd( maRenderers.end() ); // already there? - if( (aIter=::std::find_if( maRenderers.begin(), - aEnd, + if( (aIter=::std::find_if( maRenderers.begin(), + aEnd, ::boost::bind( ::std::equal_to< ::cppcanvas::CanvasSharedPtr >(), ::boost::cref( rDestinationCanvas ), @@ -794,14 +794,14 @@ namespace slideshow return aIter; } - - ::cppcanvas::RendererSharedPtr ViewShape::getRenderer( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, - const GDIMetaFileSharedPtr& rMtf, - const ShapeAttributeLayerSharedPtr& rAttr ) const + + ::cppcanvas::RendererSharedPtr ViewShape::getRenderer( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, + const GDIMetaFileSharedPtr& rMtf, + const ShapeAttributeLayerSharedPtr& rAttr ) const { // lookup destination canvas - is there already a renderer // created for that target? - const RendererCacheVector::iterator aIter( + const RendererCacheVector::iterator aIter( getCacheEntry( rDestinationCanvas ) ); // now we have a valid entry, either way. call prefetch() @@ -821,7 +821,7 @@ namespace slideshow return ::cppcanvas::RendererSharedPtr(); } } - + void ViewShape::invalidateRenderer() const { // simply clear the cache. Subsequent getRenderer() calls @@ -831,7 +831,7 @@ namespace slideshow ::basegfx::B2DSize ViewShape::getAntialiasingBorder() const { - ENSURE_OR_THROW( mpViewLayer->getCanvas(), + ENSURE_OR_THROW( mpViewLayer->getCanvas(), "ViewShape::getAntialiasingBorder(): Invalid ViewLayer canvas" ); const ::basegfx::B2DHomMatrix& rViewTransform( @@ -863,10 +863,10 @@ namespace slideshow mbForceUpdate = true; } - bool ViewShape::update( const GDIMetaFileSharedPtr& rMtf, - const RenderArgs& rArgs, - int nUpdateFlags, - bool bIsVisible ) const + bool ViewShape::update( const GDIMetaFileSharedPtr& rMtf, + const RenderArgs& rArgs, + int nUpdateFlags, + bool bIsVisible ) const { RTL_LOGFILE_CONTEXT( aLog, "::presentation::internal::ViewShape::update()" ); ENSURE_OR_RETURN_FALSE( mpViewLayer->getCanvas(), "ViewShape::update(): Invalid layer canvas" ); diff --git a/slideshow/source/engine/shapes/viewshape.hxx b/slideshow/source/engine/shapes/viewshape.hxx index a497f8943985..44d66cfafac5 100644 --- a/slideshow/source/engine/shapes/viewshape.hxx +++ b/slideshow/source/engine/shapes/viewshape.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -113,13 +113,13 @@ namespace slideshow enum UpdateFlags { - NONE= 0, - TRANSFORMATION= 1, - CLIP= 2, - ALPHA= 4, - POSITION= 8, - CONTENT= 16, - FORCE= 32 + NONE= 0, + TRANSFORMATION= 1, + CLIP= 2, + ALPHA= 4, + POSITION= 8, + CONTENT= 16, + FORCE= 32 }; struct RenderArgs @@ -131,7 +131,7 @@ namespace slideshow @param rUpdateBounds The area covered by the shape - + @param rBounds The current shape bounds @@ -148,12 +148,12 @@ namespace slideshow @param nPrio Shape priority */ - RenderArgs( const ::basegfx::B2DRectangle& rOrigBounds, - const ::basegfx::B2DRectangle& rUpdateBounds, - const ::basegfx::B2DRectangle& rBounds, - const ::basegfx::B2DRectangle& rUnitBounds, - const ShapeAttributeLayerSharedPtr& rAttr, - const VectorOfDocTreeNodes& rSubsets, + RenderArgs( const ::basegfx::B2DRectangle& rOrigBounds, + const ::basegfx::B2DRectangle& rUpdateBounds, + const ::basegfx::B2DRectangle& rBounds, + const ::basegfx::B2DRectangle& rUnitBounds, + const ShapeAttributeLayerSharedPtr& rAttr, + const VectorOfDocTreeNodes& rSubsets, double nPrio ) : maOrigBounds( rOrigBounds ), maUpdateBounds( rUpdateBounds ), @@ -165,12 +165,12 @@ namespace slideshow { } - const ::basegfx::B2DRectangle maOrigBounds; - const ::basegfx::B2DRectangle maUpdateBounds; - const ::basegfx::B2DRectangle maBounds; - const ::basegfx::B2DRectangle maUnitBounds; - const ShapeAttributeLayerSharedPtr& mrAttr; - const VectorOfDocTreeNodes& mrSubsets; + const ::basegfx::B2DRectangle maOrigBounds; + const ::basegfx::B2DRectangle maUpdateBounds; + const ::basegfx::B2DRectangle maBounds; + const ::basegfx::B2DRectangle maUnitBounds; + const ShapeAttributeLayerSharedPtr& mrAttr; + const VectorOfDocTreeNodes& mrSubsets; const double mnShapePriority; }; @@ -180,7 +180,7 @@ namespace slideshow view. If the shape is currently animated, the render target is the sprite, otherwise the view's canvas. This method does not render anything, if the - update flags are 0. + update flags are 0. @param rMtf The metafile representation of the shape @@ -197,10 +197,10 @@ namespace slideshow @return whether the rendering finished successfully. */ - bool update( const GDIMetaFileSharedPtr& rMtf, - const RenderArgs& rArgs, - int nUpdateFlags, - bool bIsVisible ) const; + bool update( const GDIMetaFileSharedPtr& rMtf, + const RenderArgs& rArgs, + int nUpdateFlags, + bool bIsVisible ) const; /** Retrieve renderer for given canvas and metafile. @@ -210,9 +210,9 @@ namespace slideshow @return a renderer that renders to the given destination canvas */ - ::cppcanvas::RendererSharedPtr getRenderer( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, - const GDIMetaFileSharedPtr& rMtf, - const ShapeAttributeLayerSharedPtr& rAttr ) const; + ::cppcanvas::RendererSharedPtr getRenderer( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, + const GDIMetaFileSharedPtr& rMtf, + const ShapeAttributeLayerSharedPtr& rAttr ) const; private: @@ -232,58 +232,58 @@ namespace slideshow return mpDestinationCanvas; } - ::cppcanvas::CanvasSharedPtr mpDestinationCanvas; - ::cppcanvas::RendererSharedPtr mpRenderer; - GDIMetaFileSharedPtr mpMtf; - ::cppcanvas::BitmapSharedPtr mpLastBitmap; - ::cppcanvas::BitmapCanvasSharedPtr mpLastBitmapCanvas; + ::cppcanvas::CanvasSharedPtr mpDestinationCanvas; + ::cppcanvas::RendererSharedPtr mpRenderer; + GDIMetaFileSharedPtr mpMtf; + ::cppcanvas::BitmapSharedPtr mpLastBitmap; + ::cppcanvas::BitmapCanvasSharedPtr mpLastBitmapCanvas; }; - typedef ::std::vector< RendererCacheEntry > RendererCacheVector; + typedef ::std::vector< RendererCacheEntry > RendererCacheVector; /** Prefetch Renderer for given canvas */ - bool prefetch( RendererCacheEntry& io_rCacheEntry, - const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, - const GDIMetaFileSharedPtr& rMtf, - const ShapeAttributeLayerSharedPtr& rAttr ) const; - + bool prefetch( RendererCacheEntry& io_rCacheEntry, + const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, + const GDIMetaFileSharedPtr& rMtf, + const ShapeAttributeLayerSharedPtr& rAttr ) const; + /** Draw with prefetched Renderer to stored canvas This method draws prefetched Renderer to its associated canvas (which happens to be mpLastCanvas). */ - bool draw( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, - const GDIMetaFileSharedPtr& rMtf, - const ShapeAttributeLayerSharedPtr& rAttr, - const ::basegfx::B2DHomMatrix& rTransform, - const ::basegfx::B2DPolyPolygon* pClip, - const VectorOfDocTreeNodes& rSubsets ) const; + bool draw( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, + const GDIMetaFileSharedPtr& rMtf, + const ShapeAttributeLayerSharedPtr& rAttr, + const ::basegfx::B2DHomMatrix& rTransform, + const ::basegfx::B2DPolyPolygon* pClip, + const VectorOfDocTreeNodes& rSubsets ) const; /** Render shape to an active sprite */ bool renderSprite( const ViewLayerSharedPtr& rViewLayer, - const GDIMetaFileSharedPtr& rMtf, - const ::basegfx::B2DRectangle& rOrigBounds, - const ::basegfx::B2DRectangle& rBounds, - const ::basegfx::B2DRectangle& rUnitBounds, - int nUpdateFlags, - const ShapeAttributeLayerSharedPtr& pAttr, - const VectorOfDocTreeNodes& rSubsets, + const GDIMetaFileSharedPtr& rMtf, + const ::basegfx::B2DRectangle& rOrigBounds, + const ::basegfx::B2DRectangle& rBounds, + const ::basegfx::B2DRectangle& rUnitBounds, + int nUpdateFlags, + const ShapeAttributeLayerSharedPtr& pAttr, + const VectorOfDocTreeNodes& rSubsets, double nPrio, - bool bIsVisible ) const; + bool bIsVisible ) const; /** Render shape to given canvas */ - bool render( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, - const GDIMetaFileSharedPtr& rMtf, - const ::basegfx::B2DRectangle& rBounds, - const ::basegfx::B2DRectangle& rUpdateBounds, - int nUpdateFlags, - const ShapeAttributeLayerSharedPtr& pAttr, - const VectorOfDocTreeNodes& rSubsets, - bool bIsVisible ) const; + bool render( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, + const GDIMetaFileSharedPtr& rMtf, + const ::basegfx::B2DRectangle& rBounds, + const ::basegfx::B2DRectangle& rUpdateBounds, + int nUpdateFlags, + const ShapeAttributeLayerSharedPtr& pAttr, + const VectorOfDocTreeNodes& rSubsets, + bool bIsVisible ) const; /** Calc sprite size in pixel @@ -294,7 +294,7 @@ namespace slideshow Size of the sprite in user coordinate system (doc coordinates) */ ::basegfx::B2DSize calcSpriteSizePixel( const ::basegfx::B2DSize& rUserSize ) const; - + enum{ MAX_RENDER_CACHE_ENTRIES=2 }; /** Retrieve a valid iterator to renderer cache entry @@ -310,26 +310,26 @@ namespace slideshow default-constructed (if newly added) */ RendererCacheVector::iterator getCacheEntry( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas ) const; - + void invalidateRenderer() const; - /** The view layer this object is part of. + /** The view layer this object is part of. Needed for sprite creation */ - ViewLayerSharedPtr mpViewLayer; + ViewLayerSharedPtr mpViewLayer; /// A set of cached mtf/canvas combinations - mutable RendererCacheVector maRenderers; + mutable RendererCacheVector maRenderers; /// The sprite object - mutable AnimatedSpriteSharedPtr mpSprite; + mutable AnimatedSpriteSharedPtr mpSprite; /// If true, render() calls go to the sprite - mutable bool mbAnimationMode; + mutable bool mbAnimationMode; /// If true, shape needs full repaint (and the sprite a setup, if any) - mutable bool mbForceUpdate; + mutable bool mbForceUpdate; }; typedef ::boost::shared_ptr< ViewShape > ViewShapeSharedPtr; diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx index 8adf0992f2b4..c994a6465e1b 100644 --- a/slideshow/source/engine/shapesubset.cxx +++ b/slideshow/source/engine/shapesubset.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ namespace slideshow { namespace internal { - ShapeSubset::ShapeSubset( const AttributableShapeSharedPtr& rOriginalShape, + ShapeSubset::ShapeSubset( const AttributableShapeSharedPtr& rOriginalShape, const DocTreeNode& rTreeNode, const SubsettableShapeManagerSharedPtr& rShapeManager ) : mpOriginalShape( rOriginalShape ), @@ -55,10 +55,10 @@ namespace slideshow "ShapeSubset::ShapeSubset(): Invalid shape manager" ); } - ShapeSubset::ShapeSubset( const ShapeSubsetSharedPtr& rOriginalSubset, - const DocTreeNode& rTreeNode ) : - mpOriginalShape( rOriginalSubset->mpSubsetShape ? - rOriginalSubset->mpSubsetShape : + ShapeSubset::ShapeSubset( const ShapeSubsetSharedPtr& rOriginalSubset, + const DocTreeNode& rTreeNode ) : + mpOriginalShape( rOriginalSubset->mpSubsetShape ? + rOriginalSubset->mpSubsetShape : rOriginalSubset->mpOriginalShape ), mpSubsetShape(), maTreeNode( rTreeNode ), @@ -72,7 +72,7 @@ namespace slideshow "ShapeSubset::ShapeSubset(): Subset is bigger than parent" ); } - ShapeSubset::ShapeSubset( const AttributableShapeSharedPtr& rOriginalShape, + ShapeSubset::ShapeSubset( const AttributableShapeSharedPtr& rOriginalShape, const SubsettableShapeManagerSharedPtr& rShapeManager ) : mpOriginalShape( rOriginalShape ), mpSubsetShape(), @@ -87,10 +87,10 @@ namespace slideshow { try { - // if not done yet: revoke subset from original + // if not done yet: revoke subset from original disableSubsetShape(); } - catch (uno::Exception &) + catch (uno::Exception &) { OSL_ENSURE( false, rtl::OUStringToOString( comphelper::anyToString( @@ -109,8 +109,8 @@ namespace slideshow if( !mpSubsetShape && !maTreeNode.isEmpty() ) { - mpSubsetShape = mpShapeManager->getSubsetShape( - mpOriginalShape, + mpSubsetShape = mpShapeManager->getSubsetShape( + mpOriginalShape, maTreeNode ); } @@ -136,6 +136,6 @@ namespace slideshow { return maTreeNode; } - + } } diff --git a/slideshow/source/engine/slide/layer.cxx b/slideshow/source/engine/slide/layer.cxx index 65f52f3b823f..a41a000e8c79 100644 --- a/slideshow/source/engine/slide/layer.cxx +++ b/slideshow/source/engine/slide/layer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ #include "layer.hxx" #include <boost/bind.hpp> - + using namespace ::com::sun::star; @@ -59,7 +59,7 @@ namespace slideshow mbBoundsDirty(false), mbBackgroundLayer(true), mbClipSet(false) - { + { } Layer::Layer( const basegfx::B2DRange& rMaxLayerBounds ) : @@ -70,7 +70,7 @@ namespace slideshow mbBoundsDirty(false), mbBackgroundLayer(false), mbClipSet(false) - { + { } ViewLayerSharedPtr Layer::addView( const ViewSharedPtr& rNewView ) @@ -79,9 +79,9 @@ namespace slideshow ViewEntryVector::iterator aIter; const ViewEntryVector::iterator aEnd( maViewEntries.end() ); - if( (aIter=std::find_if( maViewEntries.begin(), + if( (aIter=std::find_if( maViewEntries.begin(), aEnd, - boost::bind<bool>( + boost::bind<bool>( std::equal_to< ViewSharedPtr >(), boost::bind( &ViewEntry::getView, _1 ), boost::cref( rNewView )))) != aEnd ) @@ -97,12 +97,12 @@ namespace slideshow pNewLayer = rNewView; else pNewLayer = rNewView->createViewLayer(maBounds); - + // add to local list - maViewEntries.push_back( - ViewEntry( rNewView, + maViewEntries.push_back( + ViewEntry( rNewView, pNewLayer )); - + return maViewEntries.back().mpViewLayer; } @@ -111,10 +111,10 @@ namespace slideshow OSL_ASSERT( rView ); ViewEntryVector::iterator aIter; - const ViewEntryVector::iterator aEnd( maViewEntries.end() ); + const ViewEntryVector::iterator aEnd( maViewEntries.end() ); if( (aIter=std::find_if( maViewEntries.begin(), aEnd, - boost::bind<bool>( + boost::bind<bool>( std::equal_to< ViewSharedPtr >(), boost::bind( &ViewEntry::getView, _1 ), boost::cref( rView )))) == aEnd ) @@ -125,7 +125,7 @@ namespace slideshow OSL_ENSURE( std::count_if( maViewEntries.begin(), aEnd, - boost::bind<bool>( + boost::bind<bool>( std::equal_to< ViewSharedPtr >(), boost::bind( &ViewEntry::getView, _1 ), boost::cref( rView ))) == 1, @@ -140,13 +140,13 @@ namespace slideshow void Layer::viewChanged( const ViewSharedPtr& rChangedView ) { ViewEntryVector::iterator aIter; - const ViewEntryVector::iterator aEnd( maViewEntries.end() ); - if( (aIter=std::find_if( maViewEntries.begin(), + const ViewEntryVector::iterator aEnd( maViewEntries.end() ); + if( (aIter=std::find_if( maViewEntries.begin(), aEnd, - boost::bind<bool>( + boost::bind<bool>( std::equal_to< ViewSharedPtr >(), boost::bind( &ViewEntry::getView, _1 ), - boost::cref( rChangedView )))) != + boost::cref( rChangedView )))) != aEnd ) { // adapt size of given ViewLayer - background layer @@ -201,7 +201,7 @@ namespace slideshow { // TODO(Q1): move this to B2DMultiRange if( !rUpdateRange.isEmpty() ) - maUpdateAreas.appendElement( rUpdateRange, + maUpdateAreas.appendElement( rUpdateRange, basegfx::ORIENTATION_POSITIVE ); } @@ -211,7 +211,7 @@ namespace slideshow { if( !mbBoundsDirty ) maNewBounds.reset(); - + maNewBounds.expand( rShape->getUpdateArea() ); } @@ -245,7 +245,7 @@ namespace slideshow return true; } - + void Layer::clearUpdateRanges() { maUpdateAreas.clear(); @@ -256,9 +256,9 @@ namespace slideshow // clear content on all view layers std::for_each( maViewEntries.begin(), maViewEntries.end(), - boost::bind( + boost::bind( &ViewLayer::clear, - boost::bind( + boost::bind( &ViewEntry::getViewLayer, _1))); @@ -287,12 +287,12 @@ namespace slideshow if( maUpdateAreas.count() ) { // perform proper layer update. That means, setup proper - // clipping, and render each shape that intersects with + // clipping, and render each shape that intersects with // the calculated update area ::basegfx::B2DPolyPolygon aClip( maUpdateAreas.solveCrossovers() ); aClip = ::basegfx::tools::stripNeutralPolygons(aClip); aClip = ::basegfx::tools::stripDispensablePolygons(aClip, false); - + // actually, if there happen to be shapes with zero // update area in the maUpdateAreas vector, the // resulting clip polygon will be empty. @@ -301,9 +301,9 @@ namespace slideshow // set clip to all view layers std::for_each( maViewEntries.begin(), maViewEntries.end(), - boost::bind( + boost::bind( &ViewLayer::setClip, - boost::bind( + boost::bind( &ViewEntry::getViewLayer, _1), boost::cref(aClip))); @@ -311,9 +311,9 @@ namespace slideshow // clear update area on all view layers std::for_each( maViewEntries.begin(), maViewEntries.end(), - boost::bind( + boost::bind( &ViewLayer::clear, - boost::bind( + boost::bind( &ViewEntry::getViewLayer, _1))); @@ -333,9 +333,9 @@ namespace slideshow basegfx::B2DPolyPolygon aEmptyClip; std::for_each( maViewEntries.begin(), maViewEntries.end(), - boost::bind( + boost::bind( &ViewLayer::setClip, - boost::bind( + boost::bind( &ViewEntry::getViewLayer, _1), boost::cref(aEmptyClip))); @@ -351,7 +351,7 @@ namespace slideshow LayerSharedPtr Layer::createBackgroundLayer( const basegfx::B2DRange& rMaxLayerBounds ) { - return LayerSharedPtr(new Layer( rMaxLayerBounds, + return LayerSharedPtr(new Layer( rMaxLayerBounds, BackgroundLayer )); } diff --git a/slideshow/source/engine/slide/layer.hxx b/slideshow/source/engine/slide/layer.hxx index 28605efc733b..91441b6badef 100644 --- a/slideshow/source/engine/slide/layer.hxx +++ b/slideshow/source/engine/slide/layer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -303,7 +303,7 @@ namespace slideshow // layer is the // special // background layer - bool mbClipSet; // true, if beginUpdate set a clip + bool mbClipSet; // true, if beginUpdate set a clip }; typedef ::boost::shared_ptr< Layer > LayerSharedPtr; diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index 83a51334eb33..85fc0476e9bb 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ namespace slideshow namespace internal { template<typename LayerFunc, - typename ShapeFunc> void LayerManager::manageViews( + typename ShapeFunc> void LayerManager::manageViews( LayerFunc layerFunc, ShapeFunc shapeFunc ) { @@ -74,7 +74,7 @@ namespace slideshow pCurrLayer = pLayer; pCurrViewLayer = layerFunc(pCurrLayer); } - + if( pCurrViewLayer ) shapeFunc(aIter->first,pCurrViewLayer); @@ -172,7 +172,7 @@ namespace slideshow { iShape->second.reset(); } - + if( bMoreThanOneLayer ) maLayers.erase(maLayers.begin()+1, maLayers.end()); @@ -198,13 +198,13 @@ namespace slideshow rView->clearAll(); // add View to all registered shapes - manageViews( + manageViews( boost::bind(&Layer::addView, _1, - boost::cref(rView)), + boost::cref(rView)), // repaint on view add - boost::bind(&Shape::addViewLayer, - _1, + boost::bind(&Shape::addViewLayer, + _1, _2, true) ); @@ -225,7 +225,7 @@ namespace slideshow rView) == mrViews.end() ); // remove View from all registered shapes - manageViews( + manageViews( boost::bind(&Layer::removeView, _1, boost::cref(rView)), @@ -261,12 +261,12 @@ namespace slideshow return; // clear view area - ::std::for_each( mrViews.begin(), - mrViews.end(), + ::std::for_each( mrViews.begin(), + mrViews.end(), ::boost::mem_fn(&View::clearAll) ); // TODO(F3): resize and repaint all layers - + // render all shapes std::for_each( maAllShapes.begin(), maAllShapes.end(), @@ -280,12 +280,12 @@ namespace slideshow ENSURE_OR_THROW( rShape, "LayerManager::addShape(): invalid Shape" ); // add shape to XShape hash map - if( !maXShapeHash.insert( + if( !maXShapeHash.insert( XShapeHash::value_type( rShape->getXShape(), rShape) ).second ) { // entry already present, nothing to do - return; + return; } // add shape to appropriate layer @@ -298,7 +298,7 @@ namespace slideshow rBgLayer->setShapeViews(rShapeEntry.first); rShapeEntry.second = rBgLayer; } - + void LayerManager::implAddShape( const ShapeSharedPtr& rShape ) { OSL_ASSERT( !maLayers.empty() ); // always at least background layer @@ -332,7 +332,7 @@ namespace slideshow return true; } - + void LayerManager::implRemoveShape( const ShapeSharedPtr& rShape ) { OSL_ASSERT( !maLayers.empty() ); // always at least background layer @@ -351,14 +351,14 @@ namespace slideshow // Actually, also add it if it was listed in // maUpdateShapes (might have just gone invisible). if( bShapeUpdateNotified || - (rShape->isVisible() && + (rShape->isVisible() && !rShape->isBackgroundDetached()) ) { LayerSharedPtr pLayer = aShapeEntry->second.lock(); if( pLayer ) { - // store area early, once the shape is removed from - // the layers, it no longer has any view references + // store area early, once the shape is removed from + // the layers, it no longer has any view references pLayer->addUpdateRange( rShape->getUpdateArea() ); } } @@ -368,7 +368,7 @@ namespace slideshow mbLayerAssociationDirty = true; } - + ShapeSharedPtr LayerManager::lookupShape( const uno::Reference< drawing::XShape >& xShape ) const { ENSURE_OR_THROW( xShape.is(), "LayerManager::lookupShape(): invalid Shape" ); @@ -381,8 +381,8 @@ namespace slideshow return aIter->second; } - AttributableShapeSharedPtr LayerManager::getSubsetShape( const AttributableShapeSharedPtr& rOrigShape, - const DocTreeNode& rTreeNode ) + AttributableShapeSharedPtr LayerManager::getSubsetShape( const AttributableShapeSharedPtr& rOrigShape, + const DocTreeNode& rTreeNode ) { OSL_ASSERT( !maLayers.empty() ); // always at least background layer @@ -493,7 +493,7 @@ namespace slideshow { if( !mbActive || mrViews.empty() ) return; - + // hidden sprite-shape needs render() call still, to hide sprite if( rShape->isVisible() || rShape->isBackgroundDetached() ) maUpdateShapes.insert( rShape ); @@ -526,7 +526,7 @@ namespace slideshow // maUpdateShapes set, which is _animated_ (i.e. a // sprite). const ShapeUpdateSet::const_iterator aEnd=maUpdateShapes.end(); - ShapeUpdateSet::const_iterator aCurrShape=maUpdateShapes.begin(); + ShapeUpdateSet::const_iterator aCurrShape=maUpdateShapes.begin(); while( aCurrShape != aEnd ) { if( (*aCurrShape)->isBackgroundDetached() ) @@ -544,8 +544,8 @@ namespace slideshow // shape/layer association cache, or ptr back to // layer at the shape? - // cannot update shape directly, it's not - // animated and update() calls will prolly + // cannot update shape directly, it's not + // animated and update() calls will prolly // overwrite other page content. addUpdateArea( *aCurrShape ); } @@ -564,7 +564,7 @@ namespace slideshow if( !mbActive ) return bRet; - + // going to render - better flush any pending layer reorg // now updateShapeLayers(false); @@ -647,7 +647,7 @@ namespace slideshow virtual ::cppcanvas::CustomSpriteSharedPtr createSprite( const ::basegfx::B2DSize& /*rSpriteSizePixel*/, double /*nSpritePrio*/ ) const { - ENSURE_OR_THROW( false, + ENSURE_OR_THROW( false, "DummyLayer::createSprite(): This method is not supposed to be called!" ); return ::cppcanvas::CustomSpriteSharedPtr(); } @@ -665,7 +665,7 @@ namespace slideshow virtual ::basegfx::B2DHomMatrix getSpriteTransformation() const { - OSL_ENSURE( false, + OSL_ENSURE( false, "BitmapView::getSpriteTransformation(): This method is not supposed to be called!" ); return ::basegfx::B2DHomMatrix(); } @@ -704,10 +704,10 @@ namespace slideshow // ViewLayer. Since we add the shapes in the // maShapeSet order (which is also the render order), // this is equivalent to a subsequent render() call) - aIter->first->addViewLayer( pTmpLayer, + aIter->first->addViewLayer( pTmpLayer, true ); - // and remove again, this is only temporary + // and remove again, this is only temporary aIter->first->removeViewLayer( pTmpLayer ); } catch( uno::Exception& ) @@ -738,13 +738,13 @@ namespace slideshow if( aShapeEntry == maAllShapes.end() ) return; - + LayerSharedPtr pLayer = aShapeEntry->second.lock(); if( pLayer ) pLayer->addUpdateRange( rShape->getUpdateArea() ); } - void LayerManager::commitLayerChanges( std::size_t nCurrLayerIndex, + void LayerManager::commitLayerChanges( std::size_t nCurrLayerIndex, LayerShapeMap::const_iterator aFirstLayerShape, LayerShapeMap::const_iterator aEndLayerShapes ) { @@ -761,8 +761,8 @@ namespace slideshow // need to re-render whole layer - start from // clean state rLayer->clearContent(); - - // render and remove from update set + + // render and remove from update set while( aFirstLayerShape != aEndLayerShapes ) { maUpdateShapes.erase(aFirstLayerShape->first); @@ -779,7 +779,7 @@ namespace slideshow LayerSharedPtr pLayer( Layer::createLayer( maPageBounds )); - + // create ViewLayers for all registered views, and add to // newly created layer. ::std::for_each( mrViews.begin(), @@ -816,7 +816,7 @@ namespace slideshow // to avoid tons of temporaries, create weak_ptr to Layers // beforehand - std::vector< LayerWeakPtr > aWeakLayers(maLayers.size()); + std::vector< LayerWeakPtr > aWeakLayers(maLayers.size()); std::copy(maLayers.begin(),maLayers.end(),aWeakLayers.begin()); std::size_t nCurrLayerIndex(0); @@ -829,7 +829,7 @@ namespace slideshow while( aCurrShapeEntry != aEndShapeEntry ) { const ShapeSharedPtr pCurrShape( aCurrShapeEntry->first ); - const bool bThisIsBackgroundDetached( + const bool bThisIsBackgroundDetached( pCurrShape->isBackgroundDetached() ); if( bLastWasBackgroundDetached == true && @@ -838,9 +838,9 @@ namespace slideshow // discontinuity found - current shape needs to // get into a new layer // -------------------------------------------- - + // commit changes to previous layer - commitLayerChanges(nCurrLayerIndex, + commitLayerChanges(nCurrLayerIndex, aCurrLayerFirstShapeEntry, aCurrShapeEntry); aCurrLayerFirstShapeEntry=aCurrShapeEntry; @@ -869,7 +869,7 @@ namespace slideshow { // mismatch: shape is not contained in current // layer - move shape to that layer, then. - maLayers.at(nCurrLayerIndex)->setShapeViews( + maLayers.at(nCurrLayerIndex)->setShapeViews( pCurrShape ); // layer got new shape(s), need full repaint, if @@ -881,7 +881,7 @@ namespace slideshow { // old layer still valid? then we need to // repaint former shape area - pOldLayer->addUpdateRange( + pOldLayer->addUpdateRange( pCurrShape->getUpdateArea() ); } @@ -893,7 +893,7 @@ namespace slideshow aCurrShapeEntry->second = rCurrWeakLayer; } - + // update layerbounds regardless of the fact that the // shape might be contained in said layer // already. updateBounds() is dumb and needs to @@ -908,7 +908,7 @@ namespace slideshow } // commit very last layer data - commitLayerChanges(nCurrLayerIndex, + commitLayerChanges(nCurrLayerIndex, aCurrLayerFirstShapeEntry, aCurrShapeEntry); diff --git a/slideshow/source/engine/slide/layermanager.hxx b/slideshow/source/engine/slide/layermanager.hxx index fecf0c30587f..90c54131d761 100644 --- a/slideshow/source/engine/slide/layermanager.hxx +++ b/slideshow/source/engine/slide/layermanager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -131,7 +131,7 @@ namespace slideshow This method removes a shape from the shape. */ bool removeShape( const ShapeSharedPtr& rShape ); - + /** Lookup a Shape from an XShape model object This method looks up the internal shape map for one @@ -141,7 +141,7 @@ namespace slideshow The XShape object, for which the representing Shape should be looked up. */ - ShapeSharedPtr lookupShape( const ::com::sun::star::uno::Reference< + ShapeSharedPtr lookupShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) const; /** Query a subset of the given original shape @@ -150,8 +150,8 @@ namespace slideshow shape, which displays only the given subset of the original one. */ - AttributableShapeSharedPtr getSubsetShape( const AttributableShapeSharedPtr& rOrigShape, - const DocTreeNode& rTreeNode ); + AttributableShapeSharedPtr getSubsetShape( const AttributableShapeSharedPtr& rOrigShape, + const DocTreeNode& rTreeNode ); /** Revoke a previously queried subset shape. @@ -207,7 +207,7 @@ namespace slideshow frame. */ bool isUpdatePending() const; - + /** Update the content This method updates the content on all layers on all @@ -239,7 +239,7 @@ namespace slideshow */ bool renderTo( const ::cppcanvas::CanvasSharedPtr& rTargetCanvas ) const; - private: + private: /** A hash map which maps the XShape to the corresponding Shape object. Provides quicker lookup than ShapeSet for simple mappings @@ -285,15 +285,15 @@ namespace slideshow @param aFirstLayerShape Valid iterator out of maAllShapes, denoting the first shape from nCurrLayerIndex - + @param aEndLayerShapes Valid iterator or end iterator out of maAllShapes, denoting one-behind-the-last shape of nCurrLayerIndex */ - void commitLayerChanges( std::size_t nCurrLayerIndex, + void commitLayerChanges( std::size_t nCurrLayerIndex, LayerShapeMap::const_iterator aFirstLayerShape, LayerShapeMap::const_iterator aEndLayerShapes ); - + /** Init Shape layers with background layer. */ void putShape2BackgroundLayer( LayerShapeMap::value_type& rShapeEntry ); @@ -313,9 +313,9 @@ namespace slideshow void implAddShape( const ShapeSharedPtr& rShape ); /** Common stuff when removing a shape - */ + */ void implRemoveShape( const ShapeSharedPtr& rShape ); - + /** Add or remove views Sharing duplicate code from viewAdded and viewRemoved @@ -325,7 +325,7 @@ namespace slideshow template<typename LayerFunc, typename ShapeFunc> void manageViews( LayerFunc layerFunc, ShapeFunc shapeFunc ); - + bool updateSprites(); /// Registered views @@ -336,7 +336,7 @@ namespace slideshow /** Contains all shapes with their XShape reference as the key */ - XShapeHash maXShapeHash; + XShapeHash maXShapeHash; /** Set of shapes this LayerManager own @@ -349,7 +349,7 @@ namespace slideshow LayerShapeMap maAllShapes; /** Set of shapes that have requested an update - + When a shape is member of this set, its maShapes entry has bNeedsUpdate set to true. We maintain this redundant information for faster update processing. diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx index 5144e88fbd60..05e67c5a5575 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.cxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ void ShapeManagerImpl::activate( bool bSlideBackgoundPainted ) boost::bind( &ShapeManagerImpl::listenerAdded, this, boost::cref(xDummyListener), - boost::bind( + boost::bind( std::select1st<ShapeEventListenerMap::value_type>(), _1 ))); @@ -90,10 +90,10 @@ void ShapeManagerImpl::activate( bool bSlideBackgoundPainted ) mrGlobalCursorMap.end(), boost::bind( &ShapeManagerImpl::cursorChanged, this, - boost::bind( + boost::bind( std::select1st<ShapeCursorMap::value_type>(), _1 ), - boost::bind( + boost::bind( std::select2nd<ShapeCursorMap::value_type>(), _1 ))); @@ -123,7 +123,7 @@ void ShapeManagerImpl::deactivate() void ShapeManagerImpl::dispose() { // remove listeners (EventMultiplexer holds shared_ptr on us) - deactivate(); + deactivate(); maHyperlinkShapes.clear(); maShapeCursorMap.clear(); @@ -141,7 +141,7 @@ bool ShapeManagerImpl::handleMouseReleased( awt::MouseEvent const& e ) { if( !mbEnabled || e.Buttons != awt::MouseButton::LEFT) return false; - + basegfx::B2DPoint const aPosition( e.X, e.Y ); // first check for hyperlinks, because these have @@ -152,7 +152,7 @@ bool ShapeManagerImpl::handleMouseReleased( awt::MouseEvent const& e ) mrMultiplexer.notifyHyperlinkClicked(hyperlink); return true; // event consumed } - + // find matching shape (scan reversely, to coarsely match // paint order) ShapeToListenersMap::reverse_iterator aCurrBroadcaster( @@ -169,25 +169,25 @@ bool ShapeManagerImpl::handleMouseReleased( awt::MouseEvent const& e ) { // shape hit, and shape is visible. Raise // event. - + boost::shared_ptr<cppu::OInterfaceContainerHelper> const pCont( aCurrBroadcaster->second ); uno::Reference<drawing::XShape> const xShape( aCurrBroadcaster->first->getXShape() ); - + // DON'T do anything with /this/ after this point! pCont->forEach<presentation::XShapeEventListener>( boost::bind( &presentation::XShapeEventListener::click, - _1, - boost::cref(xShape), + _1, + boost::cref(xShape), boost::cref(e) )); - + return true; // handled this event } - + ++aCurrBroadcaster; } - + return false; // did not handle this event } @@ -217,7 +217,7 @@ bool ShapeManagerImpl::handleMouseMoved( const awt::MouseEvent& e ) // find hit shape in map const ::basegfx::B2DPoint aPosition( e.X, e.Y ); sal_Int16 nNewCursor(-1); - + if( checkForHyperlink(aPosition).getLength() > 0 ) { nNewCursor = awt::SystemPointer::REFHAND; @@ -243,11 +243,11 @@ bool ShapeManagerImpl::handleMouseMoved( const awt::MouseEvent& e ) nNewCursor = aCurrCursor->second; break; } - + ++aCurrCursor; } } - + if( nNewCursor == -1 ) mrCursorManager.resetCursor(); else @@ -316,7 +316,7 @@ void ShapeManagerImpl::removeHyperlinkArea( const HyperlinkAreaSharedPtr& rArea } AttributableShapeSharedPtr ShapeManagerImpl::getSubsetShape( const AttributableShapeSharedPtr& rOrigShape, - const DocTreeNode& rTreeNode ) + const DocTreeNode& rTreeNode ) { if( mpLayerManager ) return mpLayerManager->getSubsetShape(rOrigShape,rTreeNode); @@ -331,7 +331,7 @@ void ShapeManagerImpl::revokeSubset( const AttributableShapeSharedPtr& rOrigShap mpLayerManager->revokeSubset(rOrigShape,rSubsetShape); } -bool ShapeManagerImpl::listenerAdded( +bool ShapeManagerImpl::listenerAdded( const uno::Reference<presentation::XShapeEventListener>& /*xListener*/, const uno::Reference<drawing::XShape>& xShape ) { @@ -339,7 +339,7 @@ bool ShapeManagerImpl::listenerAdded( if( (aIter = mrGlobalListenersMap.find( xShape )) == mrGlobalListenersMap.end() ) { - ENSURE_OR_RETURN_FALSE(false, + ENSURE_OR_RETURN_FALSE(false, "ShapeManagerImpl::listenerAdded(): global " "shape listener map inconsistency!"); } @@ -348,16 +348,16 @@ bool ShapeManagerImpl::listenerAdded( ShapeSharedPtr pShape( lookupShape(xShape) ); if( pShape ) { - maShapeListenerMap.insert( + maShapeListenerMap.insert( ShapeToListenersMap::value_type( - pShape, + pShape, aIter->second)); } return true; } -bool ShapeManagerImpl::listenerRemoved( +bool ShapeManagerImpl::listenerRemoved( const uno::Reference<presentation::XShapeEventListener>& /*xListener*/, const uno::Reference<drawing::XShape>& xShape ) { @@ -365,7 +365,7 @@ bool ShapeManagerImpl::listenerRemoved( // for the same shape pending... if( mrGlobalListenersMap.find(xShape) == mrGlobalListenersMap.end() ) { - // is this one of our shapes? other shapes are ignored. + // is this one of our shapes? other shapes are ignored. ShapeSharedPtr pShape( lookupShape(xShape) ); if( pShape ) maShapeListenerMap.erase(pShape); @@ -379,7 +379,7 @@ bool ShapeManagerImpl::cursorChanged( const uno::Reference<drawing::XShape>& x { ShapeSharedPtr pShape( lookupShape(xShape) ); - // is this one of our shapes? other shapes are ignored. + // is this one of our shapes? other shapes are ignored. if( !pShape ) return false; @@ -392,12 +392,12 @@ bool ShapeManagerImpl::cursorChanged( const uno::Reference<drawing::XShape>& x { // included in global map - update local one ShapeToCursorMap::iterator aIter; - if( (aIter = maShapeCursorMap.find(pShape)) + if( (aIter = maShapeCursorMap.find(pShape)) == maShapeCursorMap.end() ) { maShapeCursorMap.insert( - ShapeToCursorMap::value_type( - pShape, + ShapeToCursorMap::value_type( + pShape, nCursor )); } else @@ -415,14 +415,14 @@ rtl::OUString ShapeManagerImpl::checkForHyperlink( basegfx::B2DPoint const& hitP // paint order): set is ordered by priority AreaSet::const_reverse_iterator iPos( maHyperlinkShapes.rbegin() ); AreaSet::const_reverse_iterator const iEnd( maHyperlinkShapes.rend() ); - for( ; iPos != iEnd; ++iPos ) + for( ; iPos != iEnd; ++iPos ) { HyperlinkAreaSharedPtr const& pArea = *iPos; HyperlinkArea::HyperlinkRegions const linkRegions( pArea->getHyperlinkRegions() ); - for( std::size_t i = linkRegions.size(); i--; ) + for( std::size_t i = linkRegions.size(); i--; ) { basegfx::B2DRange const& region = linkRegions[i].first; if( region.isInside(hitPos) ) diff --git a/slideshow/source/engine/slide/shapemanagerimpl.hxx b/slideshow/source/engine/slide/shapemanagerimpl.hxx index 32082273e6d0..961dd718fdb9 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.hxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,8 +53,8 @@ namespace slideshow { namespace internal { /** Listener class for shape events - - This helper class registers itself on each view, and + + This helper class registers itself on each view, and broadcasts the XShapeEventListener events. The mouse motion events are needed for setting the shape cursor. */ @@ -67,7 +67,7 @@ class ShapeManagerImpl : public SubsettableShapeManager, { public: /** Create a shape event broadcaster - + @param rEventMultiplexer The slideshow-global event source, where this class registeres its event handlers. @@ -87,16 +87,16 @@ public: slide. */ void activate( bool bSlideBackgoundPainted ); - + /** Disables event listening. */ void deactivate(); - + // Disposable interface // --------------------------------------------------------------- virtual void dispose(); - + private: // MouseEventHandler interface @@ -131,7 +131,7 @@ private: virtual void leaveAnimationMode( const AnimatableShapeSharedPtr& rShape ); virtual void notifyShapeUpdate( const ShapeSharedPtr& rShape ); virtual ShapeSharedPtr lookupShape( - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > const & xShape ) const; virtual void addHyperlinkArea( const boost::shared_ptr<HyperlinkArea>& rArea ); virtual void removeHyperlinkArea( const boost::shared_ptr<HyperlinkArea>& rArea ); @@ -140,16 +140,16 @@ private: // SubsettableShapeManager interface // --------------------------------------------------- - virtual boost::shared_ptr<AttributableShape> getSubsetShape( + virtual boost::shared_ptr<AttributableShape> getSubsetShape( const boost::shared_ptr<AttributableShape>& rOrigShape, const DocTreeNode& rTreeNode ); - virtual void revokeSubset( + virtual void revokeSubset( const boost::shared_ptr<AttributableShape>& rOrigShape, const boost::shared_ptr<AttributableShape>& rSubsetShape ); - virtual void addIntrinsicAnimationHandler( + virtual void addIntrinsicAnimationHandler( const IntrinsicAnimationEventHandlerSharedPtr& rHandler ); - virtual void removeIntrinsicAnimationHandler( + virtual void removeIntrinsicAnimationHandler( const IntrinsicAnimationEventHandlerSharedPtr& rHandler ); virtual bool notifyIntrinsicAnimationsEnabled(); virtual bool notifyIntrinsicAnimationsDisabled(); @@ -177,8 +177,8 @@ private: ::rtl::OUString checkForHyperlink( ::basegfx::B2DPoint const& hitPos )const; - - + + typedef std::map<ShapeSharedPtr, boost::shared_ptr< ::cppu::OInterfaceContainerHelper >, Shape::lessThanShape> ShapeToListenersMap; diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx index 9b951d5af55a..75c7ae14ad5c 100644 --- a/slideshow/source/engine/slide/slideanimations.cxx +++ b/slideshow/source/engine/slide/slideanimations.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ namespace slideshow { mpRootNode->dispose(); } - catch (uno::Exception &) + catch (uno::Exception &) { OSL_ENSURE( false, rtl::OUStringToOString( comphelper::anyToString( @@ -74,10 +74,10 @@ namespace slideshow } } } - + bool SlideAnimations::importAnimations( const uno::Reference< animations::XAnimationNode >& xRootAnimationNode ) { - mpRootNode = AnimationNodeFactory::createAnimationNode( + mpRootNode = AnimationNodeFactory::createAnimationNode( xRootAnimationNode, maSlideSize, maContext ); diff --git a/slideshow/source/engine/slide/slideanimations.hxx b/slideshow/source/engine/slide/slideanimations.hxx index a3c2f92c6af2..ca5fbea93149 100644 --- a/slideshow/source/engine/slide/slideanimations.hxx +++ b/slideshow/source/engine/slide/slideanimations.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ namespace slideshow Slide show context, passing on common parameters */ SlideAnimations( const SlideShowContext& rContext, - const ::basegfx::B2DVector& rSlideSize ); + const ::basegfx::B2DVector& rSlideSize ); ~SlideAnimations(); /** Import animations from a SMIL root animation node. @@ -79,8 +79,8 @@ namespace slideshow XDrawPage's XAnimationNodeSupplier. */ - bool importAnimations( const ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode >& xRootAnimationNode ); + bool importAnimations( const ::com::sun::star::uno::Reference< + ::com::sun::star::animations::XAnimationNode >& xRootAnimationNode ); /** Check, whether imported animations actually contain any effects. @@ -115,7 +115,7 @@ namespace slideshow void dispose(); private: - SlideShowContext maContext; + SlideShowContext maContext; const basegfx::B2DVector maSlideSize; AnimationNodeSharedPtr mpRootNode; }; diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 55831ba1609f..eb8ce0cef13b 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,14 +97,14 @@ class SlideImpl : public Slide, protected ::osl::DebugBase<SlideImpl> { public: - SlideImpl( const uno::Reference<drawing::XDrawPage>& xDrawPage, - const uno::Reference<drawing::XDrawPagesSupplier>& xDrawPages, + SlideImpl( const uno::Reference<drawing::XDrawPage>& xDrawPage, + const uno::Reference<drawing::XDrawPagesSupplier>& xDrawPages, const uno::Reference<animations::XAnimationNode>& xRootNode, - EventQueue& rEventQueue, - EventMultiplexer& rEventMultiplexer, + EventQueue& rEventQueue, + EventMultiplexer& rEventMultiplexer, ScreenUpdater& rScreenUpdater, - ActivitiesQueue& rActivitiesQueue, - UserEventQueue& rUserEventQueue, + ActivitiesQueue& rActivitiesQueue, + UserEventQueue& rUserEventQueue, CursorManager& rCursorManager, const UnoViewContainer& rViewContainer, const uno::Reference<uno::XComponentContext>& xContext, @@ -133,13 +133,13 @@ public: virtual bool show( bool ); virtual void hide(); - virtual basegfx::B2ISize getSlideSize() const; + virtual basegfx::B2ISize getSlideSize() const; virtual uno::Reference<drawing::XDrawPage > getXDrawPage() const; virtual uno::Reference<animations::XAnimationNode> getXAnimationNode() const; virtual PolyPolygonVector getPolygons(); virtual void drawPolygons() const; virtual bool isPaintOverlayActive() const; - + // TODO(F2): Rework SlideBitmap to no longer be based on XBitmap, // but on canvas-independent basegfx bitmaps virtual SlideBitmapSharedPtr getCurrentSlideBitmap( const UnoViewSharedPtr& rView ) const; @@ -178,14 +178,14 @@ private: void disablePaintOverlay(); /// Set all Shapes to their initial attributes for slideshow - bool applyInitialShapeAttributes( const ::com::sun::star::uno::Reference< + bool applyInitialShapeAttributes( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xRootAnimationNode ); /// Renders current slide content to bitmap SlideBitmapSharedPtr createCurrentSlideBitmap( const UnoViewSharedPtr& rView, ::basegfx::B2ISize const & rSlideSize ) const; - + /// Prefetch all shapes (not the animations) bool loadShapes(); @@ -206,7 +206,7 @@ private: /// Add Polygons to the member maPolygons void addPolygons(PolyPolygonVector aPolygons); - + // Types // ===== @@ -235,54 +235,54 @@ private: /// The page model object uno::Reference< drawing::XDrawPage > mxDrawPage; - uno::Reference< drawing::XDrawPagesSupplier > mxDrawPagesSupplier; + uno::Reference< drawing::XDrawPagesSupplier > mxDrawPagesSupplier; uno::Reference< animations::XAnimationNode > mxRootNode; - + LayerManagerSharedPtr mpLayerManager; boost::shared_ptr<ShapeManagerImpl> mpShapeManager; boost::shared_ptr<SubsettableShapeManager> mpSubsettableShapeManager; /// Contains common objects needed throughout the slideshow - SlideShowContext maContext; + SlideShowContext maContext; /// parent cursor manager CursorManager& mrCursorManager; /// Handles the animation and event generation for us - SlideAnimations maAnimations; + SlideAnimations maAnimations; PolyPolygonVector maPolygons; - + RGBColor maUserPaintColor; double mdUserPaintStrokeWidth; - UserPaintOverlaySharedPtr mpPaintOverlay; - + UserPaintOverlaySharedPtr mpPaintOverlay; + /// Bitmaps with slide content at various states mutable VectorOfVectorOfSlideBitmaps maSlideBitmaps; - SlideAnimationState meAnimationState; + SlideAnimationState meAnimationState; const basegfx::B2ISize maSlideSize; sal_Int16 mnCurrentCursor; /// True, when intrinsic shape animations are allowed - bool mbIntrinsicAnimationsAllowed; + bool mbIntrinsicAnimationsAllowed; /// True, when user paint overlay is enabled bool mbUserPaintOverlayEnabled; /// True, if initial load of all page shapes succeeded - bool mbShapesLoaded; + bool mbShapesLoaded; /// True, if initial load of all animation info succeeded - bool mbShowLoaded; + bool mbShowLoaded; /** True, if this slide is not static. If this slide has animated content, this variable will be true, and false otherwise. */ - bool mbHaveAnimations; + bool mbHaveAnimations; /** True, if this slide has a main animation sequence. @@ -291,11 +291,11 @@ private: before EventMultiplexer::notifySlideAnimationsEnd() is called), this member is true. */ - bool mbMainSequenceFound; + bool mbMainSequenceFound; /// When true, show() was called. Slide hidden oherwise. bool mbActive; - + ///When true, enablePaintOverlay was called and mbUserPaintOverlay = true bool mbPaintOverlayActive; }; @@ -317,11 +317,11 @@ public: // fully clear view content to background color rView->clearAll(); - SlideBitmapSharedPtr pBitmap( mrSlide.getCurrentSlideBitmap( rView ) ); + SlideBitmapSharedPtr pBitmap( mrSlide.getCurrentSlideBitmap( rView ) ); ::cppcanvas::CanvasSharedPtr pCanvas( rView->getCanvas() ); - const ::basegfx::B2DHomMatrix aViewTransform( rView->getTransformation() ); - const ::basegfx::B2DPoint aOutPosPixel( aViewTransform * ::basegfx::B2DPoint() ); + const ::basegfx::B2DHomMatrix aViewTransform( rView->getTransformation() ); + const ::basegfx::B2DPoint aOutPosPixel( aViewTransform * ::basegfx::B2DPoint() ); // setup a canvas with device coordinate space, the slide // bitmap already has the correct dimension. @@ -333,7 +333,7 @@ public: // clear clip (might have been changed, e.g. from comb // transition) - pBitmap->clip( ::basegfx::B2DPolyPolygon() ); + pBitmap->clip( ::basegfx::B2DPolyPolygon() ); pBitmap->draw( pDevicePixelCanvas ); } @@ -345,17 +345,17 @@ private: ////////////////////////////////////////////////////////////////////////////////// -SlideImpl::SlideImpl( const uno::Reference< drawing::XDrawPage >& xDrawPage, +SlideImpl::SlideImpl( const uno::Reference< drawing::XDrawPage >& xDrawPage, const uno::Reference<drawing::XDrawPagesSupplier>& xDrawPages, - const uno::Reference< animations::XAnimationNode >& xRootNode, - EventQueue& rEventQueue, - EventMultiplexer& rEventMultiplexer, + const uno::Reference< animations::XAnimationNode >& xRootNode, + EventQueue& rEventQueue, + EventMultiplexer& rEventMultiplexer, ScreenUpdater& rScreenUpdater, - ActivitiesQueue& rActivitiesQueue, - UserEventQueue& rUserEventQueue, + ActivitiesQueue& rActivitiesQueue, + UserEventQueue& rUserEventQueue, CursorManager& rCursorManager, const UnoViewContainer& rViewContainer, - const uno::Reference< uno::XComponentContext >& xComponentContext, + const uno::Reference< uno::XComponentContext >& xComponentContext, const ShapeEventListenerMap& rShapeListenerMap, const ShapeCursorMap& rShapeCursorMap, const PolyPolygonVector& rPolyPolygonVector, @@ -367,7 +367,7 @@ SlideImpl::SlideImpl( const uno::Reference< drawing::XDrawPage >& xDra mxDrawPage( xDrawPage ), mxDrawPagesSupplier( xDrawPages ), mxRootNode( xRootNode ), - mpLayerManager( new LayerManager( + mpLayerManager( new LayerManager( rViewContainer, getSlideRect(), bDisableAnimationZOrder) ), @@ -379,10 +379,10 @@ SlideImpl::SlideImpl( const uno::Reference< drawing::XDrawPage >& xDra rShapeCursorMap)), mpSubsettableShapeManager( mpShapeManager ), maContext( mpSubsettableShapeManager, - rEventQueue, + rEventQueue, rEventMultiplexer, rScreenUpdater, - rActivitiesQueue, + rActivitiesQueue, rUserEventQueue, *this, rViewContainer, @@ -428,7 +428,7 @@ SlideImpl::~SlideImpl() // TODO(Q3): Make sure LayerManager (and thus Shapes) dies // first, because SlideShowContext has SubsettableShapeManager - // as reference member. + // as reference member. mpLayerManager.reset(); } } @@ -504,13 +504,13 @@ bool SlideImpl::show( bool bSlideBackgoundPainted ) std::for_each(maContext.mrViewContainer.begin(), maContext.mrViewContainer.end(), boost::mem_fn(&View::clearAll)); - + std::for_each( maContext.mrViewContainer.begin(), maContext.mrViewContainer.end(), SlideRenderer(*this) ); maContext.mrScreenUpdater.notifyUpdate(); } - + // --------------------------------------------------------------- // fire up animations @@ -580,7 +580,7 @@ void SlideImpl::hide() // disable shape management & event broadcasting for shapes of this // slide. Also disables LayerManager. - mpShapeManager->deactivate(); + mpShapeManager->deactivate(); // vanish from view resetCursor(); @@ -590,7 +590,7 @@ void SlideImpl::hide() } basegfx::B2ISize SlideImpl::getSlideSize() const -{ +{ return maSlideSize; } @@ -622,8 +622,8 @@ SlideBitmapSharedPtr SlideImpl::getCurrentSlideBitmap( const UnoViewSharedPtr& r boost::bind( std::equal_to<UnoViewSharedPtr>(), rView, - // select view: - boost::bind( + // select view: + boost::bind( std::select1st<VectorOfVectorOfSlideBitmaps::value_type>(), _1 )))) == aEnd ) { @@ -654,7 +654,7 @@ SlideBitmapSharedPtr SlideImpl::getCurrentSlideBitmap( const UnoViewSharedPtr& r } SlideBitmapSharedPtr& rBitmap( aIter->second.at( meAnimationState )); - const ::basegfx::B2ISize& rSlideSize( + const ::basegfx::B2ISize& rSlideSize( getSlideSizePixel( getSlideSize(), rView )); @@ -676,8 +676,8 @@ SlideBitmapSharedPtr SlideImpl::getCurrentSlideBitmap( const UnoViewSharedPtr& r void SlideImpl::viewAdded( const UnoViewSharedPtr& rView ) { - maSlideBitmaps.push_back( - std::make_pair( rView, + maSlideBitmaps.push_back( + std::make_pair( rView, VectorOfSlideBitmaps(SlideAnimationState_NUM_ENTRIES) )); if( mpLayerManager ) @@ -696,10 +696,10 @@ void SlideImpl::viewRemoved( const UnoViewSharedPtr& rView ) boost::bind( std::equal_to<UnoViewSharedPtr>(), rView, - // select view: - boost::bind( + // select view: + boost::bind( std::select1st<VectorOfVectorOfSlideBitmaps::value_type>(), - _1 ))), + _1 ))), aEnd ); } @@ -745,22 +745,22 @@ bool SlideImpl::isAnimated() return mbHaveAnimations && maAnimations.isAnimated(); } -SlideBitmapSharedPtr SlideImpl::createCurrentSlideBitmap( const UnoViewSharedPtr& rView, +SlideBitmapSharedPtr SlideImpl::createCurrentSlideBitmap( const UnoViewSharedPtr& rView, const ::basegfx::B2ISize& rBmpSize ) const { - ENSURE_OR_THROW( rView && rView->getCanvas(), + ENSURE_OR_THROW( rView && rView->getCanvas(), "SlideImpl::createCurrentSlideBitmap(): Invalid view" ); - ENSURE_OR_THROW( mpLayerManager, + ENSURE_OR_THROW( mpLayerManager, "SlideImpl::createCurrentSlideBitmap(): Invalid layer manager" ); - ENSURE_OR_THROW( mbShowLoaded, + ENSURE_OR_THROW( mbShowLoaded, "SlideImpl::createCurrentSlideBitmap(): No show loaded" ); ::cppcanvas::CanvasSharedPtr pCanvas( rView->getCanvas() ); // create a bitmap of appropriate size - ::cppcanvas::BitmapSharedPtr pBitmap( - ::cppcanvas::BaseGfxFactory::getInstance().createBitmap( - pCanvas, + ::cppcanvas::BitmapSharedPtr pBitmap( + ::cppcanvas::BaseGfxFactory::getInstance().createBitmap( + pCanvas, rBmpSize ) ); ENSURE_OR_THROW( pBitmap, @@ -771,7 +771,7 @@ SlideBitmapSharedPtr SlideImpl::createCurrentSlideBitmap( const UnoViewSharedPtr ENSURE_OR_THROW( pBitmapCanvas, "SlideImpl::createCurrentSlideBitmap(): Cannot create page bitmap canvas" ); - // apply linear part of destination canvas transformation (linear means in this context: + // apply linear part of destination canvas transformation (linear means in this context: // transformation without any translational components) ::basegfx::B2DHomMatrix aLinearTransform( rView->getTransformation() ); aLinearTransform.set( 0, 2, 0.0 ); @@ -799,7 +799,7 @@ namespace void operator()( const uno::Reference< animations::XAnimationNode >& xChildNode ) { uno::Sequence< beans::NamedValue > aUserData( xChildNode->getUserData() ); - + if( findNamedValue( aUserData, maSearchKey ) ) { maMainSequence = xChildNode; @@ -812,8 +812,8 @@ namespace } private: - beans::NamedValue maSearchKey; - uno::Reference< animations::XAnimationNode > maMainSequence; + beans::NamedValue maSearchKey; + uno::Reference< animations::XAnimationNode > maMainSequence; }; } @@ -822,9 +822,9 @@ bool SlideImpl::implPrefetchShow() if( mbShowLoaded ) return true; - ENSURE_OR_RETURN_FALSE( mxDrawPage.is(), + ENSURE_OR_RETURN_FALSE( mxDrawPage.is(), "SlideImpl::implPrefetchShow(): Invalid draw page" ); - ENSURE_OR_RETURN_FALSE( mpLayerManager, + ENSURE_OR_RETURN_FALSE( mpLayerManager, "SlideImpl::implPrefetchShow(): Invalid layer manager" ); // fetch desired page content @@ -850,7 +850,7 @@ bool SlideImpl::implPrefetchShow() // _although_ some animation nodes are there - // this is an error (not finding animations at // all is okay - might be a static slide) - return false; + return false; } // now check whether we've got a main sequence (if @@ -903,12 +903,12 @@ void SlideImpl::drawPolygons() const if( mbUserPaintOverlayEnabled ) mpPaintOverlay->drawPolygons(); } - + void SlideImpl::addPolygons(PolyPolygonVector aPolygons) { if(!aPolygons.empty()) { - for( PolyPolygonVector::iterator aIter=aPolygons.begin(), + for( PolyPolygonVector::iterator aIter=aPolygons.begin(), aEnd=aPolygons.end(); aIter!=aEnd; ++aIter ) @@ -922,7 +922,7 @@ bool SlideImpl::isPaintOverlayActive() const { return mbPaintOverlayActive; } - + void SlideImpl::disablePaintOverlay() { if(mbPaintOverlayActive) @@ -950,12 +950,12 @@ void SlideImpl::startIntrinsicAnimations() mpSubsettableShapeManager->notifyIntrinsicAnimationsEnabled(); } -bool SlideImpl::applyInitialShapeAttributes( +bool SlideImpl::applyInitialShapeAttributes( const uno::Reference< animations::XAnimationNode >& xRootAnimationNode ) { if( !implPrefetchShow() ) return false; - + if( !xRootAnimationNode.is() ) { meAnimationState = INITIAL_STATE; @@ -971,28 +971,28 @@ bool SlideImpl::applyInitialShapeAttributes( ENSURE_OR_RETURN_FALSE( maContext.mxComponentContext.is(), "SlideImpl::applyInitialShapeAttributes(): Invalid component context" ); - uno::Reference<lang::XMultiComponentFactory> xFac( + uno::Reference<lang::XMultiComponentFactory> xFac( maContext.mxComponentContext->getServiceManager() ); xPropsCreator.set( xFac->createInstanceWithContext( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.animations.TargetPropertiesCreator") ), - maContext.mxComponentContext ), + maContext.mxComponentContext ), uno::UNO_QUERY_THROW ); } catch( uno::RuntimeException& ) { throw; } - catch( uno::Exception& ) + catch( uno::Exception& ) { OSL_ENSURE( false, rtl::OUStringToOString( comphelper::anyToString(cppu::getCaughtException()), RTL_TEXTENCODING_UTF8 ) ); - + // could not determine initial shape attributes - this // is an error, as some effects might then be plainly // invisible @@ -1008,15 +1008,15 @@ bool SlideImpl::applyInitialShapeAttributes( const ::std::size_t nSize( aProps.getLength() ); for( ::std::size_t i=0; i<nSize; ++i ) { - sal_Int16 nParaIndex( -1 ); + sal_Int16 nParaIndex( -1 ); uno::Reference< drawing::XShape > xShape( aProps[i].Target, uno::UNO_QUERY ); - if( !xShape.is() ) + if( !xShape.is() ) { // not a shape target. Maybe a ParagraphTarget? presentation::ParagraphTarget aParaTarget; - + if( (aProps[i].Target >>= aParaTarget) ) { // yep, ParagraphTarget found - extract shape @@ -1037,7 +1037,7 @@ bool SlideImpl::applyInitialShapeAttributes( continue; } - AttributableShapeSharedPtr pAttrShape( + AttributableShapeSharedPtr pAttrShape( ::boost::dynamic_pointer_cast< AttributableShape >( pShape ) ); if( !pAttrShape ) @@ -1054,7 +1054,7 @@ bool SlideImpl::applyInitialShapeAttributes( // this up first. const DocTreeNodeSupplier& rNodeSupplier( pAttrShape->getTreeNodeSupplier() ); - pAttrShape = pAttrShape->getSubset( + pAttrShape = pAttrShape->getSubset( rNodeSupplier.getTreeNode( nParaIndex, DocTreeNode::NODETYPE_LOGICAL_PARAGRAPH ) ); @@ -1101,9 +1101,9 @@ bool SlideImpl::loadShapes() if( mbShapesLoaded ) return true; - ENSURE_OR_RETURN_FALSE( mxDrawPage.is(), + ENSURE_OR_RETURN_FALSE( mxDrawPage.is(), "SlideImpl::loadShapes(): Invalid draw page" ); - ENSURE_OR_RETURN_FALSE( mpLayerManager, + ENSURE_OR_RETURN_FALSE( mpLayerManager, "SlideImpl::loadShapes(): Invalid layer manager" ); // fetch desired page content @@ -1114,12 +1114,12 @@ bool SlideImpl::loadShapes() uno::Reference< drawing::XShapes > xMasterPageShapes; sal_Int32 nCurrCount(0); - uno::Reference< drawing::XMasterPageTarget > xMasterPageTarget( mxDrawPage, + uno::Reference< drawing::XMasterPageTarget > xMasterPageTarget( mxDrawPage, uno::UNO_QUERY ); if( xMasterPageTarget.is() ) { xMasterPage = xMasterPageTarget->getMasterPage(); - xMasterPageShapes.set( xMasterPage, + xMasterPageShapes.set( xMasterPage, uno::UNO_QUERY ); if( xMasterPage.is() && xMasterPageShapes.is() ) @@ -1131,25 +1131,25 @@ bool SlideImpl::loadShapes() { // load the masterpage shapes // ------------------------------------------------------------------------- - ShapeImporter aMPShapesFunctor( xMasterPage, + ShapeImporter aMPShapesFunctor( xMasterPage, mxDrawPage, mxDrawPagesSupplier, maContext, 0, /* shape num starts at 0 */ true ); - mpLayerManager->addShape( + mpLayerManager->addShape( aMPShapesFunctor.importBackgroundShape() ); while( !aMPShapesFunctor.isImportDone() ) { - ShapeSharedPtr const& rShape( + ShapeSharedPtr const& rShape( aMPShapesFunctor.importShape() ); if( rShape ) mpLayerManager->addShape( rShape ); } addPolygons(aMPShapesFunctor.getPolygons()); - + nCurrCount = xMasterPageShapes->getCount() + 1; } catch( uno::RuntimeException& ) @@ -1169,7 +1169,7 @@ bool SlideImpl::loadShapes() OSL_ENSURE( false, rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); + RTL_TEXTENCODING_UTF8 ).getStr() ); return false; } @@ -1181,16 +1181,16 @@ bool SlideImpl::loadShapes() // load the normal page shapes // ------------------------------------------------------------------------- - ShapeImporter aShapesFunctor( mxDrawPage, + ShapeImporter aShapesFunctor( mxDrawPage, mxDrawPage, mxDrawPagesSupplier, maContext, - nCurrCount, + nCurrCount, false ); while( !aShapesFunctor.isImportDone() ) { - ShapeSharedPtr const& rShape( + ShapeSharedPtr const& rShape( aShapesFunctor.importShape() ); if( rShape ) mpLayerManager->addShape( rShape ); @@ -1224,10 +1224,10 @@ bool SlideImpl::loadShapes() } basegfx::B2ISize SlideImpl::getSlideSizeImpl() const -{ +{ uno::Reference< beans::XPropertySet > xPropSet( mxDrawPage, uno::UNO_QUERY_THROW ); - + sal_Int32 nDocWidth = 0; sal_Int32 nDocHeight = 0; xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Width") ) ) >>= nDocWidth; @@ -1239,17 +1239,17 @@ basegfx::B2ISize SlideImpl::getSlideSizeImpl() const } // namespace -SlideSharedPtr createSlide( const uno::Reference< drawing::XDrawPage >& xDrawPage, +SlideSharedPtr createSlide( const uno::Reference< drawing::XDrawPage >& xDrawPage, const uno::Reference<drawing::XDrawPagesSupplier>& xDrawPages, const uno::Reference< animations::XAnimationNode >& xRootNode, - EventQueue& rEventQueue, - EventMultiplexer& rEventMultiplexer, + EventQueue& rEventQueue, + EventMultiplexer& rEventMultiplexer, ScreenUpdater& rScreenUpdater, - ActivitiesQueue& rActivitiesQueue, - UserEventQueue& rUserEventQueue, + ActivitiesQueue& rActivitiesQueue, + UserEventQueue& rUserEventQueue, CursorManager& rCursorManager, const UnoViewContainer& rViewContainer, - const uno::Reference< uno::XComponentContext >& xComponentContext, + const uno::Reference< uno::XComponentContext >& xComponentContext, const ShapeEventListenerMap& rShapeListenerMap, const ShapeCursorMap& rShapeCursorMap, const PolyPolygonVector& rPolyPolygonVector, @@ -1266,7 +1266,7 @@ SlideSharedPtr createSlide( const uno::Reference< drawing::XDrawPage >& boost::shared_ptr<SlideImpl> pRet( new SlideImpl( xDrawPage, NULL, xRootNode, rEventQueue, #endif rEventMultiplexer, rScreenUpdater, - rActivitiesQueue, rUserEventQueue, + rActivitiesQueue, rUserEventQueue, rCursorManager, rViewContainer, xComponentContext, rShapeListenerMap, rShapeCursorMap, rPolyPolygonVector, rUserPaintColor, diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx index 8d9fad06a3e3..8928bf3892f1 100644 --- a/slideshow/source/engine/slide/userpaintoverlay.cxx +++ b/slideshow/source/engine/slide/userpaintoverlay.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ using namespace ::com::sun::star; namespace slideshow { namespace internal - { + { class PaintOverlayHandler : public MouseEventHandler, public ViewEventHandler, public UserPaintEventHandler @@ -70,7 +70,7 @@ namespace slideshow ActivitiesQueue& rActivitiesQueue, ScreenUpdater& rScreenUpdater, const UnoViewContainer& rViews, - Slide& rSlide, + Slide& rSlide, const PolyPolygonVector& rPolygons ) : mrActivitiesQueue( rActivitiesQueue ), mrScreenUpdater( rScreenUpdater ), @@ -120,31 +120,31 @@ namespace slideshow // TODO(F2): for persistent drawings, need to store // polygon and repaint here. } - + virtual void viewsChanged() { // TODO(F2): for persistent drawings, need to store // polygon and repaint here. } - + bool colorChanged( RGBColor const& rUserColor ) { this->maStrokeColor = rUserColor; this->mbIsEraseModeActivated = false; return true; } - + bool widthChanged( double nUserStrokeWidth ) { this->mnStrokeWidth = nUserStrokeWidth; mbIsEraseModeActivated = false; return true; } - + bool eraseAllInkChanged( bool const& rEraseAllInk ) { this->mbIsEraseAllModeActivated= rEraseAllInk; - // if the erase all mode is activated it will remove all ink from slide, + // if the erase all mode is activated it will remove all ink from slide, // therefor destroy all the polygons stored if(mbIsEraseAllModeActivated) { @@ -159,26 +159,26 @@ namespace slideshow (*aIter)->getCanvas()->clear(); //get via SlideImpl instance the bitmap of the slide unmodified to redraw it - SlideBitmapSharedPtr pBitmap( mrSlide.getCurrentSlideBitmap( (*aIter) ) ); + SlideBitmapSharedPtr pBitmap( mrSlide.getCurrentSlideBitmap( (*aIter) ) ); ::cppcanvas::CanvasSharedPtr pCanvas( (*aIter)->getCanvas() ); - - const ::basegfx::B2DHomMatrix aViewTransform( (*aIter)->getTransformation() ); - const ::basegfx::B2DPoint aOutPosPixel( aViewTransform * ::basegfx::B2DPoint() ); - + + const ::basegfx::B2DHomMatrix aViewTransform( (*aIter)->getTransformation() ); + const ::basegfx::B2DPoint aOutPosPixel( aViewTransform * ::basegfx::B2DPoint() ); + // setup a canvas with device coordinate space, the slide // bitmap already has the correct dimension. ::cppcanvas::CanvasSharedPtr pDevicePixelCanvas( pCanvas->clone() ); - + pDevicePixelCanvas->setTransformation( ::basegfx::B2DHomMatrix() ); - + // render at given output position pBitmap->move( aOutPosPixel ); - + // clear clip (might have been changed, e.g. from comb // transition) - pBitmap->clip( ::basegfx::B2DPolyPolygon() ); + pBitmap->clip( ::basegfx::B2DPolyPolygon() ); pBitmap->draw( pDevicePixelCanvas ); - + mrScreenUpdater.notifyUpdate(*aIter,true); } maPolygons.clear(); @@ -186,7 +186,7 @@ namespace slideshow mbIsEraseAllModeActivated=false; return true; } - + bool eraseInkWidthChanged( sal_Int32 rEraseInkSize ) { // Change the size @@ -212,10 +212,10 @@ namespace slideshow { return true; } - + //Draw all registered polygons. void drawPolygons() - { + { for( PolyPolygonVector::iterator aIter=maPolygons.begin(), aEnd=maPolygons.end(); aIter!=aEnd; ++aIter ) @@ -223,15 +223,15 @@ namespace slideshow (*aIter)->draw(); } // screen update necessary to show painting - mrScreenUpdater.notifyUpdate(); + mrScreenUpdater.notifyUpdate(); } - + //Retrieve all registered polygons. PolyPolygonVector getPolygons() { - return maPolygons; + return maPolygons; } - + // MouseEventHandler methods virtual bool handleMousePressed( const awt::MouseEvent& e ) { @@ -240,10 +240,10 @@ namespace slideshow mbIsLastPointValid = false; return false; } - + if (e.Buttons != awt::MouseButton::LEFT) return false; - + maLastMouseDownPos.setX( e.X ); maLastMouseDownPos.setY( e.Y ); mbIsLastMouseDownPosValid = true; @@ -260,10 +260,10 @@ namespace slideshow mbIsLastPointValid = false; return false; } - + if (e.Buttons != awt::MouseButton::LEFT) return false; - + // check, whether up- and down press are on exactly // the same pixel. If that's the case, ignore the // click, and pass on the event to low-prio @@ -311,66 +311,66 @@ namespace slideshow //define the last point as an object //we suppose that there's no way this point could be valid ::basegfx::B2DPolygon aPoly; - + maLastPoint.setX( e.X-mnSize ); maLastPoint.setY( e.Y-mnSize ); - + aPoly.append( maLastPoint ); - + maLastPoint.setX( e.X-mnSize ); maLastPoint.setY( e.Y+mnSize ); - + aPoly.append( maLastPoint ); maLastPoint.setX( e.X+mnSize ); maLastPoint.setY( e.Y+mnSize ); - + aPoly.append( maLastPoint ); maLastPoint.setX( e.X+mnSize ); maLastPoint.setY( e.Y-mnSize ); - + aPoly.append( maLastPoint ); maLastPoint.setX( e.X-mnSize ); maLastPoint.setY( e.Y-mnSize ); - + aPoly.append( maLastPoint ); - + //now we have defined a Polygon that is closed - - //The point is to redraw the LastPoint the way it was originally on the bitmap, + + //The point is to redraw the LastPoint the way it was originally on the bitmap, //of the slide for( UnoViewVector::iterator aIter=maViews.begin(), aEnd=maViews.end(); aIter!=aEnd; ++aIter ) { - + //get via SlideImpl instance the bitmap of the slide unmodified to redraw it - SlideBitmapSharedPtr pBitmap( mrSlide.getCurrentSlideBitmap( (*aIter) ) ); + SlideBitmapSharedPtr pBitmap( mrSlide.getCurrentSlideBitmap( (*aIter) ) ); ::cppcanvas::CanvasSharedPtr pCanvas( (*aIter)->getCanvas() ); - - ::basegfx::B2DHomMatrix aViewTransform( (*aIter)->getTransformation() ); - const ::basegfx::B2DPoint aOutPosPixel( aViewTransform * ::basegfx::B2DPoint() ); - + + ::basegfx::B2DHomMatrix aViewTransform( (*aIter)->getTransformation() ); + const ::basegfx::B2DPoint aOutPosPixel( aViewTransform * ::basegfx::B2DPoint() ); + // setup a canvas with device coordinate space, the slide // bitmap already has the correct dimension. ::cppcanvas::CanvasSharedPtr pDevicePixelCanvas( pCanvas->clone() ); - + pDevicePixelCanvas->setTransformation( ::basegfx::B2DHomMatrix() ); - + // render at given output position pBitmap->move( aOutPosPixel ); - + ::basegfx::B2DPolyPolygon aPolyPoly=::basegfx::B2DPolyPolygon(aPoly); aViewTransform.translate(-aOutPosPixel.getX(), -aOutPosPixel.getY()); aPolyPoly.transform(aViewTransform); // set clip so that we just redraw a part of the canvas - pBitmap->clip(aPolyPoly); + pBitmap->clip(aPolyPoly); pBitmap->draw( pDevicePixelCanvas ); - + mrScreenUpdater.notifyUpdate(*aIter,true); } - - } - else + + } + else { if( !mbIsLastPointValid ) { @@ -393,10 +393,10 @@ namespace slideshow aIter!=aEnd; ++aIter ) { - ::cppcanvas::PolyPolygonSharedPtr pPolyPoly( - ::cppcanvas::BaseGfxFactory::getInstance().createPolyPolygon( (*aIter)->getCanvas(), + ::cppcanvas::PolyPolygonSharedPtr pPolyPoly( + ::cppcanvas::BaseGfxFactory::getInstance().createPolyPolygon( (*aIter)->getCanvas(), aPoly ) ); - + if( pPolyPoly ) { pPolyPoly->setStrokeWidth(mnStrokeWidth); @@ -419,14 +419,14 @@ namespace slideshow // not used here return false; // did not handle the event } - - + + private: ActivitiesQueue& mrActivitiesQueue; ScreenUpdater& mrScreenUpdater; UnoViewVector maViews; - PolyPolygonVector maPolygons; + PolyPolygonVector maPolygons; RGBColor maStrokeColor; double mnStrokeWidth; basegfx::B2DPoint maLastPoint; @@ -434,9 +434,9 @@ namespace slideshow bool mbIsLastPointValid; bool mbIsLastMouseDownPosValid; // added bool for erasing purpose : - bool mbIsEraseAllModeActivated; - bool mbIsEraseModeActivated; - Slide& mrSlide; + bool mbIsEraseAllModeActivated; + bool mbIsEraseModeActivated; + Slide& mrSlide; sal_Int32 mnSize; }; @@ -456,8 +456,8 @@ namespace slideshow UserPaintOverlay::UserPaintOverlay( const RGBColor& rStrokeColor, double nStrokeWidth, const SlideShowContext& rContext, - const PolyPolygonVector& rPolygons ) : - mpHandler( new PaintOverlayHandler( rStrokeColor, + const PolyPolygonVector& rPolygons ) : + mpHandler( new PaintOverlayHandler( rStrokeColor, nStrokeWidth, rContext.mrActivitiesQueue, rContext.mrScreenUpdater, @@ -472,17 +472,17 @@ namespace slideshow mrMultiplexer.addViewHandler( mpHandler ); mrMultiplexer.addUserPaintHandler(mpHandler); } - + PolyPolygonVector UserPaintOverlay::getPolygons() { return mpHandler->getPolygons(); } - + void UserPaintOverlay::drawPolygons() { mpHandler->drawPolygons(); } - + UserPaintOverlay::~UserPaintOverlay() { try @@ -492,7 +492,7 @@ namespace slideshow mrMultiplexer.removeViewHandler( mpHandler ); mpHandler->dispose(); } - catch (uno::Exception &) + catch (uno::Exception &) { OSL_ENSURE( false, rtl::OUStringToOString( comphelper::anyToString( diff --git a/slideshow/source/engine/slide/userpaintoverlay.hxx b/slideshow/source/engine/slide/userpaintoverlay.hxx index b92f5f2539b0..1e86361061e9 100644 --- a/slideshow/source/engine/slide/userpaintoverlay.hxx +++ b/slideshow/source/engine/slide/userpaintoverlay.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,15 +73,15 @@ namespace slideshow ~UserPaintOverlay(); PolyPolygonVector getPolygons(); void drawPolygons(); - + private: UserPaintOverlay( const RGBColor& rStrokeColor, double nStrokeWidth, const SlideShowContext& rContext, const PolyPolygonVector& rPolygons ); - ::boost::shared_ptr<PaintOverlayHandler> mpHandler; - EventMultiplexer& mrMultiplexer; + ::boost::shared_ptr<PaintOverlayHandler> mpHandler; + EventMultiplexer& mrMultiplexer; }; } } diff --git a/slideshow/source/engine/slidebitmap.cxx b/slideshow/source/engine/slidebitmap.cxx index 01df83697fc6..59a28af50b31 100644 --- a/slideshow/source/engine/slidebitmap.cxx +++ b/slideshow/source/engine/slidebitmap.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,20 +62,20 @@ namespace slideshow ENSURE_OR_THROW( mxBitmap.is(), "SlideBitmap::SlideBitmap(): Invalid bitmap" ); } - + bool SlideBitmap::draw( const ::cppcanvas::CanvasSharedPtr& rCanvas ) const { - ENSURE_OR_RETURN_FALSE( rCanvas && rCanvas->getUNOCanvas().is(), + ENSURE_OR_RETURN_FALSE( rCanvas && rCanvas->getUNOCanvas().is(), "SlideBitmap::draw(): Invalid canvas" ); // selectively only copy the transformation from current viewstate, // don't want no clipping here. rendering::ViewState aViewState; - aViewState.AffineTransform = rCanvas->getViewState().AffineTransform; + aViewState.AffineTransform = rCanvas->getViewState().AffineTransform; rendering::RenderState aRenderState; ::canvas::tools::initRenderState( aRenderState ); - + const basegfx::B2DHomMatrix aTranslation(basegfx::tools::createTranslateB2DHomMatrix(maOutputPos)); ::canvas::tools::setRenderStateTransform( aRenderState, aTranslation ); @@ -83,15 +83,15 @@ namespace slideshow { if( maClipPoly.count() ) { - // TODO(P1): Buffer the clip polygon - aRenderState.Clip = - ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( + // TODO(P1): Buffer the clip polygon + aRenderState.Clip = + ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( rCanvas->getUNOCanvas()->getDevice(), maClipPoly ); } - - rCanvas->getUNOCanvas()->drawBitmap( mxBitmap, - aViewState, + + rCanvas->getUNOCanvas()->drawBitmap( mxBitmap, + aViewState, aRenderState ); } catch( uno::Exception& ) @@ -111,7 +111,7 @@ namespace slideshow { return ::basegfx::unotools::b2ISizeFromIntegerSize2D( mxBitmap->getSize() ); } - + void SlideBitmap::move( const ::basegfx::B2DPoint& rNewPos ) { maOutputPos = rNewPos; @@ -121,7 +121,7 @@ namespace slideshow { maClipPoly = rClipPoly; } - + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > SlideBitmap::getXBitmap() { diff --git a/slideshow/source/engine/slideshowcontext.cxx b/slideshow/source/engine/slideshowcontext.cxx index b0659c2f6d22..4a2080fde8e1 100644 --- a/slideshow/source/engine/slideshowcontext.cxx +++ b/slideshow/source/engine/slideshowcontext.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ SlideShowContext::SlideShowContext( SubsettableShapeManagerSharedPtr& rSubsettab UserEventQueue& rUserEventQueue, CursorManager& rCursorManager, const UnoViewContainer& rViewContainer, - const uno::Reference< + const uno::Reference< uno::XComponentContext>& rComponentContext ) : mpSubsettableShapeManager( rSubsettableShapeManager ), mrEventQueue( rEventQueue ), @@ -67,9 +67,9 @@ SlideShowContext::SlideShowContext( SubsettableShapeManagerSharedPtr& rSubsettab mxComponentContext( rComponentContext ) {} -void SlideShowContext::dispose() -{ - mxComponentContext.clear(); +void SlideShowContext::dispose() +{ + mxComponentContext.clear(); } } // namespace internal diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index d736c3f52d64..e84f14383960 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -137,7 +137,7 @@ public: seconds. */ FrameSynchronization (const double nFrameDuration); - + /** Set the current time as the time at which the current frame is displayed. From this the target time of the next frame is derived. */ @@ -190,22 +190,22 @@ private: /****************************************************************************** - + SlideShowImpl This class encapsulates the slideshow presentation viewer. - + With an instance of this class, it is possible to statically and dynamically show a presentation, as defined by the constructor-provided draw model (represented by a sequence of ::com::sun::star::drawing::XDrawPage objects). - + It is possible to show the presentation on multiple views simultaneously (e.g. for a multi-monitor setup). Since this class also relies on user interaction, the corresponding XSlideShowView interface provides means to register some UI event listeners (mostly borrowed from awt::XWindow interface). - + Since currently (mid 2004), OOo isn't very well suited to multi-threaded rendering, this class relies on <em>very frequent</em> external update() calls, which will render the @@ -219,18 +219,18 @@ private: affairs (I've actually tried threading here, but failed miserably when using the VCL canvas as the render backend - deadlocked). - + ******************************************************************************/ typedef cppu::WeakComponentImplHelper1<presentation::XSlideShow> SlideShowImplBase; typedef ::std::vector< ::cppcanvas::PolyPolygonSharedPtr> PolyPolygonVector; - + /// Maps XDrawPage for annotations persistence typedef ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage>, PolyPolygonVector> PolygonMap; - + class SlideShowImpl : private cppu::BaseMutex, public CursorManager, public SlideShowImplBase @@ -280,7 +280,7 @@ public: phase, when shape effects are running, and the phase after the last shape animation has ended, but before the next slide transition starts. - + This method notifies the end of the third phase. */ void notifySlideEnded (const bool bReverse); @@ -289,7 +289,7 @@ public: has been clicked. */ bool notifyHyperLinkClicked( rtl::OUString const& hyperLink ); - + /** Notification from eventmultiplexer that an animation event has occoured. This will be forewarded to all registered XSlideShowListener */ @@ -357,32 +357,32 @@ private: transition. */ void redisplayCurrentSlide (void); - + protected: // WeakComponentImplHelperBase - virtual void SAL_CALL disposing(); - - bool isDisposed() const + virtual void SAL_CALL disposing(); + + bool isDisposed() const { return (rBHelper.bDisposed || rBHelper.bInDispose); } - + private: struct SeparateListenerImpl; friend struct SeparateListenerImpl; struct PrefetchPropertiesFunc; friend struct PrefetchPropertiesFunc; - + /// Stop currently running show. void stopShow(); - + ///Find a polygons vector in maPolygons (map) PolygonMap::iterator findPolygons( uno::Reference<drawing::XDrawPage> const& xDrawPage); - + /// Creates a new slide. SlideSharedPtr makeSlide( uno::Reference<drawing::XDrawPage> const& xDrawPage, uno::Reference<drawing::XDrawPagesSupplier> const& xDrawPages, uno::Reference<animations::XAnimationNode> const& xRootNode ); - + /// Checks whether the given slide/animation node matches mpPrefetchSlide static bool matches( SlideSharedPtr const& pSlide, @@ -395,19 +395,19 @@ private: else return (!xSlide.is() && !xNode.is()); } - + /// Resets the current slide transition sound object with a new one: SoundPlayerSharedPtr resetSlideTransitionSound( uno::Any const& url = uno::Any(), bool bLoopSound = false ); - + /// stops the current slide transition sound void stopSlideTransitionSound(); /** Prepare a slide transition - + This method registers all necessary events and activities for a slide transition. - + @return the slide change activity, or NULL for no transition effect */ ActivitySharedPtr createSlideTransition( @@ -415,11 +415,11 @@ private: const SlideSharedPtr& rLeavingSlide, const SlideSharedPtr& rEnteringSlide, const EventSharedPtr& rTransitionEndEvent ); - + /** Request/release the wait symbol. The wait symbol is displayed when there are more requests then releases. Locking the wait symbol helps to avoid intermediate repaints. - + Do not call this method directly. Use WaitSymbolLock instead. */ void requestWaitSymbol (void); @@ -432,7 +432,7 @@ private: { mrSlideShowImpl.releaseWaitSymbol(); } private: SlideShowImpl& mrSlideShowImpl; }; - + /// Filter requested cursor shape against hard slideshow cursors (wait, etc.) sal_Int16 calcActiveCursor( sal_Int16 nCursorShape ) const; @@ -444,29 +444,29 @@ private: /// all registered views UnoViewContainer maViewContainer; - + /// all registered slide show listeners cppu::OInterfaceContainerHelper maListenerContainer; - + /// map of vectors, containing all registered listeners for a shape ShapeEventListenerMap maShapeEventListeners; /// map of sal_Int16 values, specifying the mouse cursor for every shape ShapeCursorMap maShapeCursors; - + //map of vector of Polygons, containing polygons drawn on each slide. PolygonMap maPolygons; - + boost::optional<RGBColor> maUserPaintColor; - + boost::optional<double> maUserPaintStrokeWidth; - + //changed for the eraser project - boost::optional<bool> maEraseAllInk; - boost::optional<bool> maSwitchPenMode; - boost::optional<bool> maSwitchEraserMode; - boost::optional<sal_Int32> maEraseInk; + boost::optional<bool> maEraseAllInk; + boost::optional<bool> maSwitchPenMode; + boost::optional<bool> maSwitchEraserMode; + boost::optional<sal_Int32> maEraseInk; //end changed - + boost::shared_ptr<canvas::tools::ElapsedTime> mpPresTimer; ScreenUpdater maScreenUpdater; EventQueue maEventQueue; @@ -482,7 +482,7 @@ private: /// the current slide transition sound object: SoundPlayerSharedPtr mpCurrentSlideTransitionSound; - + uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference< presentation::XTransitionFactory> mxOptionalTransitionFactory; @@ -501,7 +501,7 @@ private: uno::Reference<animations::XAnimationNode> mxPrefetchAnimationNode; sal_Int16 mnCurrentCursor; - + sal_Int32 mnWaitSymbolRequestCount; bool mbAutomaticAdvancementMode; bool mbImageAnimationsAllowed; @@ -533,12 +533,12 @@ struct SlideShowImpl::SeparateListenerImpl : public EventHandler, ScreenUpdater& mrScreenUpdater; EventQueue& mrEventQueue; - SeparateListenerImpl( SlideShowImpl& rShow, + SeparateListenerImpl( SlideShowImpl& rShow, ScreenUpdater& rScreenUpdater, EventQueue& rEventQueue ) : - mrShow( rShow ), + mrShow( rShow ), mrScreenUpdater( rScreenUpdater ), - mrEventQueue( rEventQueue ) + mrEventQueue( rEventQueue ) {} // EventHandler @@ -595,7 +595,7 @@ SlideShowImpl::SlideShowImpl( maEventMultiplexer( maEventQueue, maViewContainer ), maActivitiesQueue( mpPresTimer ), - maUserEventQueue( maEventMultiplexer, + maUserEventQueue( maEventMultiplexer, maEventQueue, *this ), mpDummyPtr(), @@ -626,8 +626,8 @@ SlideShowImpl::SlideShowImpl( { // keep care not constructing any UNO references to this inside ctor, // shift that code to create()! - - uno::Reference<lang::XMultiComponentFactory> xFactory( + + uno::Reference<lang::XMultiComponentFactory> xFactory( mxComponentContext->getServiceManager() ); if( xFactory.is() ) @@ -635,10 +635,10 @@ SlideShowImpl::SlideShowImpl( try { // #i82460# try to retrieve special transition factory - mxOptionalTransitionFactory.set( - xFactory->createInstanceWithContext( + mxOptionalTransitionFactory.set( + xFactory->createInstanceWithContext( ::rtl::OUString::createFromAscii( "com.sun.star.presentation.TransitionFactory" ), - mxComponentContext ), + mxComponentContext ), uno::UNO_QUERY ); } catch (loader::CannotActivateFactoryException const&) @@ -647,7 +647,7 @@ SlideShowImpl::SlideShowImpl( } mpListener.reset( new SeparateListenerImpl( - *this, + *this, maScreenUpdater, maEventQueue )); maEventMultiplexer.addSlideAnimationsEndHandler( mpListener ); @@ -663,7 +663,7 @@ void SlideShowImpl::disposing() osl::MutexGuard const guard( m_aMutex ); maEffectRewinder.dispose(); - + // stop slide transition sound, if any: stopSlideTransitionSound(); @@ -677,13 +677,13 @@ void SlideShowImpl::disposing() mpWaitSymbol.reset(); - if( mpRehearseTimingsActivity ) + if( mpRehearseTimingsActivity ) { mpRehearseTimingsActivity->dispose(); mpRehearseTimingsActivity.reset(); } - if( mpListener ) + if( mpListener ) { maEventMultiplexer.removeSlideAnimationsEndHandler(mpListener); maEventMultiplexer.removeViewRepaintHandler(mpListener); @@ -692,7 +692,7 @@ void SlideShowImpl::disposing() maEventMultiplexer.removeAnimationEndHandler( mpListener ); mpListener.reset(); - } + } maUserEventQueue.clear(); maActivitiesQueue.clear(); @@ -719,7 +719,7 @@ void SlideShowImpl::disposing() /// stops the current slide transition sound void SlideShowImpl::stopSlideTransitionSound() { - if (mpCurrentSlideTransitionSound) + if (mpCurrentSlideTransitionSound) { mpCurrentSlideTransitionSound->stopPlayback(); mpCurrentSlideTransitionSound->dispose(); @@ -741,15 +741,15 @@ SoundPlayerSharedPtr SlideShowImpl::resetSlideTransitionSound( const uno::Any& r stopSlideTransitionSound(); - if (url.getLength() > 0) + if (url.getLength() > 0) { - try + try { mpCurrentSlideTransitionSound = SoundPlayer::create( maEventMultiplexer, url, mxComponentContext ); mpCurrentSlideTransitionSound->setPlaybackLoop( bLoopSound ); } - catch (lang::NoSupportException const&) + catch (lang::NoSupportException const&) { // catch possible exceptions from SoundPlayer, since // being not able to playback the sound is not a hard @@ -770,12 +770,12 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition( "createSlideTransition(): No views" ); ENSURE_OR_THROW( rEnteringSlide, "createSlideTransition(): No entering slide" ); - + // return empty transition, if slide transitions // are disabled. if (mbNoSlideTransitions) return ActivitySharedPtr(); - + // retrieve slide change parameters from XDrawPage uno::Reference< beans::XPropertySet > xPropSet( xDrawPage, uno::UNO_QUERY ); @@ -796,7 +796,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition( "Could not extract slide transition type from XDrawPage - assuming no transition\n" ); return ActivitySharedPtr(); } - + sal_Int16 nTransitionSubType(0); if( !getPropertyValue( nTransitionSubType, xPropSet, @@ -806,7 +806,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition( "Could not extract slide transition subtype from XDrawPage - assuming no transition\n" ); return ActivitySharedPtr(); } - + bool bTransitionDirection(false); if( !getPropertyValue( bTransitionDirection, xPropSet, @@ -815,7 +815,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition( OSL_TRACE( "createSlideTransition(): " "Could not extract slide transition direction from XDrawPage - assuming default direction\n" ); } - + sal_Int32 aUnoColor(0); if( !getPropertyValue( aUnoColor, xPropSet, @@ -835,7 +835,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition( if( !getPropertyValue( bLoopSound, xPropSet, OUSTR("LoopSound") ) ) OSL_TRACE( "createSlideTransition(): Could not get slide property 'LoopSound' - using no sound\n" ); - + NumberAnimationSharedPtr pTransition( TransitionFactory::createSlideTransition( rLeavingSlide, @@ -865,7 +865,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition( "Could not extract slide transition duration from XDrawPage - assuming no transition\n" ); return ActivitySharedPtr(); } - + sal_Int32 nMinFrames(5); if( !getPropertyValue( nMinFrames, xPropSet, @@ -874,12 +874,12 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition( OSL_TRACE( "createSlideTransition(): " "No minimal number of frames given - assuming 5\n" ); } - + // prefetch slide transition bitmaps, but postpone it after // displaySlide() has finished - sometimes, view size has not yet // reached final size - maEventQueue.addEvent( - makeEvent( + maEventQueue.addEvent( + makeEvent( boost::bind( &::slideshow::internal::Animation::prefetch, pTransition, @@ -910,9 +910,9 @@ PolygonMap::iterator SlideShowImpl::findPolygons( uno::Reference<drawing::XDrawP // TODO(P2) : Optimze research in the map. bool bFound = false; PolygonMap::iterator aIter=maPolygons.begin(); - - - while(aIter!=maPolygons.end() && !bFound) + + + while(aIter!=maPolygons.end() && !bFound) { if(aIter->first == xDrawPage) bFound = true; @@ -921,7 +921,7 @@ PolygonMap::iterator SlideShowImpl::findPolygons( uno::Reference<drawing::XDrawP } return aIter; -} +} SlideSharedPtr SlideShowImpl::makeSlide( uno::Reference<drawing::XDrawPage> const& xDrawPage, @@ -934,8 +934,8 @@ SlideSharedPtr SlideShowImpl::makeSlide( //Retrieve polygons for the current slide PolygonMap::iterator aIter; aIter = findPolygons(xDrawPage); - - const SlideSharedPtr pSlide( createSlide(xDrawPage, + + const SlideSharedPtr pSlide( createSlide(xDrawPage, xDrawPages, xRootNode, maEventQueue, @@ -954,8 +954,8 @@ SlideSharedPtr SlideShowImpl::makeSlide( !!maUserPaintColor, mbImageAnimationsAllowed, mbDisableAnimationZOrder) ); - - // prefetch show content (reducing latency for slide + + // prefetch show content (reducing latency for slide // bitmap and effect start later on) pSlide->prefetch(); @@ -978,7 +978,7 @@ void SlideShowImpl::requestWaitSymbol (void) mpWaitSymbol->show(); } } - + void SlideShowImpl::releaseWaitSymbol (void) { --mnWaitSymbolRequestCount; @@ -1008,7 +1008,7 @@ sal_Int16 SlideShowImpl::calcActiveCursor( sal_Int16 nCursorShape ) const return nCursorShape; } - + void SlideShowImpl::stopShow() { @@ -1020,10 +1020,10 @@ void SlideShowImpl::stopShow() //Register polygons in the map if(findPolygons(mpCurrentSlide->getXDrawPage()) != maPolygons.end()) maPolygons.erase(mpCurrentSlide->getXDrawPage()); - - maPolygons.insert(make_pair(mpCurrentSlide->getXDrawPage(),mpCurrentSlide->getPolygons())); + + maPolygons.insert(make_pair(mpCurrentSlide->getXDrawPage(),mpCurrentSlide->getPolygons())); } - + // clear all queues maEventQueue.clear(); maActivitiesQueue.clear(); @@ -1040,7 +1040,7 @@ void SlideShowImpl::stopShow() // re-enable automatic effect advancement // (maEventQueue.clear() above might have killed // maEventMultiplexer's tick events) - if (mbAutomaticAdvancementMode) + if (mbAutomaticAdvancementMode) { // toggle automatic mode (enabling just again is // ignored by EventMultiplexer) @@ -1051,7 +1051,7 @@ void SlideShowImpl::stopShow() -class SlideShowImpl::PrefetchPropertiesFunc +class SlideShowImpl::PrefetchPropertiesFunc { public: PrefetchPropertiesFunc( SlideShowImpl * that_, @@ -1061,13 +1061,13 @@ public: mrbSkipAllMainSequenceEffects(rbSkipAllMainSequenceEffects), mrbSkipSlideTransition(rbSkipSlideTransition) {} - + void operator()( beans::PropertyValue const& rProperty ) const { if (rProperty.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("Prefetch") )) + RTL_CONSTASCII_STRINGPARAM("Prefetch") )) { uno::Sequence<uno::Any> seq; - if ((rProperty.Value >>= seq) && seq.getLength() == 2) + if ((rProperty.Value >>= seq) && seq.getLength() == 2) { seq[0] >>= mpSlideShowImpl->mxPrefetchSlide; seq[1] >>= mpSlideShowImpl->mxPrefetchAnimationNode; @@ -1083,7 +1083,7 @@ public: { rProperty.Value >>= mrbSkipSlideTransition; } - else + else { OSL_ENSURE( false, rtl::OUStringToOString( rProperty.Name, RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -1116,8 +1116,8 @@ void SlideShowImpl::displaySlide( mxDrawPagesSupplier = xDrawPages; #else mxDrawPagesSupplier = NULL; -#endif - +#endif + stopShow(); // MUST call that: results in // maUserEventQueue.clear(). What's more, // stopShow()'s currSlide->hide() call is @@ -1132,7 +1132,7 @@ void SlideShowImpl::displaySlide( std::for_each( rProperties.getConstArray(), rProperties.getConstArray() + rProperties.getLength(), PrefetchPropertiesFunc(this, bSkipAllMainSequenceEffects, bSkipSlideTransition) ); - + OSL_ENSURE( !maViewContainer.empty(), "### no views!" ); if (maViewContainer.empty()) return; @@ -1140,20 +1140,20 @@ void SlideShowImpl::displaySlide( // this here might take some time { WaitSymbolLock aLock (*this); - + mpPreviousSlide = mpCurrentSlide; mpCurrentSlide.reset(); - if (matches( mpPrefetchSlide, xSlide, xRootNode )) + if (matches( mpPrefetchSlide, xSlide, xRootNode )) { // prefetched slide matches: mpCurrentSlide = mpPrefetchSlide; } - else + else mpCurrentSlide = makeSlide( xSlide, xDrawPages, xRootNode ); - + OSL_ASSERT( mpCurrentSlide ); - if (mpCurrentSlide) + if (mpCurrentSlide) { basegfx::B2DSize oldSlideSize; if( mpPreviousSlide ) @@ -1164,19 +1164,19 @@ void SlideShowImpl::displaySlide( // push new transformation to all views, if size changed if( !mpPreviousSlide || oldSlideSize != slideSize ) { - std::for_each( maViewContainer.begin(), + std::for_each( maViewContainer.begin(), maViewContainer.end(), boost::bind( &View::setViewSize, _1, boost::cref(slideSize) )); - + // explicitly notify view change here, // because transformation might have changed: // optimization, this->notifyViewChange() would // repaint slide which is not necessary. maEventMultiplexer.notifyViewsChanged(); } - - // create slide transition, and add proper end event + + // create slide transition, and add proper end event // (which then starts the slide effects // via CURRENT_SLIDE.show()) ActivitySharedPtr pSlideChangeActivity ( @@ -1184,7 +1184,7 @@ void SlideShowImpl::displaySlide( mpCurrentSlide->getXDrawPage(), mpPreviousSlide, mpCurrentSlide, - makeEvent( + makeEvent( boost::bind( &SlideShowImpl::notifySlideTransitionEnded, this, @@ -1199,18 +1199,18 @@ void SlideShowImpl::displaySlide( // anymore. pSlideChangeActivity.reset(); } - - if (pSlideChangeActivity) + + if (pSlideChangeActivity) { // factory generated a slide transition - activate it! maActivitiesQueue.addActivity( pSlideChangeActivity ); } - else + else { // no transition effect on this slide - schedule slide // effect start event right away. - maEventQueue.addEvent( - makeEvent( + maEventQueue.addEvent( + makeEvent( boost::bind( &SlideShowImpl::notifySlideTransitionEnded, this, @@ -1241,15 +1241,15 @@ void SlideShowImpl::redisplayCurrentSlide (void) // precondition: must only be called from the main thread! DBG_TESTSOLARMUTEX(); stopShow(); - + OSL_ENSURE( !maViewContainer.empty(), "### no views!" ); if (maViewContainer.empty()) return; // No transition effect on this slide - schedule slide // effect start event right away. - maEventQueue.addEvent( - makeEvent( + maEventQueue.addEvent( + makeEvent( boost::bind( &SlideShowImpl::notifySlideTransitionEnded, this, @@ -1267,7 +1267,7 @@ sal_Bool SlideShowImpl::nextEffect() throw (uno::RuntimeException) if (isDisposed()) return false; - + // precondition: must only be called from the main thread! DBG_TESTSOLARMUTEX(); @@ -1277,14 +1277,14 @@ sal_Bool SlideShowImpl::nextEffect() throw (uno::RuntimeException) return maEventMultiplexer.notifyNextEffect(); } - + sal_Bool SlideShowImpl::previousEffect() throw (uno::RuntimeException) { osl::MutexGuard const guard( m_aMutex ); if (isDisposed()) return false; - + // precondition: must only be called from the main thread! DBG_TESTSOLARMUTEX(); @@ -1309,12 +1309,12 @@ void SlideShowImpl::rewindEffectToPreviousSlide (void) // effect because there are no effects on the current slide or none has // yet been displayed. Go to the previous slide. notifySlideEnded(true); - + // Process pending events once more in order to have the following // screen update show the last effect. Not sure whether this should be // necessary. maEventQueue.forceEmpty(); - + // We have to call the screen updater before the wait symbol is turned // off. Otherwise the wait symbol would force the display of an // intermediate state of the slide (before the effects are replayed.) @@ -1356,7 +1356,7 @@ sal_Bool SlideShowImpl::pause( sal_Bool bPauseShow ) if (isDisposed()) return false; - + // precondition: must only be called from the main thread! DBG_TESTSOLARMUTEX(); @@ -1365,9 +1365,9 @@ sal_Bool SlideShowImpl::pause( sal_Bool bPauseShow ) mpPresTimer->pauseTimer(); else mpPresTimer->continueTimer(); - + maEventMultiplexer.notifyPauseMode(bPauseShow); - + mbShowPaused = bPauseShow; return true; } @@ -1379,7 +1379,7 @@ uno::Reference<drawing::XDrawPage> SlideShowImpl::getCurrentSlide() if (isDisposed()) return uno::Reference<drawing::XDrawPage>(); - + // precondition: must only be called from the main thread! DBG_TESTSOLARMUTEX(); @@ -1397,7 +1397,7 @@ sal_Bool SlideShowImpl::addView( if (isDisposed()) return false; - + // precondition: must only be called from the main thread! DBG_TESTSOLARMUTEX(); @@ -1405,18 +1405,18 @@ sal_Bool SlideShowImpl::addView( ENSURE_OR_RETURN_FALSE( xView.is(), "addView(): Invalid view" ); ENSURE_OR_RETURN_FALSE( xView->getCanvas().is(), "addView(): View does not provide a valid canvas" ); - + UnoViewSharedPtr const pView( createSlideView( - xView, + xView, maEventQueue, maEventMultiplexer )); if (!maViewContainer.addView( pView )) return false; // view already added - + // initialize view content // ======================= - if (mpCurrentSlide) + if (mpCurrentSlide) { // set view transformation const basegfx::B2ISize slideSize = mpCurrentSlide->getSlideSize(); @@ -1424,7 +1424,7 @@ sal_Bool SlideShowImpl::addView( slideSize.getY() ) ); } - // clear view area (since its newly added, + // clear view area (since its newly added, // we need a clean slate) pView->clearAll(); @@ -1442,26 +1442,26 @@ sal_Bool SlideShowImpl::removeView( throw (uno::RuntimeException) { osl::MutexGuard const guard( m_aMutex ); - + // precondition: must only be called from the main thread! DBG_TESTSOLARMUTEX(); ENSURE_OR_RETURN_FALSE( xView.is(), "removeView(): Invalid view" ); - + UnoViewSharedPtr const pView( maViewContainer.removeView( xView ) ); if( !pView ) return false; // view was not added in the first place - + // remove view from EventMultiplexer (mouse events etc.) maEventMultiplexer.notifyViewRemoved( pView ); - + pView->_dispose(); return true; } void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMultiServiceFactory >& xDocFactory ) throw (uno::RuntimeException) -{ +{ //Retrieve Polygons if user ends presentation by context menu if (mpCurrentSlide) { @@ -1470,67 +1470,67 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult maPolygons.insert(make_pair(mpCurrentSlide->getXDrawPage(),mpCurrentSlide->getPolygons())); } - + //Creating the layer for shapes // query for the XLayerManager uno::Reference< drawing::XLayerSupplier > xLayerSupplier(xDocFactory, uno::UNO_QUERY); uno::Reference< container::XNameAccess > xNameAccess = xLayerSupplier->getLayerManager(); - + uno::Reference< drawing::XLayerManager > xLayerManager(xNameAccess, uno::UNO_QUERY); // create a layer and set its properties uno::Reference< drawing::XLayer > xDrawnInSlideshow = xLayerManager->insertNewByIndex(xLayerManager->getCount()); uno::Reference< beans::XPropertySet > xLayerPropSet(xDrawnInSlideshow, uno::UNO_QUERY); - + //Layer Name which enables to catch annotations rtl::OUString layerName = rtl::OUString::createFromAscii("DrawnInSlideshow"); uno::Any aPropLayer; - + aPropLayer <<= layerName; xLayerPropSet->setPropertyValue(rtl::OUString::createFromAscii("Name"), aPropLayer); - + aPropLayer <<= true; xLayerPropSet->setPropertyValue(rtl::OUString::createFromAscii("IsVisible"), aPropLayer); - + aPropLayer <<= false; xLayerPropSet->setPropertyValue(rtl::OUString::createFromAscii("IsLocked"), aPropLayer); PolygonMap::iterator aIter=maPolygons.begin(); - + PolyPolygonVector aPolygons; ::cppcanvas::PolyPolygonSharedPtr pPolyPoly; ::basegfx::B2DPolyPolygon b2DPolyPoly; - + //Register polygons for each slide - while(aIter!=maPolygons.end()) + while(aIter!=maPolygons.end()) { aPolygons = aIter->second; //Get shapes for the slide ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > Shapes(aIter->first, ::com::sun::star::uno::UNO_QUERY); //Retrieve polygons for one slide - for( PolyPolygonVector::iterator aIterPoly=aPolygons.begin(), + for( PolyPolygonVector::iterator aIterPoly=aPolygons.begin(), aEnd=aPolygons.end(); aIterPoly!=aEnd; ++aIterPoly ) - { + { pPolyPoly = (*aIterPoly); - b2DPolyPoly = ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(pPolyPoly->getUNOPolyPolygon()); - - //Normally there is only one polygon + b2DPolyPoly = ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(pPolyPoly->getUNOPolyPolygon()); + + //Normally there is only one polygon for(sal_uInt32 i=0; i< b2DPolyPoly.count();i++) { const ::basegfx::B2DPolygon& aPoly = b2DPolyPoly.getB2DPolygon(i); sal_uInt32 nPoints = aPoly.count(); - + if( nPoints > 1) { //create the PolyLineShape uno::Reference< uno::XInterface > polyshape(xDocFactory->createInstance( - rtl::OUString::createFromAscii("com.sun.star.drawing.PolyLineShape") ) ); + rtl::OUString::createFromAscii("com.sun.star.drawing.PolyLineShape") ) ); uno::Reference< drawing::XShape > rPolyShape(polyshape, uno::UNO_QUERY); - + //Add the shape to the slide Shapes->add(rPolyShape); - - //Retrieve shape properties + + //Retrieve shape properties uno::Reference< beans::XPropertySet > aXPropSet = uno::Reference< beans::XPropertySet >( rPolyShape, uno::UNO_QUERY ); //Construct a sequence of points sequence drawing::PointSequenceSequence aRetval; @@ -1545,8 +1545,8 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult for( sal_uInt32 n = 0; n < nPoints; n++ ) { //Create a point from the polygon - *pInnerSequence++ = awt::Point( - basegfx::fround(aPoly.getB2DPoint(n).getX()), + *pInnerSequence++ = awt::Point( + basegfx::fround(aPoly.getB2DPoint(n).getX()), basegfx::fround(aPoly.getB2DPoint(n).getY())); } @@ -1554,37 +1554,37 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult //Give the built PointSequenceSequence. uno::Any aParam; aParam <<= aRetval; - aXPropSet->setPropertyValue( rtl::OUString::createFromAscii("PolyPolygon"), aParam ); + aXPropSet->setPropertyValue( rtl::OUString::createFromAscii("PolyPolygon"), aParam ); //LineStyle : SOLID by default - uno::Any aAny; - drawing::LineStyle eLS; + uno::Any aAny; + drawing::LineStyle eLS; eLS = drawing::LineStyle_SOLID; aAny <<= eLS; aXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineStyle"), aAny ); //LineColor - sal_uInt32 nLineColor; + sal_uInt32 nLineColor; nLineColor = pPolyPoly->getRGBALineColor(); - //Transform polygon color from RRGGBBAA to AARRGGBB + //Transform polygon color from RRGGBBAA to AARRGGBB aAny <<= RGBAColor2UnoColor(nLineColor); aXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineColor"), aAny ); - + //LineWidth - double fLineWidth; + double fLineWidth; fLineWidth = pPolyPoly->getStrokeWidth(); aAny <<= (sal_Int32)fLineWidth; - aXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineWidth"), aAny ); + aXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineWidth"), aAny ); - // make polygons special + // make polygons special xLayerManager->attachShapeToLayer(rPolyShape, xDrawnInSlideshow); } - } + } } ++aIter; } } - + sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) throw (uno::RuntimeException) { @@ -1601,19 +1601,19 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) { double nTimeout(0.0); mbAutomaticAdvancementMode = (rProperty.Value >>= nTimeout); - if (mbAutomaticAdvancementMode) + if (mbAutomaticAdvancementMode) { maEventMultiplexer.setAutomaticTimeout( nTimeout ); } maEventMultiplexer.setAutomaticMode( mbAutomaticAdvancementMode ); return true; } - + if (rProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("UserPaintColor") )) { sal_Int32 nColor(0); - if (rProperty.Value >>= nColor) + if (rProperty.Value >>= nColor) { OSL_ENSURE( mbMouseVisible, "setProperty(): User paint overrides invisible mouse" ); @@ -1622,7 +1622,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) maUserPaintColor.reset( unoColor2RGBColor( nColor ) ); maEventMultiplexer.notifyUserPaintColor( *maUserPaintColor ); } - else + else { // disable user paint maUserPaintColor.reset(); @@ -1634,31 +1634,31 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) return true; } - + //adding support for erasing features in UserPaintOverlay if (rProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("EraseAllInk") )) { bool nEraseAllInk(false); - if (rProperty.Value >>= nEraseAllInk) + if (rProperty.Value >>= nEraseAllInk) { OSL_ENSURE( mbMouseVisible, "setProperty(): User paint overrides invisible mouse" ); - + // enable user paint maEraseAllInk.reset( nEraseAllInk ); maEventMultiplexer.notifyEraseAllInk( *maEraseAllInk ); } - else + else { // disable user paint maEraseAllInk.reset(); maEventMultiplexer.notifyUserPaintDisabled(); } - + if( mnCurrentCursor == awt::SystemPointer::ARROW ) resetCursor(); - + return true; } @@ -1666,7 +1666,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) RTL_CONSTASCII_STRINGPARAM("SwitchPenMode") )) { bool nSwitchPenMode(false); - if (rProperty.Value >>= nSwitchPenMode) + if (rProperty.Value >>= nSwitchPenMode) { OSL_ENSURE( mbMouseVisible, "setProperty(): User paint overrides invisible mouse" ); @@ -1677,7 +1677,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) maEventMultiplexer.notifySwitchPenMode(); } } - + if( mnCurrentCursor == awt::SystemPointer::ARROW ) resetCursor(); return true; @@ -1688,7 +1688,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) RTL_CONSTASCII_STRINGPARAM("SwitchEraserMode") )) { bool nSwitchEraserMode(false); - if (rProperty.Value >>= nSwitchEraserMode) + if (rProperty.Value >>= nSwitchEraserMode) { OSL_ENSURE( mbMouseVisible, "setProperty(): User paint overrides invisible mouse" ); @@ -1698,7 +1698,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) maEventMultiplexer.notifySwitchEraserMode(); } } - + if( mnCurrentCursor == awt::SystemPointer::ARROW ) resetCursor(); return true; @@ -1710,28 +1710,28 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) RTL_CONSTASCII_STRINGPARAM("EraseInk") )) { sal_Int32 nEraseInk(100); - if (rProperty.Value >>= nEraseInk) + if (rProperty.Value >>= nEraseInk) { OSL_ENSURE( mbMouseVisible, "setProperty(): User paint overrides invisible mouse" ); - + // enable user paint maEraseInk.reset( nEraseInk ); maEventMultiplexer.notifyEraseInkWidth( *maEraseInk ); } - else - { + else + { // disable user paint maEraseInk.reset(); maEventMultiplexer.notifyUserPaintDisabled(); } - + if( mnCurrentCursor == awt::SystemPointer::ARROW ) resetCursor(); - + return true; } - + // new Property for pen's width if (rProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("UserPaintStrokeWidth") )) @@ -1754,27 +1754,27 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) resetCursor(); return true; } - + if (rProperty.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("AdvanceOnClick") )) + RTL_CONSTASCII_STRINGPARAM("AdvanceOnClick") )) { sal_Bool bAdvanceOnClick = sal_False; if (! (rProperty.Value >>= bAdvanceOnClick)) return false; maUserEventQueue.setAdvanceOnClick( bAdvanceOnClick ); return true; - } - + } + if (rProperty.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("DisableAnimationZOrder") )) + RTL_CONSTASCII_STRINGPARAM("DisableAnimationZOrder") )) { sal_Bool bDisableAnimationZOrder = sal_False; if (! (rProperty.Value >>= bDisableAnimationZOrder)) return false; mbDisableAnimationZOrder = bDisableAnimationZOrder == sal_True; return true; - } - + } + if (rProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("ImageAnimationsAllowed") ) ) { @@ -1792,7 +1792,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) return true; } - + if (rProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("MouseVisible") )) { @@ -1803,28 +1803,28 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) return true; } - + if (rProperty.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("ForceManualAdvance") )) + RTL_CONSTASCII_STRINGPARAM("ForceManualAdvance") )) { return (rProperty.Value >>= mbForceManualAdvance); } - + if (rProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("RehearseTimings") )) { bool bRehearseTimings = false; if (! (rProperty.Value >>= bRehearseTimings)) return false; - - if (bRehearseTimings) + + if (bRehearseTimings) { // TODO(Q3): Move to slide mpRehearseTimingsActivity = RehearseTimingsActivity::create( SlideShowContext( mpDummyPtr, - maEventQueue, - maEventMultiplexer, + maEventQueue, + maEventMultiplexer, maScreenUpdater, maActivitiesQueue, maUserEventQueue, @@ -1832,7 +1832,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) maViewContainer, mxComponentContext) ); } - else if (mpRehearseTimingsActivity) + else if (mpRehearseTimingsActivity) { // removes timer from all views: mpRehearseTimingsActivity->dispose(); @@ -1840,28 +1840,28 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) } return true; } - + if (rProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("WaitSymbolBitmap") )) { uno::Reference<rendering::XBitmap> xBitmap; if (! (rProperty.Value >>= xBitmap)) return false; - - mpWaitSymbol = WaitSymbol::create( xBitmap, + + mpWaitSymbol = WaitSymbol::create( xBitmap, maScreenUpdater, maEventMultiplexer, maViewContainer ); return true; } - + if (rProperty.Name.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("NoSlideTransitions") )) + RTL_CONSTASCII_STRINGPARAM("NoSlideTransitions") )) { return (rProperty.Value >>= mbNoSlideTransitions); } - + if (rProperty.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("IsSoundEnabled"))) { uno::Sequence<uno::Any> aValues; @@ -1925,7 +1925,7 @@ void SlideShowImpl::addShapeEventListener( if (isDisposed()) return; - + // precondition: must only be called from the main thread! DBG_TESTSOLARMUTEX(); @@ -1934,11 +1934,11 @@ void SlideShowImpl::addShapeEventListener( maShapeEventListeners.end() ) { // no entry for this shape -> create one - aIter = maShapeEventListeners.insert( + aIter = maShapeEventListeners.insert( ShapeEventListenerMap::value_type( xShape, - boost::shared_ptr<cppu::OInterfaceContainerHelper>( - new cppu::OInterfaceContainerHelper(m_aMutex)))).first; + boost::shared_ptr<cppu::OInterfaceContainerHelper>( + new cppu::OInterfaceContainerHelper(m_aMutex)))).first; } // add new listener to broadcaster @@ -1955,7 +1955,7 @@ void SlideShowImpl::removeShapeEventListener( throw (uno::RuntimeException) { osl::MutexGuard const guard( m_aMutex ); - + // precondition: must only be called from the main thread! DBG_TESTSOLARMUTEX(); @@ -1969,7 +1969,7 @@ void SlideShowImpl::removeShapeEventListener( aIter->second.get(), "SlideShowImpl::removeShapeEventListener(): " "listener map contains NULL broadcast helper" ); - + aIter->second->removeInterface( xListener ); } @@ -1985,37 +1985,37 @@ void SlideShowImpl::setShapeCursor( if (isDisposed()) return; - + // precondition: must only be called from the main thread! DBG_TESTSOLARMUTEX(); ShapeCursorMap::iterator aIter; - if( (aIter=maShapeCursors.find( xShape )) == maShapeCursors.end() ) + if( (aIter=maShapeCursors.find( xShape )) == maShapeCursors.end() ) { // no entry for this shape -> create one - if( nPointerShape != awt::SystemPointer::ARROW ) + if( nPointerShape != awt::SystemPointer::ARROW ) { // add new entry, unless shape shall display // normal pointer arrow -> no need to handle that // case maShapeCursors.insert( - ShapeCursorMap::value_type(xShape, + ShapeCursorMap::value_type(xShape, nPointerShape) ); } } - else if( nPointerShape == awt::SystemPointer::ARROW ) + else if( nPointerShape == awt::SystemPointer::ARROW ) { // shape shall display normal cursor -> can disable // the cursor and clear the entry maShapeCursors.erase( xShape ); } - else + else { // existing entry found, update with new cursor ID aIter->second = nPointerShape; } - maEventMultiplexer.notifyShapeCursorChange(xShape, + maEventMultiplexer.notifyShapeCursorChange(xShape, nPointerShape); } @@ -2026,10 +2026,10 @@ bool SlideShowImpl::requestCursor( sal_Int16 nCursorShape ) const sal_Int16 nActualCursor = calcActiveCursor(mnCurrentCursor); // change all views to the requested cursor ID - std::for_each( maViewContainer.begin(), + std::for_each( maViewContainer.begin(), maViewContainer.end(), - boost::bind( &View::setCursorShape, - _1, + boost::bind( &View::setCursorShape, + _1, nActualCursor )); return nActualCursor==nCursorShape; @@ -2040,10 +2040,10 @@ void SlideShowImpl::resetCursor() mnCurrentCursor = awt::SystemPointer::ARROW; // change all views to the default cursor ID - std::for_each( maViewContainer.begin(), + std::for_each( maViewContainer.begin(), maViewContainer.end(), - boost::bind( &View::setCursorShape, - _1, + boost::bind( &View::setCursorShape, + _1, calcActiveCursor(mnCurrentCursor) )); } @@ -2054,23 +2054,23 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout ) if (isDisposed()) return false; - + // precondition: update() must only be called from the // main thread! DBG_TESTSOLARMUTEX(); - if( mbShowPaused ) + if( mbShowPaused ) { // commit frame (might be repaints pending) maScreenUpdater.commitUpdates(); return false; } - else + else { // TODO(F2): re-evaluate whether that timer lagging makes // sense. - + // hold timer, while processing the queues: // 1. when there is more than one active activity this ensures the // same time for all activities and events @@ -2112,7 +2112,7 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout ) // that to the next round, no updated static slide // content. In short, the last shape animation of a slide // tends to blink at its end. - + // process dequeued activities _after_ commit to screen maActivitiesQueue.processDequeued(); @@ -2120,15 +2120,15 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout ) maScreenUpdater.commitUpdates(); } // Time held until here - + const bool bActivitiesLeft = (! maActivitiesQueue.isEmpty()); const bool bTimerEventsLeft = (! maEventQueue.isEmpty()); const bool bRet = (bActivitiesLeft || bTimerEventsLeft); - - if (bRet) + + if (bRet) { // calc nNextTimeout value: - if (bActivitiesLeft) + if (bActivitiesLeft) { // Activity queue is not empty. Tell caller that we would // like to render another frame. @@ -2140,7 +2140,7 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout ) nNextTimeout = 0; maFrameSynchronization.Activate(); } - else + else { // timer events left: // difference from current time (nota bene: @@ -2181,7 +2181,7 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout ) uno::Reference< util::XUpdatable > xUpdatable( xView->getCanvas(), uno::UNO_QUERY_THROW ); xUpdatable->update(); - } + } catch( uno::RuntimeException& ) { throw; @@ -2200,7 +2200,7 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout ) mbSlideShowIdle = true; } #endif - + return bRet; } } @@ -2212,7 +2212,7 @@ void SlideShowImpl::notifySlideTransitionEnded( bool bPaintSlide ) OSL_ENSURE( !isDisposed(), "### already disposed!" ); OSL_ENSURE( mpCurrentSlide, "notifySlideTransitionEnded(): Invalid current slide" ); - if (mpCurrentSlide) + if (mpCurrentSlide) { // first init show, to give the animations // the chance to register SlideStartEvents @@ -2231,25 +2231,25 @@ void queryAutomaticSlideTransition( uno::Reference<drawing::XDrawPage> const& xD uno::Reference< beans::XPropertySet > xPropSet( xDrawPage, uno::UNO_QUERY ); - + sal_Int32 nChange(0); if( !xPropSet.is() || !getPropertyValue( nChange, xPropSet, - ::rtl::OUString( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Change"))) ) { OSL_TRACE( "queryAutomaticSlideTransition(): " "Could not extract slide change mode from XDrawPage - assuming <none>\n" ); } - + bHasAutomaticNextSlide = nChange == 1; if( !xPropSet.is() || !getPropertyValue( nAutomaticNextSlideTimeout, xPropSet, - ::rtl::OUString( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Duration"))) ) { OSL_TRACE( @@ -2265,29 +2265,29 @@ void SlideShowImpl::notifySlideAnimationsEnded() //Draw polygons above animations mpCurrentSlide->drawPolygons(); - + OSL_ENSURE( !isDisposed(), "### already disposed!" ); - + // This struct will receive the (interruptable) event, // that triggers the notifySlideEnded() method. InterruptableEventPair aNotificationEvents; - if( maEventMultiplexer.getAutomaticMode() ) + if( maEventMultiplexer.getAutomaticMode() ) { OSL_ENSURE( ! mpRehearseTimingsActivity, "unexpected: RehearseTimings mode!" ); - + // schedule a slide end event, with automatic mode's // delay aNotificationEvents = makeInterruptableDelay( boost::bind<void>( boost::mem_fn(&SlideShowImpl::notifySlideEnded), this, false ), maEventMultiplexer.getAutomaticTimeout() ); } - else + else { OSL_ENSURE( mpCurrentSlide, "notifySlideAnimationsEnded(): Invalid current slide!" ); - + bool bHasAutomaticNextSlide=false; double nAutomaticNextSlideTimeout=0.0; queryAutomaticSlideTransition(mpCurrentSlide->getXDrawPage(), @@ -2307,37 +2307,37 @@ void SlideShowImpl::notifySlideAnimationsEnded() aNotificationEvents = makeInterruptableDelay( boost::bind<void>( boost::mem_fn(&SlideShowImpl::notifySlideEnded), this, false ), nAutomaticNextSlideTimeout); - - // TODO(F2): Provide a mechanism to let the user override + + // TODO(F2): Provide a mechanism to let the user override // this automatic timeout via next() } - else + else { if (mpRehearseTimingsActivity) mpRehearseTimingsActivity->start(); - + // generate click event. Thus, the user must // trigger the actual end of a slide. No need to // generate interruptable event here, there's no // timeout involved. - aNotificationEvents.mpImmediateEvent = + aNotificationEvents.mpImmediateEvent = makeEvent( boost::bind<void>( boost::mem_fn(&SlideShowImpl::notifySlideEnded), this, false ), "SlideShowImpl::notifySlideEnded"); } } - + // register events on the queues. To make automatic slide // changes interruptable, register the interruption event // as a nextEffectEvent target. Note that the timeout // event is optional (e.g. manual slide changes don't - // generate a timeout) + // generate a timeout) maUserEventQueue.registerNextEffectEvent( aNotificationEvents.mpImmediateEvent ); - + if( aNotificationEvents.mpTimeoutEvent ) maEventQueue.addEvent( aNotificationEvents.mpTimeoutEvent ); - + // current slide's main sequence is over. Now should be // the time to prefetch the next slide (if any), and // prepare the initial slide bitmap (speeds up slide @@ -2345,14 +2345,14 @@ void SlideShowImpl::notifySlideAnimationsEnded() // indeed might take some seconds. { WaitSymbolLock aLock (*this); - + if (! matches( mpPrefetchSlide, - mxPrefetchSlide, mxPrefetchAnimationNode )) + mxPrefetchSlide, mxPrefetchAnimationNode )) { mpPrefetchSlide = makeSlide( mxPrefetchSlide, mxDrawPagesSupplier, mxPrefetchAnimationNode ); } - if (mpPrefetchSlide) + if (mpPrefetchSlide) { // ignore return value, this is just to populate // Slide's internal bitmap buffer, such that the time @@ -2371,17 +2371,17 @@ void SlideShowImpl::notifySlideEnded (const bool bReverse) osl::MutexGuard const guard( m_aMutex ); OSL_ENSURE( !isDisposed(), "### already disposed!" ); - - if (mpRehearseTimingsActivity && !bReverse) + + if (mpRehearseTimingsActivity && !bReverse) { const double time = mpRehearseTimingsActivity->stop(); - if (mpRehearseTimingsActivity->hasBeenClicked()) + if (mpRehearseTimingsActivity->hasBeenClicked()) { // save time at current drawpage: uno::Reference<beans::XPropertySet> xPropSet( mpCurrentSlide->getXDrawPage(), uno::UNO_QUERY ); OSL_ASSERT( xPropSet.is() ); - if (xPropSet.is()) + if (xPropSet.is()) { xPropSet->setPropertyValue( OUSTR("Change"), @@ -2395,7 +2395,7 @@ void SlideShowImpl::notifySlideEnded (const bool bReverse) if (bReverse) maEventMultiplexer.notifySlideEndEvent(); - + stopShow(); // MUST call that: results in // maUserEventQueue.clear(). What's more, // stopShow()'s currSlide->hide() call is @@ -2418,7 +2418,7 @@ bool SlideShowImpl::notifyHyperLinkClicked( rtl::OUString const& hyperLink ) maListenerContainer.forEach<presentation::XSlideShowListener>( boost::bind( &presentation::XSlideShowListener::hyperLinkClicked, - _1, + _1, boost::cref(hyperLink) )); return true; } @@ -2437,15 +2437,15 @@ bool SlideShowImpl::handleAnimationEvent( const AnimationNodeSharedPtr& rNode ) case AnimationNode::ACTIVE: maListenerContainer.forEach<presentation::XSlideShowListener>( boost::bind( &animations::XAnimationListener::beginEvent, - _1, + _1, boost::cref(xNode) )); break; - + case AnimationNode::FROZEN: case AnimationNode::ENDED: maListenerContainer.forEach<presentation::XSlideShowListener>( boost::bind( &animations::XAnimationListener::endEvent, - _1, + _1, boost::cref(xNode) )); if(mpCurrentSlide->isPaintOverlayActive()) mpCurrentSlide->drawPolygons(); diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx index 9573f3c29a3d..fb1c7223f6d8 100644 --- a/slideshow/source/engine/slideview.cxx +++ b/slideshow/source/engine/slideview.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -155,7 +155,7 @@ basegfx::B2DPolyPolygon createClipPolygon( const basegfx::B2DPolyPolygon& rCl (createClipPolygon() has to be called every time the view size changes) */ -basegfx::B2DPolyPolygon prepareClip( const basegfx::B2DPolyPolygon& rClip ) +basegfx::B2DPolyPolygon prepareClip( const basegfx::B2DPolyPolygon& rClip ) { basegfx::B2DPolyPolygon aClip( rClip ); @@ -163,14 +163,14 @@ basegfx::B2DPolyPolygon prepareClip( const basegfx::B2DPolyPolygon& rClip ) // AW: Should be no longer necessary; tools are now bezier-safe if( aClip.areControlPointsUsed() ) aClip = basegfx::tools::adaptiveSubdivideByAngle( aClip ); - + // normalize polygon, preparation for clipping // in updateCanvas() aClip = basegfx::tools::correctOrientations(aClip); aClip = basegfx::tools::solveCrossovers(aClip); aClip = basegfx::tools::stripNeutralPolygons(aClip); aClip = basegfx::tools::stripDispensablePolygons(aClip, false); - + return aClip; } @@ -199,8 +199,8 @@ void clearRect( ::cppcanvas::CanvasSharedPtr const& pCanvas, ::basegfx::tools::createPolygonFromRect( basegfx::B2DRange(rArea))); - ::cppcanvas::PolyPolygonSharedPtr pPolyPoly( - ::cppcanvas::BaseGfxFactory::getInstance().createPolyPolygon( pCanvas, + ::cppcanvas::PolyPolygonSharedPtr pPolyPoly( + ::cppcanvas::BaseGfxFactory::getInstance().createPolyPolygon( pCanvas, aPoly ) ); if( pPolyPoly ) @@ -217,7 +217,7 @@ void clearRect( ::cppcanvas::CanvasSharedPtr const& pCanvas, if( pCanvas->getClip() ) { ::cppcanvas::PolyPolygonSharedPtr pPolyPoly2( - ::cppcanvas::BaseGfxFactory::getInstance().createPolyPolygon( pCliplessCanvas, + ::cppcanvas::BaseGfxFactory::getInstance().createPolyPolygon( pCliplessCanvas, *(pCanvas->getClip()) )); if( pPolyPoly2 ) { @@ -243,16 +243,16 @@ basegfx::B2IRange getLayerBoundsPixel( basegfx::B2DRange const& rLayerBounds basegfx::B2DHomMatrix const& rTransformation ) { ::basegfx::B2DRange aTmpRect; - ::canvas::tools::calcTransformedRectBounds( aTmpRect, - rLayerBounds, + ::canvas::tools::calcTransformedRectBounds( aTmpRect, + rLayerBounds, rTransformation ); if( aTmpRect.isEmpty() ) return ::basegfx::B2IRange(); - // #i42440# Returned layer size is one pixel too small, as - // rendering happens one pixel to the right and below the - // actual bound rect. + // #i42440# Returned layer size is one pixel too small, as + // rendering happens one pixel to the right and below the + // actual bound rect. return ::basegfx::B2IRange( ::basegfx::fround(aTmpRect.getMinX()), ::basegfx::fround(aTmpRect.getMinY()), ::basegfx::fround(aTmpRect.getMaxX()) + 1, @@ -312,14 +312,14 @@ class LayerSpriteContainer while( aCurrSprite != aEnd ) { cppcanvas::CustomSpriteSharedPtr pCurrSprite( aCurrSprite->mpSprite.lock() ); - + if( pCurrSprite ) { // only copy still valid sprites over to the refreshed // sprite vector. aValidSprites.push_back( *aCurrSprite ); - pCurrSprite->setPriority( + pCurrSprite->setPriority( getSpritePriority( aValidSprites.size()-1 )); } @@ -383,7 +383,7 @@ public: // prio). This basically caters for the common case of // iterated character animations, which generate lots of // sprites, all added to the end. - pSprite->setPriority( + pSprite->setPriority( getSpritePriority( nNumSprites-1 )); } } @@ -410,7 +410,7 @@ public: the layer priority changes, the sprites change z order together with their parent. */ -class SlideViewLayer : public ViewLayer, +class SlideViewLayer : public ViewLayer, private boost::noncopyable { /// Smart container for all sprites issued by this layer @@ -424,7 +424,7 @@ class SlideViewLayer : public ViewLayer, /// Current clip polygon in user coordinates basegfx::B2DPolyPolygon maClip; - + /// Current size of the view in user coordinates basegfx::B2DSize maUserSize; @@ -441,7 +441,7 @@ class SlideViewLayer : public ViewLayer, /// actual output canvas retrieved from a sprite mutable cppcanvas::CanvasSharedPtr mpOutputCanvas; - + /// ptr back to owning view. needed for isOnView() method View const* const mpParentView; @@ -472,7 +472,7 @@ public: mpSprite(), mpOutputCanvas(), mpParentView(pParentView) - { + { } void updateView( const basegfx::B2DHomMatrix& rMatrix, @@ -533,8 +533,8 @@ private: // Offset given transformation by left, top border of given // range (after transformation through given transformation) basegfx::B2DRectangle aTmpRect; - canvas::tools::calcTransformedRectBounds( aTmpRect, - maLayerBounds, + canvas::tools::calcTransformedRectBounds( aTmpRect, + maLayerBounds, maTransformation ); basegfx::B2DHomMatrix aMatrix( maTransformation ); @@ -600,40 +600,40 @@ private: basegfx::B2DVector(sal::static_int_cast<sal_Int32>(rSpriteSize.getX()), sal::static_int_cast<sal_Int32>(rSpriteSize.getY())) ); - mpSprite->setPriority( + mpSprite->setPriority( maSpriteContainer.getLayerPriority().getMinimum() ); #if defined(VERBOSE) && defined(DBG_UTIL) - mpSprite->movePixel( - basegfx::B2DPoint(maLayerBoundsPixel.getMinimum()) + + mpSprite->movePixel( + basegfx::B2DPoint(maLayerBoundsPixel.getMinimum()) + basegfx::B2DPoint(10,10) ); - mpSprite->setAlpha(0.5); + mpSprite->setAlpha(0.5); #else - mpSprite->movePixel( + mpSprite->movePixel( basegfx::B2DPoint(maLayerBoundsPixel.getMinimum()) ); - mpSprite->setAlpha(1.0); + mpSprite->setAlpha(1.0); #endif - mpSprite->show(); + mpSprite->show(); } ENSURE_OR_THROW( mpSprite, "SlideViewLayer::getCanvas(): no layer sprite" ); mpOutputCanvas = mpSprite->getContentCanvas(); - + ENSURE_OR_THROW( mpOutputCanvas, "SlideViewLayer::getCanvas(): sprite doesn't yield a canvas" ); // new canvas retrieved - setup transformation and clip mpOutputCanvas->setTransformation( getTransformation() ); - mpOutputCanvas->setClip( + mpOutputCanvas->setClip( createClipPolygon( maClip, mpOutputCanvas, maUserSize )); } - + return mpOutputCanvas; } @@ -646,7 +646,7 @@ private: maClip = aNewClip; if(mpOutputCanvas ) - mpOutputCanvas->setClip( + mpOutputCanvas->setClip( createClipPolygon( maClip, mpOutputCanvas, maUserSize )); @@ -668,7 +668,7 @@ private: // --------------------------------------------------------- typedef cppu::WeakComponentImplHelper2< - ::com::sun::star::util::XModifyListener, + ::com::sun::star::util::XModifyListener, ::com::sun::star::awt::XPaintListener> SlideViewBase; /** SlideView class @@ -728,7 +728,7 @@ private: void updateClip(); -private: +private: typedef std::vector< boost::weak_ptr<SlideViewLayer> > ViewLayerVector; /// Prune viewlayers from deceased ones, optionally update them @@ -741,15 +741,15 @@ private: uno::Reference<presentation::XSlideShowView> mxView; cppcanvas::SpriteCanvasSharedPtr mpCanvas; - + EventMultiplexer& mrEventMultiplexer; EventQueue& mrEventQueue; mutable LayerSpriteContainer maSprites; - mutable ViewLayerVector maViewLayers; + mutable ViewLayerVector maViewLayers; basegfx::B2DPolyPolygon maClip; - + basegfx::B2DHomMatrix maViewTransform; basegfx::B2DSize maUserSize; bool mbIsSoundEnabled; @@ -768,19 +768,19 @@ SlideView::SlideView( const uno::Reference<presentation::XSlideShowView>& xView, maViewLayers(), maClip(), maViewTransform(), - maUserSize( 1.0, 1.0 ), // default size: one-by-one rectangle + maUserSize( 1.0, 1.0 ), // default size: one-by-one rectangle mbIsSoundEnabled(true) { // take care not constructing any UNO references to this _inside_ - // ctor, shift that code to createSlideView()! + // ctor, shift that code to createSlideView()! ENSURE_OR_THROW( mxView.is(), "SlideView::SlideView(): Invalid view" ); - + mpCanvas = cppcanvas::VCLFactory::getInstance().createSpriteCanvas( xView->getCanvas() ); - ENSURE_OR_THROW( mpCanvas, + ENSURE_OR_THROW( mpCanvas, "Could not create cppcanvas" ); - + geometry::AffineMatrix2D aViewTransform( xView->getTransformation() ); @@ -791,12 +791,12 @@ SlideView::SlideView( const uno::Reference<presentation::XSlideShowView>& xView, basegfx::B2DVector(aViewTransform.m01, aViewTransform.m11).getLength()) ) { - OSL_ENSURE( false, + OSL_ENSURE( false, "SlideView::SlideView(): Singular matrix!" ); canvas::tools::setIdentityAffineMatrix2D(aViewTransform); } - + basegfx::unotools::homMatrixFromAffineMatrix( maViewTransform, aViewTransform ); @@ -814,7 +814,7 @@ void SlideView::disposing() mpCanvas.reset(); // additionally, also de-register from XSlideShowView - if (mxView.is()) + if (mxView.is()) { mxView->removeTransformationChangedListener( this ); mxView->removePaintListener( this ); @@ -826,7 +826,7 @@ ViewLayerSharedPtr SlideView::createViewLayer( const basegfx::B2DRange& rLayerBo { osl::MutexGuard aGuard( m_aMutex ); - ENSURE_OR_THROW( mpCanvas, + ENSURE_OR_THROW( mpCanvas, "SlideView::createViewLayer(): Disposed" ); const std::size_t nNumLayers( maViewLayers.size() ); @@ -870,7 +870,7 @@ void SlideView::clear() const { osl::MutexGuard aGuard( m_aMutex ); - OSL_ENSURE( mxView.is() && mpCanvas, + OSL_ENSURE( mxView.is() && mpCanvas, "SlideView::clear(): Disposed" ); if( !mxView.is() || !mpCanvas ) return; @@ -888,7 +888,7 @@ void SlideView::clearAll() const { osl::MutexGuard aGuard( m_aMutex ); - OSL_ENSURE( mxView.is() && mpCanvas, + OSL_ENSURE( mxView.is() && mpCanvas, "SlideView::clear(): Disposed" ); if( !mxView.is() || !mpCanvas ) return; @@ -922,7 +922,7 @@ cppcanvas::CanvasSharedPtr SlideView::getCanvas() const { osl::MutexGuard aGuard( m_aMutex ); - ENSURE_OR_THROW( mpCanvas, + ENSURE_OR_THROW( mpCanvas, "SlideView::getCanvas(): Disposed" ); return mpCanvas; @@ -930,7 +930,7 @@ cppcanvas::CanvasSharedPtr SlideView::getCanvas() const cppcanvas::CustomSpriteSharedPtr SlideView::createSprite( const basegfx::B2DSize& rSpriteSizePixel, - double nPriority ) const + double nPriority ) const { osl::MutexGuard aGuard( m_aMutex ); @@ -974,11 +974,11 @@ void SlideView::setClip( const basegfx::B2DPolyPolygon& rClip ) osl::MutexGuard aGuard( m_aMutex ); basegfx::B2DPolyPolygon aNewClip = prepareClip( rClip ); - + if( aNewClip != maClip ) { - maClip = aNewClip; - + maClip = aNewClip; + updateClip(); } } @@ -1024,7 +1024,7 @@ void SlideView::disposing( lang::EventObject const& evt ) // no deregistration necessary anymore, XView has left: osl::MutexGuard const guard( m_aMutex ); - if (mxView.is()) + if (mxView.is()) { OSL_ASSERT( evt.Source == mxView ); mxView.clear(); @@ -1044,7 +1044,7 @@ void SlideView::modified( const lang::EventObject& /*aEvent*/ ) if( !mxView.is() ) return; - + geometry::AffineMatrix2D aViewTransform( mxView->getTransformation() ); @@ -1055,25 +1055,25 @@ void SlideView::modified( const lang::EventObject& /*aEvent*/ ) basegfx::B2DVector(aViewTransform.m01, aViewTransform.m11).getLength()) ) { - OSL_ENSURE( false, + OSL_ENSURE( false, "SlideView::modified(): Singular matrix!" ); canvas::tools::setIdentityAffineMatrix2D(aViewTransform); } - + // view transformation really changed? basegfx::B2DHomMatrix aNewTransform; basegfx::unotools::homMatrixFromAffineMatrix( - aNewTransform, + aNewTransform, aViewTransform ); if( aNewTransform == maViewTransform ) return; // No change, nothing to do - + maViewTransform = aNewTransform; updateCanvas(); - + // notify view change. Don't call EventMultiplexer directly, this // might not be the main thread! mrEventQueue.addEvent( @@ -1091,7 +1091,7 @@ void SlideView::windowPaint( const awt::PaintEvent& /*e*/ ) osl::MutexGuard aGuard( m_aMutex ); OSL_ENSURE( mxView.is() && mpCanvas, "Disposed, but event received?!" ); - + // notify view clobbering. Don't call EventMultiplexer directly, // this might not be the main thread! mrEventQueue.addEvent( @@ -1102,19 +1102,19 @@ void SlideView::windowPaint( const awt::PaintEvent& /*e*/ ) void SlideView::updateCanvas() { - OSL_ENSURE( mpCanvas, + OSL_ENSURE( mpCanvas, "SlideView::updateCanvasTransform(): Disposed" ); if( !mpCanvas || !mxView.is()) return; - + mpCanvas->clear(); // this is unnecessary, strictly speaking. but // it makes the SlideView behave exactly like a // sprite-based SlideViewLayer, because those // are created from scratch after a resize clearAll(); mpCanvas->setTransformation( getTransformation() ); - mpCanvas->setClip( + mpCanvas->setClip( createClipPolygon( maClip, mpCanvas, maUserSize )); @@ -1125,13 +1125,13 @@ void SlideView::updateCanvas() void SlideView::updateClip() { - OSL_ENSURE( mpCanvas, + OSL_ENSURE( mpCanvas, "SlideView::updateClip(): Disposed" ); if( !mpCanvas ) return; - - mpCanvas->setClip( + + mpCanvas->setClip( createClipPolygon( maClip, mpCanvas, maUserSize )); @@ -1143,7 +1143,7 @@ void SlideView::pruneLayers( bool bWithViewLayerUpdate ) const { ViewLayerVector aValidLayers; - const basegfx::B2DHomMatrix& rCurrTransform( + const basegfx::B2DHomMatrix& rCurrTransform( getTransformation() ); // check all layers for validity, and retain only the live ones @@ -1152,11 +1152,11 @@ void SlideView::pruneLayers( bool bWithViewLayerUpdate ) const while( aCurr != aEnd ) { boost::shared_ptr< SlideViewLayer > pCurrLayer( aCurr->lock() ); - + if( pCurrLayer ) { aValidLayers.push_back( pCurrLayer ); - + if( bWithViewLayerUpdate ) pCurrLayer->updateView( rCurrTransform, maUserSize ); @@ -1177,17 +1177,17 @@ UnoViewSharedPtr createSlideView( uno::Reference< presentation::XSlideShowView> { boost::shared_ptr<SlideView> const that( comphelper::make_shared_from_UNO( - new SlideView(xView, + new SlideView(xView, rEventQueue, rEventMultiplexer))); // register listeners with XSlideShowView xView->addTransformationChangedListener( that.get() ); xView->addPaintListener( that.get() ); - + // set new transformation that->updateCanvas(); - + return that; } diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx index aad23327719d..27bc8ec5f0f5 100644 --- a/slideshow/source/engine/smilfunctionparser.cxx +++ b/slideshow/source/engine/smilfunctionparser.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/point/b2dpoint.hxx> -// Makes parser a static resource, +// Makes parser a static resource, // we're synchronized externally. // But watch out, the parser might have // state not visible to this code! @@ -71,7 +71,7 @@ namespace slideshow { namespace { - typedef const sal_Char* StringIteratorT; + typedef const sal_Char* StringIteratorT; struct ParserContext { @@ -82,14 +82,14 @@ namespace slideshow // arguments from. If all arguments to an operator are constant, // the operator pushes a precalculated result on the stack, and // a composite ExpressionNode otherwise. - OperandStack maOperandStack; + OperandStack maOperandStack; // bounds of the shape this expression is associated with - ::basegfx::B2DRectangle maShapeBounds; + ::basegfx::B2DRectangle maShapeBounds; - // when true, enable usage of time-dependent variable '$' + // when true, enable usage of time-dependent variable '$' // in expressions - bool mbParseAnimationFunction; + bool mbParseAnimationFunction; }; typedef ::boost::shared_ptr< ParserContext > ParserContextSharedPtr; @@ -98,8 +98,8 @@ namespace slideshow template< typename Generator > class ShapeBoundsFunctor { public: - ShapeBoundsFunctor( Generator aGenerator, - const ParserContextSharedPtr& rContext ) : + ShapeBoundsFunctor( Generator aGenerator, + const ParserContextSharedPtr& rContext ) : maGenerator( aGenerator ), mpContext( rContext ) { @@ -109,19 +109,19 @@ namespace slideshow void operator()( StringIteratorT, StringIteratorT ) const { - mpContext->maOperandStack.push( - ExpressionNodeFactory::createConstantValueExpression( + mpContext->maOperandStack.push( + ExpressionNodeFactory::createConstantValueExpression( maGenerator( mpContext->maShapeBounds ) ) ); } private: - Generator maGenerator; - ParserContextSharedPtr mpContext; + Generator maGenerator; + ParserContextSharedPtr mpContext; }; - template< typename Generator > ShapeBoundsFunctor< Generator > - makeShapeBoundsFunctor( const Generator& rGenerator, - const ParserContextSharedPtr& rContext ) + template< typename Generator > ShapeBoundsFunctor< Generator > + makeShapeBoundsFunctor( const Generator& rGenerator, + const ParserContextSharedPtr& rContext ) { return ShapeBoundsFunctor<Generator>(rGenerator, rContext); } @@ -131,8 +131,8 @@ namespace slideshow class ConstantFunctor { public: - ConstantFunctor( double rValue, - const ParserContextSharedPtr& rContext ) : + ConstantFunctor( double rValue, + const ParserContextSharedPtr& rContext ) : mnValue( rValue ), mpContext( rContext ) { @@ -142,13 +142,13 @@ namespace slideshow void operator()( StringIteratorT, StringIteratorT ) const { - mpContext->maOperandStack.push( + mpContext->maOperandStack.push( ExpressionNodeFactory::createConstantValueExpression( mnValue ) ); } private: - const double mnValue; - ParserContextSharedPtr mpContext; + const double mnValue; + ParserContextSharedPtr mpContext; }; /** Generate parse-dependent-but-then-constant value @@ -166,12 +166,12 @@ namespace slideshow void operator()( double n ) const { // push constant value expression to the stack - mpContext->maOperandStack.push( + mpContext->maOperandStack.push( ExpressionNodeFactory::createConstantValueExpression( n ) ); } private: - ParserContextSharedPtr mpContext; + ParserContextSharedPtr mpContext; }; /** Generate special t value expression node @@ -196,12 +196,12 @@ namespace slideshow } // push special t value expression to the stack - mpContext->maOperandStack.push( + mpContext->maOperandStack.push( ExpressionNodeFactory::createValueTExpression() ); } private: - ParserContextSharedPtr mpContext; + ParserContextSharedPtr mpContext; }; template< typename Functor > class UnaryFunctionFunctor @@ -213,8 +213,8 @@ namespace slideshow class UnaryFunctionExpression : public ExpressionNode { public: - UnaryFunctionExpression( const Functor& rFunctor, - const ExpressionNodeSharedPtr& rArg ) : + UnaryFunctionExpression( const Functor& rFunctor, + const ExpressionNodeSharedPtr& rArg ) : maFunctor( rFunctor ), mpArg( rArg ) { @@ -224,20 +224,20 @@ namespace slideshow { return maFunctor( (*mpArg)(t) ); } - + virtual bool isConstant() const { return mpArg->isConstant(); } private: - Functor maFunctor; - ExpressionNodeSharedPtr mpArg; + Functor maFunctor; + ExpressionNodeSharedPtr mpArg; }; public: - UnaryFunctionFunctor( const Functor& rFunctor, - const ParserContextSharedPtr& rContext ) : + UnaryFunctionFunctor( const Functor& rFunctor, + const ParserContextSharedPtr& rContext ) : maFunctor( rFunctor ), mpContext( rContext ) { @@ -259,24 +259,24 @@ namespace slideshow // check for constness if( pArg->isConstant() ) { - rNodeStack.push( + rNodeStack.push( ExpressionNodeFactory::createConstantValueExpression( maFunctor( (*pArg)(0.0) ) ) ); } else { // push complex node, that calcs the value on demand - rNodeStack.push( + rNodeStack.push( ExpressionNodeSharedPtr( - new UnaryFunctionExpression( + new UnaryFunctionExpression( maFunctor, pArg ) ) ); } } private: - Functor maFunctor; - ParserContextSharedPtr mpContext; + Functor maFunctor; + ParserContextSharedPtr mpContext; }; // TODO(Q2): Refactor makeUnaryFunctionFunctor, @@ -284,19 +284,19 @@ namespace slideshow // ExpressionNodeFactory, to use a generic // makeFunctionFunctor template, which is overloaded for // unary, binary, ternary, etc. function pointers. - template< typename Functor > UnaryFunctionFunctor<Functor> - makeUnaryFunctionFunctor( const Functor& rFunctor, - const ParserContextSharedPtr& rContext ) + template< typename Functor > UnaryFunctionFunctor<Functor> + makeUnaryFunctionFunctor( const Functor& rFunctor, + const ParserContextSharedPtr& rContext ) { return UnaryFunctionFunctor<Functor>( rFunctor, rContext ); } - // MSVC has problems instantiating above template function with plain function + // MSVC has problems instantiating above template function with plain function // pointers (doesn't like the const reference there). Thus, provide it with // a dedicated overload here. - UnaryFunctionFunctor< double (*)(double) > + UnaryFunctionFunctor< double (*)(double) > makeUnaryFunctionFunctor( double (*pFunc)(double), - const ParserContextSharedPtr& rContext ) + const ParserContextSharedPtr& rContext ) { return UnaryFunctionFunctor< double (*)(double) >( pFunc, rContext ); } @@ -306,13 +306,13 @@ namespace slideshow @tpl Generator Generator functor, to generate an ExpressionNode of appropriate type - + */ template< class Generator > class BinaryFunctionFunctor { public: - BinaryFunctionFunctor( const Generator& rGenerator, - const ParserContextSharedPtr& rContext ) : + BinaryFunctionFunctor( const Generator& rGenerator, + const ParserContextSharedPtr& rContext ) : maGenerator( rGenerator ), mpContext( rContext ) { @@ -342,7 +342,7 @@ namespace slideshow { // call the operator() at pNode, store result // in constant value ExpressionNode. - rNodeStack.push( + rNodeStack.push( ExpressionNodeFactory::createConstantValueExpression( (*pNode)( 0.0 ) ) ); } @@ -354,13 +354,13 @@ namespace slideshow } private: - Generator maGenerator; - ParserContextSharedPtr mpContext; + Generator maGenerator; + ParserContextSharedPtr mpContext; }; - template< typename Generator > BinaryFunctionFunctor<Generator> - makeBinaryFunctionFunctor( const Generator& rGenerator, - const ParserContextSharedPtr& rContext ) + template< typename Generator > BinaryFunctionFunctor<Generator> + makeBinaryFunctionFunctor( const Generator& rGenerator, + const ParserContextSharedPtr& rContext ) { return BinaryFunctionFunctor<Generator>( rGenerator, rContext ); } @@ -368,13 +368,13 @@ namespace slideshow // Workaround for MSVC compiler anomaly (stack trashing) // - // The default ureal_parser_policies implementation of parse_exp - // triggers a really weird error in MSVC7 (Version 13.00.9466), in - // that the real_parser_impl::parse_main() call of parse_exp() + // The default ureal_parser_policies implementation of parse_exp + // triggers a really weird error in MSVC7 (Version 13.00.9466), in + // that the real_parser_impl::parse_main() call of parse_exp() // overwrites the frame pointer _on the stack_ (EBP of the calling - // function gets overwritten while lying on the stack). + // function gets overwritten while lying on the stack). // - // For the time being, our parser thus can only read the 1.0E10 + // For the time being, our parser thus can only read the 1.0E10 // notation, not the 1.0e10 one. // // TODO(F1): Also handle the 1.0e10 case here. @@ -383,9 +383,9 @@ namespace slideshow template< typename ScannerT > static typename ::boost::spirit::parser_result< ::boost::spirit::chlit<>, ScannerT >::type parse_exp(ScannerT& scan) - { + { // as_lower_d somehow breaks MSVC7 - return ::boost::spirit::ch_p('E').parse(scan); + return ::boost::spirit::ch_p('E').parse(scan); } }; @@ -393,27 +393,27 @@ namespace slideshow less literally written down below, only slightly obfuscated by the parser actions): - identifier = '$'|'pi'|'e'|'X'|'Y'|'Width'|'Height' - + identifier = '$'|'pi'|'e'|'X'|'Y'|'Width'|'Height' + function = 'abs'|'sqrt'|'sin'|'cos'|'tan'|'atan'|'acos'|'asin'|'exp'|'log' - basic_expression = - number | - identifier | - function '(' additive_expression ')' | - '(' additive_expression ')' - - unary_expression = + basic_expression = + number | + identifier | + function '(' additive_expression ')' | + '(' additive_expression ')' + + unary_expression = '-' basic_expression | basic_expression - - multiplicative_expression = - unary_expression ( ( '*' unary_expression )* | + + multiplicative_expression = + unary_expression ( ( '*' unary_expression )* | ( '/' unary_expression )* ) - - additive_expression = - multiplicative_expression ( ( '+' multiplicative_expression )* | - ( '-' multiplicative_expression )* ) + + additive_expression = + multiplicative_expression ( ( '+' multiplicative_expression )* | + ( '-' multiplicative_expression )* ) */ class ExpressionGrammar : public ::boost::spirit::grammar< ExpressionGrammar > @@ -439,54 +439,54 @@ namespace slideshow using ::boost::spirit::real_parser; identifier = - str_p( "$" )[ ValueTFunctor( self.getContext()) ] - | str_p( "pi" )[ ConstantFunctor(M_PI, self.getContext()) ] - | str_p( "e" )[ ConstantFunctor(M_E, self.getContext()) ] - | str_p( "x" )[ makeShapeBoundsFunctor(::std::mem_fun_ref(&::basegfx::B2DRange::getCenterX),self.getContext()) ] - | str_p( "y" )[ makeShapeBoundsFunctor(::std::mem_fun_ref(&::basegfx::B2DRange::getCenterY),self.getContext()) ] - | str_p( "width" )[ makeShapeBoundsFunctor(::std::mem_fun_ref(&::basegfx::B2DRange::getWidth), self.getContext()) ] - | str_p( "height" )[ makeShapeBoundsFunctor(::std::mem_fun_ref(&::basegfx::B2DRange::getHeight), self.getContext()) ] + str_p( "$" )[ ValueTFunctor( self.getContext()) ] + | str_p( "pi" )[ ConstantFunctor(M_PI, self.getContext()) ] + | str_p( "e" )[ ConstantFunctor(M_E, self.getContext()) ] + | str_p( "x" )[ makeShapeBoundsFunctor(::std::mem_fun_ref(&::basegfx::B2DRange::getCenterX),self.getContext()) ] + | str_p( "y" )[ makeShapeBoundsFunctor(::std::mem_fun_ref(&::basegfx::B2DRange::getCenterY),self.getContext()) ] + | str_p( "width" )[ makeShapeBoundsFunctor(::std::mem_fun_ref(&::basegfx::B2DRange::getWidth), self.getContext()) ] + | str_p( "height" )[ makeShapeBoundsFunctor(::std::mem_fun_ref(&::basegfx::B2DRange::getHeight), self.getContext()) ] ; - - unaryFunction = + + unaryFunction = (str_p( "abs" ) >> '(' >> additiveExpression >> ')' )[ makeUnaryFunctionFunctor(&fabs, self.getContext()) ] - | (str_p( "sqrt" ) >> '(' >> additiveExpression >> ')' )[ makeUnaryFunctionFunctor(&sqrt, self.getContext()) ] - | (str_p( "sin" ) >> '(' >> additiveExpression >> ')' )[ makeUnaryFunctionFunctor(&sin, self.getContext()) ] - | (str_p( "cos" ) >> '(' >> additiveExpression >> ')' )[ makeUnaryFunctionFunctor(&cos, self.getContext()) ] - | (str_p( "tan" ) >> '(' >> additiveExpression >> ')' )[ makeUnaryFunctionFunctor(&tan, self.getContext()) ] - | (str_p( "atan" ) >> '(' >> additiveExpression >> ')' )[ makeUnaryFunctionFunctor(&atan, self.getContext()) ] - | (str_p( "acos" ) >> '(' >> additiveExpression >> ')' )[ makeUnaryFunctionFunctor(&acos, self.getContext()) ] - | (str_p( "asin" ) >> '(' >> additiveExpression >> ')' )[ makeUnaryFunctionFunctor(&asin, self.getContext()) ] - | (str_p( "exp" ) >> '(' >> additiveExpression >> ')' )[ makeUnaryFunctionFunctor(&exp, self.getContext()) ] - | (str_p( "log" ) >> '(' >> additiveExpression >> ')' )[ makeUnaryFunctionFunctor(&log, self.getContext()) ] + | (str_p( "sqrt" ) >> '(' >> additiveExpression >> ')' )[ makeUnaryFunctionFunctor(&sqrt, self.getContext()) ] + | (str_p( "sin" ) >> '(' >> additiveExpression >> ')' )[ makeUnaryFunctionFunctor(&sin, self.getContext()) ] + | (str_p( "cos" ) >> '(' >> additiveExpression >> ')' )[ makeUnaryFunctionFunctor(&cos, self.getContext()) ] + | (str_p( "tan" ) >> '(' >> additiveExpression >> ')' )[ makeUnaryFunctionFunctor(&tan, self.getContext()) ] + | (str_p( "atan" ) >> '(' >> additiveExpression >> ')' )[ makeUnaryFunctionFunctor(&atan, self.getContext()) ] + | (str_p( "acos" ) >> '(' >> additiveExpression >> ')' )[ makeUnaryFunctionFunctor(&acos, self.getContext()) ] + | (str_p( "asin" ) >> '(' >> additiveExpression >> ')' )[ makeUnaryFunctionFunctor(&asin, self.getContext()) ] + | (str_p( "exp" ) >> '(' >> additiveExpression >> ')' )[ makeUnaryFunctionFunctor(&exp, self.getContext()) ] + | (str_p( "log" ) >> '(' >> additiveExpression >> ')' )[ makeUnaryFunctionFunctor(&log, self.getContext()) ] ; - binaryFunction = + binaryFunction = (str_p( "min" ) >> '(' >> additiveExpression >> ',' >> additiveExpression >> ')' )[ makeBinaryFunctionFunctor(&ExpressionNodeFactory::createMinExpression, self.getContext()) ] - | (str_p( "max" ) >> '(' >> additiveExpression >> ',' >> additiveExpression >> ')' )[ makeBinaryFunctionFunctor(&ExpressionNodeFactory::createMaxExpression, self.getContext()) ] + | (str_p( "max" ) >> '(' >> additiveExpression >> ',' >> additiveExpression >> ')' )[ makeBinaryFunctionFunctor(&ExpressionNodeFactory::createMaxExpression, self.getContext()) ] ; - basicExpression = + basicExpression = real_parser<double, custom_real_parser_policies<double> >()[ DoubleConstantFunctor(self.getContext()) ] - | identifier - | unaryFunction - | binaryFunction - | '(' >> additiveExpression >> ')' + | identifier + | unaryFunction + | binaryFunction + | '(' >> additiveExpression >> ')' ; - - unaryExpression = + + unaryExpression = ('-' >> basicExpression)[ makeUnaryFunctionFunctor(::std::negate<double>(), self.getContext()) ] - | basicExpression + | basicExpression ; - multiplicativeExpression = + multiplicativeExpression = unaryExpression >> *( ('*' >> unaryExpression)[ makeBinaryFunctionFunctor(&ExpressionNodeFactory::createMultipliesExpression, self.getContext()) ] | ('/' >> unaryExpression)[ makeBinaryFunctionFunctor(&ExpressionNodeFactory::createDividesExpression, self.getContext()) ] ) ; - additiveExpression = + additiveExpression = multiplicativeExpression >> *( ('+' >> multiplicativeExpression)[ makeBinaryFunctionFunctor(&ExpressionNodeFactory::createPlusExpression, self.getContext()) ] | ('-' >> multiplicativeExpression)[ makeBinaryFunctionFunctor(&ExpressionNodeFactory::createMinusExpression, self.getContext()) ] @@ -506,18 +506,18 @@ namespace slideshow { return additiveExpression; } - + private: - // the constituents of the Spirit arithmetic expression grammar. + // the constituents of the Spirit arithmetic expression grammar. // For the sake of readability, without 'ma' prefix. - ::boost::spirit::rule< ScannerT > additiveExpression; - ::boost::spirit::rule< ScannerT > multiplicativeExpression; - ::boost::spirit::rule< ScannerT > unaryExpression; - ::boost::spirit::rule< ScannerT > basicExpression; - ::boost::spirit::rule< ScannerT > unaryFunction; - ::boost::spirit::rule< ScannerT > binaryFunction; - ::boost::spirit::rule< ScannerT > identifier; - }; + ::boost::spirit::rule< ScannerT > additiveExpression; + ::boost::spirit::rule< ScannerT > multiplicativeExpression; + ::boost::spirit::rule< ScannerT > unaryExpression; + ::boost::spirit::rule< ScannerT > basicExpression; + ::boost::spirit::rule< ScannerT > unaryFunction; + ::boost::spirit::rule< ScannerT > binaryFunction; + ::boost::spirit::rule< ScannerT > identifier; + }; const ParserContextSharedPtr& getContext() const { @@ -525,15 +525,15 @@ namespace slideshow } private: - ParserContextSharedPtr mpParserContext; // might get modified during parsing + ParserContextSharedPtr mpParserContext; // might get modified during parsing }; - + #ifdef BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE const ParserContextSharedPtr& getParserContext() { static ParserContextSharedPtr lcl_parserContext( new ParserContext() ); - // clear node stack (since we reuse the static object, that's + // clear node stack (since we reuse the static object, that's // the whole point here) while( !lcl_parserContext->maOperandStack.empty() ) lcl_parserContext->maOperandStack.pop(); @@ -543,13 +543,13 @@ namespace slideshow #endif } - ExpressionNodeSharedPtr SmilFunctionParser::parseSmilValue( const ::rtl::OUString& rSmilValue, - const ::basegfx::B2DRectangle& rRelativeShapeBounds ) + ExpressionNodeSharedPtr SmilFunctionParser::parseSmilValue( const ::rtl::OUString& rSmilValue, + const ::basegfx::B2DRectangle& rRelativeShapeBounds ) { - // TODO(Q1): Check if a combination of the RTL_UNICODETOTEXT_FLAGS_* - // gives better conversion robustness here (we might want to map space + // TODO(Q1): Check if a combination of the RTL_UNICODETOTEXT_FLAGS_* + // gives better conversion robustness here (we might want to map space // etc. to ASCII space here) - const ::rtl::OString& rAsciiSmilValue( + const ::rtl::OString& rAsciiSmilValue( rtl::OUStringToOString( rSmilValue, RTL_TEXTENCODING_ASCII_US ) ); StringIteratorT aStart( rAsciiSmilValue.getStr() ); @@ -570,7 +570,7 @@ namespace slideshow ExpressionGrammar aExpressionGrammer( pContext ); - const ::boost::spirit::parse_info<StringIteratorT> aParseInfo( + const ::boost::spirit::parse_info<StringIteratorT> aParseInfo( ::boost::spirit::parse( aStart, aEnd, aExpressionGrammer, @@ -581,7 +581,7 @@ namespace slideshow if( !aParseInfo.full ) throw ParseError( "SmilFunctionParser::parseSmilValue(): string not fully parseable" ); - // parser's state stack now must contain exactly _one_ ExpressionNode, + // parser's state stack now must contain exactly _one_ ExpressionNode, // which represents our formula. if( pContext->maOperandStack.size() != 1 ) throw ParseError( "SmilFunctionParser::parseSmilValue(): incomplete or empty expression" ); @@ -589,13 +589,13 @@ namespace slideshow return pContext->maOperandStack.top(); } - ExpressionNodeSharedPtr SmilFunctionParser::parseSmilFunction( const ::rtl::OUString& rSmilFunction, - const ::basegfx::B2DRectangle& rRelativeShapeBounds ) + ExpressionNodeSharedPtr SmilFunctionParser::parseSmilFunction( const ::rtl::OUString& rSmilFunction, + const ::basegfx::B2DRectangle& rRelativeShapeBounds ) { - // TODO(Q1): Check if a combination of the RTL_UNICODETOTEXT_FLAGS_* - // gives better conversion robustness here (we might want to map space + // TODO(Q1): Check if a combination of the RTL_UNICODETOTEXT_FLAGS_* + // gives better conversion robustness here (we might want to map space // etc. to ASCII space here) - const ::rtl::OString& rAsciiSmilFunction( + const ::rtl::OString& rAsciiSmilFunction( rtl::OUStringToOString( rSmilFunction, RTL_TEXTENCODING_ASCII_US ) ); StringIteratorT aStart( rAsciiSmilFunction.getStr() ); @@ -616,7 +616,7 @@ namespace slideshow ExpressionGrammar aExpressionGrammer( pContext ); - const ::boost::spirit::parse_info<StringIteratorT> aParseInfo( + const ::boost::spirit::parse_info<StringIteratorT> aParseInfo( ::boost::spirit::parse( aStart, aEnd, aExpressionGrammer >> ::boost::spirit::end_p, @@ -627,7 +627,7 @@ namespace slideshow if( !aParseInfo.full ) throw ParseError( "SmilFunctionParser::parseSmilFunction(): string not fully parseable" ); - // parser's state stack now must contain exactly _one_ ExpressionNode, + // parser's state stack now must contain exactly _one_ ExpressionNode, // which represents our formula. if( pContext->maOperandStack.size() != 1 ) throw ParseError( "SmilFunctionParser::parseSmilFunction(): incomplete or empty expression" ); diff --git a/slideshow/source/engine/soundplayer.cxx b/slideshow/source/engine/soundplayer.cxx index d1b19318163a..915579131e6c 100644 --- a/slideshow/source/engine/soundplayer.cxx +++ b/slideshow/source/engine/soundplayer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,11 +55,11 @@ namespace slideshow namespace internal { // TODO(Q3): Move the whole SoundPlayer class to avmedia. - + boost::shared_ptr<SoundPlayer> SoundPlayer::create( EventMultiplexer & rEventMultiplexer, const ::rtl::OUString& rSoundURL, - const uno::Reference< uno::XComponentContext>& rComponentContext ) + const uno::Reference< uno::XComponentContext>& rComponentContext ) { boost::shared_ptr<SoundPlayer> pPlayer( new SoundPlayer( rEventMultiplexer, @@ -74,7 +74,7 @@ namespace slideshow { return bPauseShow ? stopPlayback() : startPlayback(); } - + void SoundPlayer::dispose() { if( mThis ) @@ -82,7 +82,7 @@ namespace slideshow mrEventMultiplexer.removePauseHandler( mThis ); mThis.reset(); } - + if( mxPlayer.is() ) { mxPlayer->stop(); @@ -93,11 +93,11 @@ namespace slideshow mxPlayer.clear(); } } - + SoundPlayer::SoundPlayer( EventMultiplexer & rEventMultiplexer, const ::rtl::OUString& rSoundURL, - const uno::Reference< uno::XComponentContext>& rComponentContext ) + const uno::Reference< uno::XComponentContext>& rComponentContext ) : mrEventMultiplexer(rEventMultiplexer), mThis(), mxPlayer() @@ -107,7 +107,7 @@ namespace slideshow try { - const INetURLObject aURL( rSoundURL ); + const INetURLObject aURL( rSoundURL ); mxPlayer.set( avmedia::MediaWindow::createPlayer( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ), uno::UNO_QUERY); @@ -116,7 +116,7 @@ namespace slideshow { throw; } - catch( uno::Exception& ) + catch( uno::Exception& ) { } @@ -145,10 +145,10 @@ namespace slideshow { if( !mxPlayer.is() ) return 0.0; - + const double nDuration( mxPlayer->getDuration() ); if( mxPlayer->isPlaying() ) - return ::std::max( 0.0, + return ::std::max( 0.0, nDuration - mxPlayer->getMediaTime() ); else return nDuration; @@ -162,7 +162,7 @@ namespace slideshow if( mxPlayer->isPlaying() ) mxPlayer->stop(); - mxPlayer->start(); + mxPlayer->start(); return true; } diff --git a/slideshow/source/engine/sp_debug.cxx b/slideshow/source/engine/sp_debug.cxx index 7c001478bce0..6119ab083caf 100644 --- a/slideshow/source/engine/sp_debug.cxx +++ b/slideshow/source/engine/sp_debug.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx index c8ca3dd86ef9..dc4c5c860932 100644 --- a/slideshow/source/engine/tools.cxx +++ b/slideshow/source/engine/tools.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,7 +82,7 @@ namespace slideshow } private: - const ::rtl::OUString& mrSearchString; + const ::rtl::OUString& mrSearchString; }; class NamedValueComparator @@ -99,14 +99,14 @@ namespace slideshow } private: - const beans::NamedValue& mrKey; + const beans::NamedValue& mrKey; }; - ::basegfx::B2DHomMatrix getAttributedShapeTransformation( const ::basegfx::B2DRectangle& rShapeBounds, - const ShapeAttributeLayerSharedPtr& pAttr ) + ::basegfx::B2DHomMatrix getAttributedShapeTransformation( const ::basegfx::B2DRectangle& rShapeBounds, + const ShapeAttributeLayerSharedPtr& pAttr ) { - ::basegfx::B2DHomMatrix aTransform; - const ::basegfx::B2DSize& rSize( rShapeBounds.getRange() ); + ::basegfx::B2DHomMatrix aTransform; + const ::basegfx::B2DSize& rSize( rShapeBounds.getRange() ); const double nShearX( pAttr->isShearXAngleValid() ? pAttr->getShearXAngle() : @@ -120,12 +120,12 @@ namespace slideshow // scale, shear and rotation pivot point is the shape // center - adapt origin accordingly - aTransform.translate( -0.5, -0.5 ); + aTransform.translate( -0.5, -0.5 ); // ensure valid size (zero size will inevitably lead // to a singular transformation matrix) aTransform.scale( ::basegfx::pruneScaleValue( - rSize.getX() ), + rSize.getX() ), ::basegfx::pruneScaleValue( rSize.getY() ) ); @@ -144,7 +144,7 @@ namespace slideshow if( bNeedRotation ) aTransform.rotate( nRotation ); } - + // move left, top corner back to position of the // shape. Since we've already translated the // center of the shape to the origin (the @@ -161,10 +161,10 @@ namespace slideshow // ========================= /// extract unary double value from Any - bool extractValue( double& o_rValue, - const uno::Any& rSourceAny, - const ShapeSharedPtr& rShape, - const ::basegfx::B2DVector& rSlideBounds ) + bool extractValue( double& o_rValue, + const uno::Any& rSourceAny, + const ShapeSharedPtr& rShape, + const ::basegfx::B2DVector& rSlideBounds ) { // try to extract numeric value (double, or smaller POD, like float or int) if( (rSourceAny >>= o_rValue) ) @@ -182,7 +182,7 @@ namespace slideshow try { // Parse string into ExpressionNode, eval node at time 0.0 - o_rValue = (*SmilFunctionParser::parseSmilValue( + o_rValue = (*SmilFunctionParser::parseSmilValue( aString, calcRelativeShapeBounds(rSlideBounds, rShape->getBounds()) ))(0.0); @@ -196,10 +196,10 @@ namespace slideshow } /// extract enum/constant group value from Any - bool extractValue( sal_Int32& o_rValue, - const uno::Any& rSourceAny, - const ShapeSharedPtr& /*rShape*/, - const ::basegfx::B2DVector& /*rSlideBounds*/ ) + bool extractValue( sal_Int32& o_rValue, + const uno::Any& rSourceAny, + const ShapeSharedPtr& /*rShape*/, + const ::basegfx::B2DVector& /*rSlideBounds*/ ) { // try to extract numeric value (int, or smaller POD, like byte) if( (rSourceAny >>= o_rValue) ) @@ -241,10 +241,10 @@ namespace slideshow } /// extract enum/constant group value from Any - bool extractValue( sal_Int16& o_rValue, - const uno::Any& rSourceAny, - const ShapeSharedPtr& rShape, - const ::basegfx::B2DVector& rSlideBounds ) + bool extractValue( sal_Int16& o_rValue, + const uno::Any& rSourceAny, + const ShapeSharedPtr& rShape, + const ::basegfx::B2DVector& rSlideBounds ) { sal_Int32 aValue; if( !extractValue(aValue,rSourceAny,rShape,rSlideBounds) ) @@ -262,10 +262,10 @@ namespace slideshow } /// extract color value from Any - bool extractValue( RGBColor& o_rValue, - const uno::Any& rSourceAny, - const ShapeSharedPtr& /*rShape*/, - const ::basegfx::B2DVector& /*rSlideBounds*/ ) + bool extractValue( RGBColor& o_rValue, + const uno::Any& rSourceAny, + const ShapeSharedPtr& /*rShape*/, + const ::basegfx::B2DVector& /*rSlideBounds*/ ) { // try to extract numeric value (double, or smaller POD, like float or int) { @@ -306,10 +306,10 @@ namespace slideshow "extractValue(): inappropriate length for RGB color value" ); // truncate to byte - o_rValue = RGBColor( ::cppcanvas::makeColor( - static_cast<sal_uInt8>(aTmp[0]), + o_rValue = RGBColor( ::cppcanvas::makeColor( + static_cast<sal_uInt8>(aTmp[0]), static_cast<sal_uInt8>(aTmp[1]), - static_cast<sal_uInt8>(aTmp[2]), + static_cast<sal_uInt8>(aTmp[2]), 255 ) ); // succeeded @@ -344,10 +344,10 @@ namespace slideshow } /// extract color value from Any - bool extractValue( HSLColor& o_rValue, - const uno::Any& rSourceAny, - const ShapeSharedPtr& /*rShape*/, - const ::basegfx::B2DVector& /*rSlideBounds*/ ) + bool extractValue( HSLColor& o_rValue, + const uno::Any& rSourceAny, + const ShapeSharedPtr& /*rShape*/, + const ::basegfx::B2DVector& /*rSlideBounds*/ ) { // try double sequence { @@ -378,15 +378,15 @@ namespace slideshow return true; } } - + return false; // nothing left to try } /// extract plain string from Any - bool extractValue( ::rtl::OUString& o_rValue, - const uno::Any& rSourceAny, - const ShapeSharedPtr& /*rShape*/, - const ::basegfx::B2DVector& /*rSlideBounds*/ ) + bool extractValue( ::rtl::OUString& o_rValue, + const uno::Any& rSourceAny, + const ShapeSharedPtr& /*rShape*/, + const ::basegfx::B2DVector& /*rSlideBounds*/ ) { // try to extract string if( !(rSourceAny >>= o_rValue) ) @@ -396,10 +396,10 @@ namespace slideshow } /// extract bool value from Any - bool extractValue( bool& o_rValue, - const uno::Any& rSourceAny, - const ShapeSharedPtr& /*rShape*/, - const ::basegfx::B2DVector& /*rSlideBounds*/ ) + bool extractValue( bool& o_rValue, + const uno::Any& rSourceAny, + const ShapeSharedPtr& /*rShape*/, + const ::basegfx::B2DVector& /*rSlideBounds*/ ) { sal_Bool nTmp = sal_Bool(); // try to extract bool value @@ -416,7 +416,7 @@ namespace slideshow if( !(rSourceAny >>= aString) ) return false; // nothing left to try - // we also take the strings "true" and "false", + // we also take the strings "true" and "false", // as well as "on" and "off" here if( aString.equalsIgnoreAsciiCaseAscii("true") || aString.equalsIgnoreAsciiCaseAscii("on") ) @@ -436,10 +436,10 @@ namespace slideshow } /// extract double 2-tuple from Any - bool extractValue( ::basegfx::B2DTuple& o_rPair, - const uno::Any& rSourceAny, - const ShapeSharedPtr& rShape, - const ::basegfx::B2DVector& rSlideBounds ) + bool extractValue( ::basegfx::B2DTuple& o_rPair, + const uno::Any& rSourceAny, + const ShapeSharedPtr& rShape, + const ::basegfx::B2DVector& rSlideBounds ) { animations::ValuePair aPair; @@ -460,11 +460,11 @@ namespace slideshow return true; } - bool findNamedValue( uno::Sequence< beans::NamedValue > const& rSequence, - const beans::NamedValue& rSearchKey ) + bool findNamedValue( uno::Sequence< beans::NamedValue > const& rSequence, + const beans::NamedValue& rSearchKey ) { - const beans::NamedValue* pArray = rSequence.getConstArray(); - const size_t nLen( rSequence.getLength() ); + const beans::NamedValue* pArray = rSequence.getConstArray(); + const size_t nLen( rSequence.getLength() ); if( nLen == 0 ) return false; @@ -478,13 +478,13 @@ namespace slideshow return true; } - - bool findNamedValue( beans::NamedValue* o_pRet, - const uno::Sequence< beans::NamedValue >& rSequence, - const ::rtl::OUString& rSearchString ) + + bool findNamedValue( beans::NamedValue* o_pRet, + const uno::Sequence< beans::NamedValue >& rSequence, + const ::rtl::OUString& rSearchString ) { - const beans::NamedValue* pArray = rSequence.getConstArray(); - const size_t nLen( rSequence.getLength() ); + const beans::NamedValue* pArray = rSequence.getConstArray(); + const size_t nLen( rSequence.getLength() ); if( nLen == 0 ) return false; @@ -510,15 +510,15 @@ namespace slideshow rShapeBounds.getMaxY() / rPageSize.getY() ); } - // TODO(F2): Currently, the positional attributes DO NOT mirror the XShape properties. + // TODO(F2): Currently, the positional attributes DO NOT mirror the XShape properties. // First and foremost, this is because we must operate with the shape boundrect, // not position and size (the conversion between logic rect, snap rect and boundrect // are non-trivial for draw shapes, and I won't duplicate them here). Thus, shapes // rotated on the page will still have 0.0 rotation angle, as the metafile // representation fetched over the API is our default zero case. - ::basegfx::B2DHomMatrix getShapeTransformation( const ::basegfx::B2DRectangle& rShapeBounds, - const ShapeAttributeLayerSharedPtr& pAttr ) + ::basegfx::B2DHomMatrix getShapeTransformation( const ::basegfx::B2DRectangle& rShapeBounds, + const ShapeAttributeLayerSharedPtr& pAttr ) { if( !pAttr ) { @@ -535,9 +535,9 @@ namespace slideshow } } - ::basegfx::B2DHomMatrix getSpriteTransformation( const ::basegfx::B2DVector& rPixelSize, - const ::basegfx::B2DVector& rOrigSize, - const ShapeAttributeLayerSharedPtr& pAttr ) + ::basegfx::B2DHomMatrix getSpriteTransformation( const ::basegfx::B2DVector& rPixelSize, + const ::basegfx::B2DVector& rOrigSize, + const ShapeAttributeLayerSharedPtr& pAttr ) { ::basegfx::B2DHomMatrix aTransform; @@ -556,20 +556,20 @@ namespace slideshow // scale, shear and rotation pivot point is the // sprite's pixel center - adapt origin accordingly aTransform.translate( -0.5*rPixelSize.getX(), - -0.5*rPixelSize.getY() ); + -0.5*rPixelSize.getY() ); - const ::basegfx::B2DSize aSize( + const ::basegfx::B2DSize aSize( pAttr->isWidthValid() ? pAttr->getWidth() : rOrigSize.getX(), pAttr->isHeightValid() ? pAttr->getHeight() : rOrigSize.getY() ); // ensure valid size (zero size will inevitably lead // to a singular transformation matrix). aTransform.scale( ::basegfx::pruneScaleValue( - aSize.getX() / + aSize.getX() / ::basegfx::pruneScaleValue( - rOrigSize.getX() ) ), + rOrigSize.getX() ) ), ::basegfx::pruneScaleValue( - aSize.getY() / + aSize.getY() / ::basegfx::pruneScaleValue( rOrigSize.getY() ) ) ); @@ -593,7 +593,7 @@ namespace slideshow // the sprite (we've translated the center of the // sprite to the origin above). aTransform.translate( 0.5*rPixelSize.getX(), - 0.5*rPixelSize.getY() ); + 0.5*rPixelSize.getY() ); } // return identity transform for un-attributed @@ -602,9 +602,9 @@ namespace slideshow return aTransform; } - ::basegfx::B2DRectangle getShapeUpdateArea( const ::basegfx::B2DRectangle& rUnitBounds, - const ::basegfx::B2DHomMatrix& rShapeTransform, - const ShapeAttributeLayerSharedPtr& pAttr ) + ::basegfx::B2DRectangle getShapeUpdateArea( const ::basegfx::B2DRectangle& rUnitBounds, + const ::basegfx::B2DHomMatrix& rShapeTransform, + const ShapeAttributeLayerSharedPtr& pAttr ) { ::basegfx::B2DHomMatrix aTransform; @@ -618,9 +618,9 @@ namespace slideshow const double nCharScale( pAttr->getCharScale() ); // center of scaling is the middle of the shape - aTransform.translate( -0.5, -0.5 ); + aTransform.translate( -0.5, -0.5 ); aTransform.scale( nCharScale, nCharScale ); - aTransform.translate( 0.5, 0.5 ); + aTransform.translate( 0.5, 0.5 ); } aTransform *= rShapeTransform; @@ -628,14 +628,14 @@ namespace slideshow ::basegfx::B2DRectangle aRes; // apply shape transformation to unit rect - return ::canvas::tools::calcTransformedRectBounds( - aRes, + return ::canvas::tools::calcTransformedRectBounds( + aRes, rUnitBounds, aTransform ); } - ::basegfx::B2DRange getShapeUpdateArea( const ::basegfx::B2DRange& rUnitBounds, - const ::basegfx::B2DRange& rShapeBounds ) + ::basegfx::B2DRange getShapeUpdateArea( const ::basegfx::B2DRange& rUnitBounds, + const ::basegfx::B2DRange& rShapeBounds ) { return ::basegfx::B2DRectangle( basegfx::tools::lerp( rShapeBounds.getMinX(), @@ -651,9 +651,9 @@ namespace slideshow rShapeBounds.getMaxY(), rUnitBounds.getMaxY() ) ); } - - ::basegfx::B2DRectangle getShapePosSize( const ::basegfx::B2DRectangle& rOrigBounds, - const ShapeAttributeLayerSharedPtr& pAttr ) + + ::basegfx::B2DRectangle getShapePosSize( const ::basegfx::B2DRectangle& rOrigBounds, + const ShapeAttributeLayerSharedPtr& pAttr ) { // an already empty shape bound need no further // treatment. In fact, any changes applied below would @@ -666,7 +666,7 @@ namespace slideshow } else { - // cannot use maBounds anymore, attributes might have been + // cannot use maBounds anymore, attributes might have been // changed by now. // Have to use absolute values here, as negative sizes // (aka mirrored shapes) _still_ have the same bounds, @@ -690,14 +690,14 @@ namespace slideshow // the positional attribute retrieved from the // ShapeAttributeLayer actually denotes the _middle_ // of the shape (do it as the PPTs do...) - return ::basegfx::B2DRectangle( aPos - 0.5*aSize, + return ::basegfx::B2DRectangle( aPos - 0.5*aSize, aPos + 0.5*aSize ); } } RGBColor unoColor2RGBColor( sal_Int32 nColor ) { - return RGBColor( + return RGBColor( ::cppcanvas::makeColor( // convert from API color to IntSRGBA color // (0xAARRGGBB -> 0xRRGGBBAA) @@ -706,7 +706,7 @@ namespace slideshow static_cast< sal_uInt8 >( nColor ), static_cast< sal_uInt8 >( nColor >> 24U ) ) ); } - + sal_Int32 RGBAColor2UnoColor( ::cppcanvas::Color::IntSRGBA aColor ) { return ::cppcanvas::makeColorARGB( @@ -717,7 +717,7 @@ namespace slideshow ::cppcanvas::getGreen(aColor), ::cppcanvas::getBlue(aColor)); } - + /*sal_Int32 RGBAColor2UnoColor( ::cppcanvas::Color::IntSRGBA aColor ) { return ::cppcanvas::unMakeColor( @@ -730,7 +730,7 @@ namespace slideshow }*/ sal_Int8 unSignedToSigned(sal_Int8 nInt) - { + { if(nInt < 0 ){ sal_Int8 nInt2 = nInt >> 1U; return nInt2; @@ -738,16 +738,16 @@ namespace slideshow return nInt; } } - + void fillRect( const ::cppcanvas::CanvasSharedPtr& rCanvas, - const ::basegfx::B2DRectangle& rRect, + const ::basegfx::B2DRectangle& rRect, ::cppcanvas::Color::IntSRGBA aFillColor ) { const ::basegfx::B2DPolygon aPoly( ::basegfx::tools::createPolygonFromRect( rRect )); - ::cppcanvas::PolyPolygonSharedPtr pPolyPoly( - ::cppcanvas::BaseGfxFactory::getInstance().createPolyPolygon( rCanvas, + ::cppcanvas::PolyPolygonSharedPtr pPolyPoly( + ::cppcanvas::BaseGfxFactory::getInstance().createPolyPolygon( rCanvas, aPoly ) ); if( pPolyPoly ) @@ -758,7 +758,7 @@ namespace slideshow } void initSlideBackground( const ::cppcanvas::CanvasSharedPtr& rCanvas, - const ::basegfx::B2ISize& rSize ) + const ::basegfx::B2ISize& rSize ) { ::cppcanvas::CanvasSharedPtr pCanvas( rCanvas->clone() ); @@ -770,7 +770,7 @@ namespace slideshow // pixel, and the bitmap is initialized white, // depending on the slide content a one pixel wide // line will show to the bottom and the right. - fillRect( pCanvas, + fillRect( pCanvas, ::basegfx::B2DRectangle( 0.0, 0.0, rSize.getX(), rSize.getY() ), @@ -784,7 +784,7 @@ namespace slideshow // off. OTOH, every other slide background (solid fill, // gradient, bitmap) render one pixel less, thus revealing // ugly white pixel to the right and the bottom. - fillRect( pCanvas, + fillRect( pCanvas, ::basegfx::B2DRectangle( 0.0, 0.0, rSize.getX()-1, rSize.getY()-1 ), @@ -793,37 +793,37 @@ namespace slideshow ::basegfx::B2DRectangle getAPIShapeBounds( const uno::Reference< drawing::XShape >& xShape ) { - uno::Reference< beans::XPropertySet > xPropSet( xShape, + uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY_THROW ); // read bound rect awt::Rectangle aTmpRect; - if( !(xPropSet->getPropertyValue( + if( !(xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BoundRect") ) ) >>= aTmpRect) ) { ENSURE_OR_THROW( false, "getAPIShapeBounds(): Could not get \"BoundRect\" property from shape" ); } - return ::basegfx::B2DRectangle( aTmpRect.X, + return ::basegfx::B2DRectangle( aTmpRect.X, aTmpRect.Y, - aTmpRect.X+aTmpRect.Width, + aTmpRect.X+aTmpRect.Width, aTmpRect.Y+aTmpRect.Height ); } double getAPIShapePrio( const uno::Reference< drawing::XShape >& xShape ) { - uno::Reference< beans::XPropertySet > xPropSet( xShape, + uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY_THROW ); // read prio sal_Int32 nPrio(0); - if( !(xPropSet->getPropertyValue( + if( !(xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ZOrder") ) ) >>= nPrio) ) { ENSURE_OR_THROW( false, "getAPIShapePrio(): Could not get \"ZOrder\" property from shape" ); } - // TODO(F2): Check and adapt the range of possible values here. + // TODO(F2): Check and adapt the range of possible values here. // Maybe we can also take the total number of shapes here return nPrio / 65535.0; } @@ -838,16 +838,16 @@ namespace slideshow rSlideSize.getX(), rSlideSize.getY() ); basegfx::B2DRange aTmpRect; - canvas::tools::calcTransformedRectBounds( aTmpRect, - aRect, + canvas::tools::calcTransformedRectBounds( aTmpRect, + aRect, pView->getTransformation() ); // #i42440# Returned slide size is one pixel too small, as // rendering happens one pixel to the right and below the // actual bound rect. - return basegfx::B2IVector( + return basegfx::B2IVector( basegfx::fround( aTmpRect.getRange().getX() ) + 1, basegfx::fround( aTmpRect.getRange().getY() ) + 1 ); - } + } } } diff --git a/slideshow/source/engine/transitions/barndoorwipe.cxx b/slideshow/source/engine/transitions/barndoorwipe.cxx index 2fa0f6517a5b..db7458513ca0 100644 --- a/slideshow/source/engine/transitions/barndoorwipe.cxx +++ b/slideshow/source/engine/transitions/barndoorwipe.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,14 +42,14 @@ namespace internal { { if (m_doubled) t /= 2.0; - + basegfx::B2DHomMatrix aTransform(basegfx::tools::createTranslateB2DHomMatrix(-0.5, -0.5)); aTransform.scale( ::basegfx::pruneScaleValue(t), 1.0 ); aTransform.translate( 0.5, 0.5 ); ::basegfx::B2DPolygon poly( m_unitRect ); poly.transform( aTransform ); ::basegfx::B2DPolyPolygon res(poly); - + if (m_doubled) { aTransform = basegfx::tools::createTranslateB2DHomMatrix(-0.5, -0.5); aTransform.rotate( M_PI_2 ); @@ -57,7 +57,7 @@ namespace internal { poly.transform( aTransform ); res.append(poly); } - + return res; } diff --git a/slideshow/source/engine/transitions/barndoorwipe.hxx b/slideshow/source/engine/transitions/barndoorwipe.hxx index ddec5ed862b0..e16c20c9c3eb 100644 --- a/slideshow/source/engine/transitions/barndoorwipe.hxx +++ b/slideshow/source/engine/transitions/barndoorwipe.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/barwipepolypolygon.cxx b/slideshow/source/engine/transitions/barwipepolypolygon.cxx index 0c01212c0d14..9ba681fa64ef 100644 --- a/slideshow/source/engine/transitions/barwipepolypolygon.cxx +++ b/slideshow/source/engine/transitions/barwipepolypolygon.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/barwipepolypolygon.hxx b/slideshow/source/engine/transitions/barwipepolypolygon.hxx index a8bdd2664431..1a816252eb90 100644 --- a/slideshow/source/engine/transitions/barwipepolypolygon.hxx +++ b/slideshow/source/engine/transitions/barwipepolypolygon.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/boxwipe.cxx b/slideshow/source/engine/transitions/boxwipe.cxx index 7b522eb48bc4..5fb085c401c6 100644 --- a/slideshow/source/engine/transitions/boxwipe.cxx +++ b/slideshow/source/engine/transitions/boxwipe.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ namespace internal { } else { aTransform.scale( d, d ); } - + ::basegfx::B2DPolyPolygon res( m_unitRect ); res.transform( aTransform ); return res; diff --git a/slideshow/source/engine/transitions/boxwipe.hxx b/slideshow/source/engine/transitions/boxwipe.hxx index ac2ed0972c0f..e04813bd3208 100644 --- a/slideshow/source/engine/transitions/boxwipe.hxx +++ b/slideshow/source/engine/transitions/boxwipe.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ public: virtual ::basegfx::B2DPolyPolygon operator () ( double t ); private: const bool m_topCentered; - const ::basegfx::B2DPolyPolygon m_unitRect; + const ::basegfx::B2DPolyPolygon m_unitRect; }; } diff --git a/slideshow/source/engine/transitions/checkerboardwipe.cxx b/slideshow/source/engine/transitions/checkerboardwipe.cxx index 630c046d438f..786eca0e51d7 100644 --- a/slideshow/source/engine/transitions/checkerboardwipe.cxx +++ b/slideshow/source/engine/transitions/checkerboardwipe.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,9 +40,9 @@ namespace internal { { const double d = (1.0 / m_unitsPerEdge); ::basegfx::B2DHomMatrix aTransform; - aTransform.scale( ::basegfx::pruneScaleValue( d * 2.0 * t ), + aTransform.scale( ::basegfx::pruneScaleValue( d * 2.0 * t ), ::basegfx::pruneScaleValue( d ) ); - + ::basegfx::B2DPolyPolygon res; for ( sal_Int32 i = m_unitsPerEdge; i--; ) { diff --git a/slideshow/source/engine/transitions/checkerboardwipe.hxx b/slideshow/source/engine/transitions/checkerboardwipe.hxx index 8a8ac15c6de1..b78d20885b55 100644 --- a/slideshow/source/engine/transitions/checkerboardwipe.hxx +++ b/slideshow/source/engine/transitions/checkerboardwipe.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/clippingfunctor.cxx b/slideshow/source/engine/transitions/clippingfunctor.cxx index cef1e821f8f0..7bd52246233b 100644 --- a/slideshow/source/engine/transitions/clippingfunctor.cxx +++ b/slideshow/source/engine/transitions/clippingfunctor.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,9 +39,9 @@ #include <basegfx/polygon/b2dpolypolygoncutter.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -namespace slideshow +namespace slideshow { - namespace internal + namespace internal { ClippingFunctor::ClippingFunctor(const ParametricPolyPolygonSharedPtr& rPolygon, const TransitionInfo& rTransitionInfo, @@ -58,21 +58,21 @@ namespace slideshow { ENSURE_OR_THROW( rPolygon, "ClippingFunctor::ClippingFunctor(): Invalid parametric polygon" ); - + // maBackgroundRect serves as the minuent when // subtracting a given clip polygon from the // background. To speed up the clipper algo, avoid // actual intersections of the generated // poly-polygon with the minuent - i.e. choose the // polygon to subtract from sufficiently large. - + // blow up unit rect to (-1,-1),(2,2) // AW: Not needed, just use range // ::basegfx::B2DHomMatrix aMatrix; // aMatrix.scale(3.0,3.0); // aMatrix.translate(-1.0,-1.0); // maBackgroundRect.transform( aMatrix ); - + // extract modification info from maTransitionInfo // ----------------------------------------------- @@ -114,18 +114,18 @@ namespace slideshow false, "TransitionFactory::TransitionFactory(): Unexpected reverse method" ); break; - + case TransitionInfo::REVERSEMETHOD_IGNORE: - break; - + break; + case TransitionInfo::REVERSEMETHOD_INVERT_SWEEP: mbForwardParameterSweep = !mbForwardParameterSweep; break; - + case TransitionInfo::REVERSEMETHOD_SUBTRACT_POLYGON: mbSubtractPolygon = !mbSubtractPolygon; break; - + case TransitionInfo::REVERSEMETHOD_SUBTRACT_AND_INVERT: mbForwardParameterSweep = !mbForwardParameterSweep; mbSubtractPolygon = !mbSubtractPolygon; @@ -135,13 +135,13 @@ namespace slideshow maStaticTransformation = basegfx::tools::createRotateAroundPoint(0.5, 0.5, M_PI) * maStaticTransformation; break; - + case TransitionInfo::REVERSEMETHOD_FLIP_X: maStaticTransformation = basegfx::tools::createScaleTranslateB2DHomMatrix(-1.0, 1.0, 1.0, 0.0) * maStaticTransformation; mbFlip = true; break; - + case TransitionInfo::REVERSEMETHOD_FLIP_Y: maStaticTransformation = basegfx::tools::createScaleTranslateB2DHomMatrix(1.0, -1.0, 0.0, 1.0) * maStaticTransformation; @@ -149,7 +149,7 @@ namespace slideshow break; } } - + if( !bModeIn ) { // client has requested 'out' mode. Apply @@ -158,18 +158,18 @@ namespace slideshow mbForwardParameterSweep = !mbForwardParameterSweep; else mbSubtractPolygon = !mbSubtractPolygon; - } + } } - ::basegfx::B2DPolyPolygon ClippingFunctor::operator()( double nValue, - const ::basegfx::B2DSize& rTargetSize ) + ::basegfx::B2DPolyPolygon ClippingFunctor::operator()( double nValue, + const ::basegfx::B2DSize& rTargetSize ) { // modify clip polygon according to static // transformation plus current shape size ::basegfx::B2DHomMatrix aMatrix( maStaticTransformation ); - + // retrieve current clip polygon - ::basegfx::B2DPolyPolygon aClipPoly = (*mpParametricPoly)( + ::basegfx::B2DPolyPolygon aClipPoly = (*mpParametricPoly)( mbForwardParameterSweep ? nValue : 1.0 - nValue ); // TODO(Q4): workaround here, better be fixed in cppcanvas @@ -178,17 +178,17 @@ namespace slideshow if (mbFlip) aClipPoly.flip(); - + // currently, clipper cannot cope with curves. Subdivide first // AW: Should be no longer necessary; clipping tools are now bezier-safe // if( aClipPoly.areControlPointsUsed() ) // aClipPoly = ::basegfx::tools::adaptiveSubdivideByAngle(aClipPoly); - + if( mbSubtractPolygon ) { // subtract given polygon from background // rect. Do that before any transformations. - + // calc maBackgroundRect \ aClipPoly // ================================= @@ -212,7 +212,7 @@ namespace slideshow aClipPoly = basegfx::tools::solvePolygonOperationDiff(aBackgroundPolyPoly, aClipPoly); } } - + // scale polygon up to current shape size if( mbScaleIsotrophically ) { @@ -227,10 +227,10 @@ namespace slideshow aMatrix.scale( rTargetSize.getX(), rTargetSize.getY() ); } - + // apply cumulative transformation to clip polygon aClipPoly.transform( aMatrix ); - + return aClipPoly; } diff --git a/slideshow/source/engine/transitions/clippingfunctor.hxx b/slideshow/source/engine/transitions/clippingfunctor.hxx index 05a521233930..9775148e4bc7 100644 --- a/slideshow/source/engine/transitions/clippingfunctor.hxx +++ b/slideshow/source/engine/transitions/clippingfunctor.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,18 +36,18 @@ #include <parametricpolypolygon.hxx> -namespace slideshow +namespace slideshow { - namespace internal + namespace internal { /** Generates the final clipping polygon. This class serves as the functor, which generates the final clipping polygon from a given ParametricPolyPolygon - and a TransitionInfo. + and a TransitionInfo. The ParametricPolyPolygon can be obtained from the - ParametricPolyPolygonFactory, see there. + ParametricPolyPolygonFactory, see there. The TransitionInfo further parameterizes the polygon generated by the ParametricPolyPolygon, with common @@ -64,7 +64,7 @@ namespace slideshow const TransitionInfo& rTransitionInfo, bool bDirectionForward, bool bModeIn ); - + /** Generate clip polygon. @param nValue @@ -75,9 +75,9 @@ namespace slideshow Size the clip polygon should cover. This is typically the size of the object the effect is applied on. */ - ::basegfx::B2DPolyPolygon operator()( double nValue, + ::basegfx::B2DPolyPolygon operator()( double nValue, const ::basegfx::B2DSize& rTargetSize ); - + private: ParametricPolyPolygonSharedPtr mpParametricPoly; ::basegfx::B2DHomMatrix maStaticTransformation; diff --git a/slideshow/source/engine/transitions/clockwipe.cxx b/slideshow/source/engine/transitions/clockwipe.cxx index c6eecf0873f5..0d4d23fb1236 100644 --- a/slideshow/source/engine/transitions/clockwipe.cxx +++ b/slideshow/source/engine/transitions/clockwipe.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/clockwipe.hxx b/slideshow/source/engine/transitions/clockwipe.hxx index 895c9058d5aa..845e54149e86 100644 --- a/slideshow/source/engine/transitions/clockwipe.hxx +++ b/slideshow/source/engine/transitions/clockwipe.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/combtransition.cxx b/slideshow/source/engine/transitions/combtransition.cxx index 59118cf923c6..22bb77b7c1b7 100644 --- a/slideshow/source/engine/transitions/combtransition.cxx +++ b/slideshow/source/engine/transitions/combtransition.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,28 +54,28 @@ basegfx::B2DPolyPolygon createClipPolygon( // create clip polygon in standard orientation (will later // be rotated to match direction vector) ::basegfx::B2DPolyPolygon aClipPoly; - + // create nNumStrips/2 vertical strips for( int i=nOffset; i<nNumStrips; i+=2 ) { - aClipPoly.append( - ::basegfx::tools::createPolygonFromRect( + aClipPoly.append( + ::basegfx::tools::createPolygonFromRect( ::basegfx::B2DRectangle( double(i)/nNumStrips, 0.0, double(i+1)/nNumStrips, 1.0) ) ); - + } - + // rotate polygons, such that the strips are parallel to // the given direction vector const ::basegfx::B2DVector aUpVec(0.0, 1.0); basegfx::B2DHomMatrix aMatrix(basegfx::tools::createRotateAroundPoint(0.5, 0.5, aUpVec.angle( rDirection ))); - + // blow up clip polygon to slide size aMatrix.scale( rSlideSize.getX(), rSlideSize.getY() ); - + aClipPoly.transform( aMatrix ); - + return aClipPoly; } @@ -99,7 +99,7 @@ CombTransition::CombTransition( { } -void CombTransition::renderComb( double t, +void CombTransition::renderComb( double t, const ViewEntry& rViewEntry ) const { const SlideBitmapSharedPtr& pEnteringBitmap = getEnteringBitmap(rViewEntry); @@ -107,7 +107,7 @@ void CombTransition::renderComb( double t, if( !pEnteringBitmap || !pCanvas_ ) return; - + // calc bitmap offsets. The enter/leaving bitmaps are only // as large as the actual slides. For scaled-down // presentations, we have to move the left, top edge of @@ -115,20 +115,20 @@ void CombTransition::renderComb( double t, // given view transform. The aBitmapPosPixel local // variable is already in device coordinate space // (i.e. pixel). - + // TODO(F2): Properly respect clip here. Might have to be transformed, too. const basegfx::B2DHomMatrix viewTransform( rViewEntry.mpView->getTransformation() ); const basegfx::B2DPoint pageOrigin( viewTransform * basegfx::B2DPoint() ); - + // change transformation on cloned canvas to be in // device pixel cppcanvas::CanvasSharedPtr pCanvas( pCanvas_->clone() ); basegfx::B2DPoint p; - + // TODO(Q2): Use basegfx bitmaps here // TODO(F1): SlideBitmap is not fully portable between different canvases! - const basegfx::B2DSize enteringSizePixel( + const basegfx::B2DSize enteringSizePixel( getEnteringSlideSizePixel( rViewEntry.mpView) ); const basegfx::B2DVector aPushDirection = basegfx::B2DVector( @@ -141,9 +141,9 @@ void CombTransition::renderComb( double t, createClipPolygon( maPushDirectionUnit, enteringSizePixel, mnNumStripes, 1 ) ); - + SlideBitmapSharedPtr const & pLeavingBitmap = getLeavingBitmap(rViewEntry); - if( pLeavingBitmap ) + if( pLeavingBitmap ) { // render odd strips: pLeavingBitmap->clip( aClipPolygon1 ); @@ -151,7 +151,7 @@ void CombTransition::renderComb( double t, p = basegfx::B2DPoint( pageOrigin + (t * aPushDirection) ); pCanvas->setTransformation(basegfx::tools::createTranslateB2DHomMatrix(p.getX(), p.getY())); pLeavingBitmap->draw( pCanvas ); - + // render even strips: pLeavingBitmap->clip( aClipPolygon2 ); // don't modify bitmap object (no move!): @@ -159,17 +159,17 @@ void CombTransition::renderComb( double t, pCanvas->setTransformation(basegfx::tools::createTranslateB2DHomMatrix(p.getX(), p.getY())); pLeavingBitmap->draw( pCanvas ); } - + // TODO(Q2): Use basegfx bitmaps here // TODO(F1): SlideBitmap is not fully portable between different canvases! - + // render odd strips: pEnteringBitmap->clip( aClipPolygon1 ); // don't modify bitmap object (no move!): p = basegfx::B2DPoint( pageOrigin + ((t - 1.0) * aPushDirection) ); pCanvas->setTransformation(basegfx::tools::createTranslateB2DHomMatrix(p.getX(), p.getY())); pEnteringBitmap->draw( pCanvas ); - + // render even strips: pEnteringBitmap->clip( aClipPolygon2 ); // don't modify bitmap object (no move!): @@ -182,9 +182,9 @@ bool CombTransition::operator()( double t ) { std::for_each( beginViews(), endViews(), - boost::bind( &CombTransition::renderComb, - this, - t, + boost::bind( &CombTransition::renderComb, + this, + t, _1 )); getScreenUpdater().notifyUpdate(); diff --git a/slideshow/source/engine/transitions/combtransition.hxx b/slideshow/source/engine/transitions/combtransition.hxx index b8014a6d5ef1..2ef5309db08d 100644 --- a/slideshow/source/engine/transitions/combtransition.hxx +++ b/slideshow/source/engine/transitions/combtransition.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ namespace slideshow { namespace internal { /** Comb transition class. - + This class provides a SlideChangeAnimation, showing a comb-like effect (stripes of alternating push effects). */ @@ -43,7 +43,7 @@ class CombTransition : public SlideChangeBase { public: /** Create the comb transition effect. - + @param nNumStripes Number of comb-like stripes to show in this effect */ @@ -55,14 +55,14 @@ public: EventMultiplexer& rEventMultiplexer, const ::basegfx::B2DVector& rPushDirection, sal_Int32 nNumStripes ); - + // NumberAnimation virtual bool operator()( double x ); - + private: const ::basegfx::B2DVector maPushDirectionUnit; sal_Int32 mnNumStripes; - + void renderComb( double t, const ViewEntry& rViewEntry ) const; }; diff --git a/slideshow/source/engine/transitions/doublediamondwipe.cxx b/slideshow/source/engine/transitions/doublediamondwipe.cxx index 62a9f342ed86..38f94f34ec39 100644 --- a/slideshow/source/engine/transitions/doublediamondwipe.cxx +++ b/slideshow/source/engine/transitions/doublediamondwipe.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ namespace internal { poly.append( ::basegfx::B2DPoint( 0.5, 0.5 - b ) ); poly.setClosed(true); res.append(poly); - + return res; } diff --git a/slideshow/source/engine/transitions/doublediamondwipe.hxx b/slideshow/source/engine/transitions/doublediamondwipe.hxx index ff3880d12ce8..bca71171cc3a 100644 --- a/slideshow/source/engine/transitions/doublediamondwipe.hxx +++ b/slideshow/source/engine/transitions/doublediamondwipe.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/ellipsewipe.cxx b/slideshow/source/engine/transitions/ellipsewipe.cxx index ca1652cdd03b..44b7675d339f 100644 --- a/slideshow/source/engine/transitions/ellipsewipe.cxx +++ b/slideshow/source/engine/transitions/ellipsewipe.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/ellipsewipe.hxx b/slideshow/source/engine/transitions/ellipsewipe.hxx index 03a2df4d409a..d87adfb29950 100644 --- a/slideshow/source/engine/transitions/ellipsewipe.hxx +++ b/slideshow/source/engine/transitions/ellipsewipe.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/fanwipe.cxx b/slideshow/source/engine/transitions/fanwipe.cxx index 43476e0a01fd..3f4539843cb2 100644 --- a/slideshow/source/engine/transitions/fanwipe.cxx +++ b/slideshow/source/engine/transitions/fanwipe.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,21 +45,21 @@ namespace internal { ::basegfx::B2DPolygon poly( ClockWipe::calcCenteredClock( t / ((m_center && m_single) ? 2.0 : 4.0) ) ); - + res.append( poly ); // flip on y-axis: poly.transform(basegfx::tools::createScaleB2DHomMatrix(-1.0, 1.0)); poly.flip(); res.append( poly ); - - if (m_center) + + if (m_center) { res.transform(basegfx::tools::createScaleTranslateB2DHomMatrix(0.5, 0.5, 0.5, 0.5)); - + if (! m_single) res.append( flipOnXAxis(res) ); } - else + else { OSL_ASSERT( ! m_fanIn ); res.transform(basegfx::tools::createScaleTranslateB2DHomMatrix(0.5, 1.0, 0.5, 1.0)); diff --git a/slideshow/source/engine/transitions/fanwipe.hxx b/slideshow/source/engine/transitions/fanwipe.hxx index bb8168897b6d..3cc66b69b197 100644 --- a/slideshow/source/engine/transitions/fanwipe.hxx +++ b/slideshow/source/engine/transitions/fanwipe.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/figurewipe.cxx b/slideshow/source/engine/transitions/figurewipe.cxx index 22a2001487d7..89f55c79526a 100644 --- a/slideshow/source/engine/transitions/figurewipe.cxx +++ b/slideshow/source/engine/transitions/figurewipe.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/figurewipe.hxx b/slideshow/source/engine/transitions/figurewipe.hxx index 35f56a1400d3..27c4dc4ea593 100644 --- a/slideshow/source/engine/transitions/figurewipe.hxx +++ b/slideshow/source/engine/transitions/figurewipe.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ public: static FigureWipe * createStarWipe( sal_Int32 nPoints ); static FigureWipe * createPentagonWipe(); static FigureWipe * createHexagonWipe(); - + virtual ::basegfx::B2DPolyPolygon operator () ( double t ); private: FigureWipe( ::basegfx::B2DPolygon const & figure ) : m_figure(figure) {} diff --git a/slideshow/source/engine/transitions/fourboxwipe.cxx b/slideshow/source/engine/transitions/fourboxwipe.cxx index e003d2435f36..b6eb591c0b32 100644 --- a/slideshow/source/engine/transitions/fourboxwipe.cxx +++ b/slideshow/source/engine/transitions/fourboxwipe.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,17 +43,17 @@ namespace internal { { ::basegfx::B2DHomMatrix aTransform; const double d = ::basegfx::pruneScaleValue( t / 2.0 ); - if (m_cornersOut) + if (m_cornersOut) { aTransform = basegfx::tools::createTranslateB2DHomMatrix(-0.5, -0.5); aTransform = basegfx::tools::createScaleTranslateB2DHomMatrix(d, d, -0.25, -0.25) * aTransform; - } - else + } + else { aTransform = basegfx::tools::createScaleTranslateB2DHomMatrix(d, d, -0.5, -0.5); } - + // top left: ::basegfx::B2DPolygon square( m_unitRect ); square.transform( aTransform ); @@ -75,7 +75,7 @@ namespace internal { square4.transform( aTransform ); square4.flip(); // flip direction res.append( square4 ); - + aTransform = basegfx::tools::createTranslateB2DHomMatrix(0.5, 0.5); res.transform( aTransform ); return res; diff --git a/slideshow/source/engine/transitions/fourboxwipe.hxx b/slideshow/source/engine/transitions/fourboxwipe.hxx index 47fe2141a664..d6017b59fae3 100644 --- a/slideshow/source/engine/transitions/fourboxwipe.hxx +++ b/slideshow/source/engine/transitions/fourboxwipe.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/iriswipe.cxx b/slideshow/source/engine/transitions/iriswipe.cxx index 310bff92ff43..ce166ae6ea21 100644 --- a/slideshow/source/engine/transitions/iriswipe.cxx +++ b/slideshow/source/engine/transitions/iriswipe.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/iriswipe.hxx b/slideshow/source/engine/transitions/iriswipe.hxx index 86200f94aff4..b9cf1f75e6f3 100644 --- a/slideshow/source/engine/transitions/iriswipe.hxx +++ b/slideshow/source/engine/transitions/iriswipe.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/parametricpolypolygon.hxx b/slideshow/source/engine/transitions/parametricpolypolygon.hxx index 3fbcdffb328d..5603784a79b5 100644 --- a/slideshow/source/engine/transitions/parametricpolypolygon.hxx +++ b/slideshow/source/engine/transitions/parametricpolypolygon.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx b/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx index 7823a1dd6452..143f041c7851 100644 --- a/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx +++ b/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ namespace slideshow { using namespace ::com::sun::star::animations::TransitionType; using namespace ::com::sun::star::animations::TransitionSubType; - + switch (nType) { case BARWIPE: @@ -286,7 +286,7 @@ namespace slideshow return ParametricPolyPolygonSharedPtr( new ZigZagWipe(5) ); case BARNZIGZAGWIPE: return ParametricPolyPolygonSharedPtr( new BarnZigZagWipe(5) ); - + case BOWTIEWIPE: case BARNVEEWIPE: case EYEWIPE: @@ -297,15 +297,15 @@ namespace slideshow // for now, map to barwipe transition return ParametricPolyPolygonSharedPtr( new BarWipePolyPolygon ); - + default: case PUSHWIPE: case SLIDEWIPE: case FADE: - ENSURE_OR_THROW( false, + ENSURE_OR_THROW( false, "createShapeClipPolyPolygonAnimation(): Transition type mismatch" ); } - + return ParametricPolyPolygonSharedPtr(); } } diff --git a/slideshow/source/engine/transitions/parametricpolypolygonfactory.hxx b/slideshow/source/engine/transitions/parametricpolypolygonfactory.hxx index b4279be5bc9f..0d0e72b253ef 100644 --- a/slideshow/source/engine/transitions/parametricpolypolygonfactory.hxx +++ b/slideshow/source/engine/transitions/parametricpolypolygonfactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/pinwheelwipe.cxx b/slideshow/source/engine/transitions/pinwheelwipe.cxx index 7cd5b91006c3..a13a70f62c2d 100644 --- a/slideshow/source/engine/transitions/pinwheelwipe.cxx +++ b/slideshow/source/engine/transitions/pinwheelwipe.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/pinwheelwipe.hxx b/slideshow/source/engine/transitions/pinwheelwipe.hxx index d4560b24b8aa..7dff75ff9942 100644 --- a/slideshow/source/engine/transitions/pinwheelwipe.hxx +++ b/slideshow/source/engine/transitions/pinwheelwipe.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/randomwipe.cxx b/slideshow/source/engine/transitions/randomwipe.cxx index 22c51e38852e..af0698d9edb4 100644 --- a/slideshow/source/engine/transitions/randomwipe.cxx +++ b/slideshow/source/engine/transitions/randomwipe.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,7 +66,7 @@ RandomWipe::RandomWipe( sal_Int32 nElements, bool randomBars ) aTransform.scale( pedge, pedge ); } m_rect.transform( aTransform ); - + // mix up: for ( sal_Int32 i = (nElements / 2); i--; ) { diff --git a/slideshow/source/engine/transitions/randomwipe.hxx b/slideshow/source/engine/transitions/randomwipe.hxx index 04a00e5a4e14..3eeca283edab 100644 --- a/slideshow/source/engine/transitions/randomwipe.hxx +++ b/slideshow/source/engine/transitions/randomwipe.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx index 667bd6d17c22..ba94e877bd42 100644 --- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,28 +73,28 @@ public: bool bModeIn ); ~ClippingAnimation(); - + // Animation interface // ------------------- virtual void prefetch( const AnimatableShapeSharedPtr& rShape, const ShapeAttributeLayerSharedPtr& rAttrLayer ); - virtual void start( const AnimatableShapeSharedPtr& rShape, + virtual void start( const AnimatableShapeSharedPtr& rShape, const ShapeAttributeLayerSharedPtr& rAttrLayer ); virtual void end(); - + // NumberAnimation interface // ----------------------- virtual bool operator()( double nValue ); virtual double getUnderlyingValue() const; - + private: void end_(); AnimatableShapeSharedPtr mpShape; ShapeAttributeLayerSharedPtr mpAttrLayer; ShapeManagerSharedPtr mpShapeManager; - ClippingFunctor maClippingFunctor; - bool mbSpriteActive; + ClippingFunctor maClippingFunctor; + bool mbSpriteActive; }; ClippingAnimation::ClippingAnimation( @@ -106,9 +106,9 @@ ClippingAnimation::ClippingAnimation( mpShape(), mpAttrLayer(), mpShapeManager( rShapeManager ), - maClippingFunctor( rPolygon, - rTransitionInfo, - bDirectionForward, + maClippingFunctor( rPolygon, + rTransitionInfo, + bDirectionForward, bModeIn ), mbSpriteActive(false) { @@ -123,7 +123,7 @@ ClippingAnimation::~ClippingAnimation() { end_(); } - catch (uno::Exception &) + catch (uno::Exception &) { OSL_ENSURE( false, rtl::OUStringToOString( comphelper::anyToString( @@ -137,8 +137,8 @@ void ClippingAnimation::prefetch( const AnimatableShapeSharedPtr&, { } -void ClippingAnimation::start( const AnimatableShapeSharedPtr& rShape, - const ShapeAttributeLayerSharedPtr& rAttrLayer ) +void ClippingAnimation::start( const AnimatableShapeSharedPtr& rShape, + const ShapeAttributeLayerSharedPtr& rAttrLayer ) { OSL_ENSURE( !mpShape, "ClippingAnimation::start(): Shape already set" ); @@ -185,14 +185,14 @@ bool ClippingAnimation::operator()( double nValue ) ENSURE_OR_RETURN_FALSE( mpAttrLayer && mpShape, "ClippingAnimation::operator(): Invalid ShapeAttributeLayer" ); - + // set new clip mpAttrLayer->setClip( maClippingFunctor( nValue, mpShape->getDomBounds().getRange() ) ); - + if( mpShape->isContentChanged() ) mpShapeManager->notifyShapeUpdate( mpShape ); - + return true; } @@ -201,8 +201,8 @@ double ClippingAnimation::getUnderlyingValue() const ENSURE_OR_THROW( mpAttrLayer, "ClippingAnimation::getUnderlyingValue(): Invalid ShapeAttributeLayer" ); - - return 0.0; // though this should be used in concert with + + return 0.0; // though this should be used in concert with // ActivitiesFactory::createSimpleActivity, better // explicitely name our start value. // Permissible range for operator() above is [0,1] @@ -218,30 +218,30 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( const ::basegfx::B2DVector& rSlideSize, uno::Reference< animations::XTransitionFilter > const& xTransition ) { - return createShapeTransition( rParms, - rShape, - rShapeManager, + return createShapeTransition( rParms, + rShape, + rShapeManager, rSlideSize, - xTransition, - xTransition->getTransition(), + xTransition, + xTransition->getTransition(), xTransition->getSubtype() ); } AnimationActivitySharedPtr TransitionFactory::createShapeTransition( - const ActivitiesFactory::CommonParameters& rParms, - const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + const ActivitiesFactory::CommonParameters& rParms, + const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTransitionFilter > const& xTransition, - sal_Int16 nType, - sal_Int16 nSubType ) + sal_Int16 nType, + sal_Int16 nSubType ) { ENSURE_OR_THROW( xTransition.is(), "TransitionFactory::createShapeTransition(): Invalid XTransition" ); - - const TransitionInfo* pTransitionInfo( + + const TransitionInfo* pTransitionInfo( getTransitionInfo( nType, nSubType ) ); AnimationActivitySharedPtr pGeneratedActivity; @@ -251,24 +251,24 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( { default: case TransitionInfo::TRANSITION_INVALID: - OSL_ENSURE( false, + OSL_ENSURE( false, "TransitionFactory::createShapeTransition(): Invalid transition type. " "Don't ask me for a 0 TransitionType, have no XTransitionFilter node instead!" ); return AnimationActivitySharedPtr(); - + case TransitionInfo::TRANSITION_CLIP_POLYPOLYGON: { // generate parametric poly-polygon - ParametricPolyPolygonSharedPtr pPoly( - ParametricPolyPolygonFactory::createClipPolyPolygon( + ParametricPolyPolygonSharedPtr pPoly( + ParametricPolyPolygonFactory::createClipPolyPolygon( nType, nSubType ) ); - + // create a clip activity from that pGeneratedActivity = ActivitiesFactory::createSimpleActivity( rParms, - NumberAnimationSharedPtr( - new ClippingAnimation( + NumberAnimationSharedPtr( + new ClippingAnimation( pPoly, rShapeManager, *pTransitionInfo, @@ -277,7 +277,7 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( true ); } break; - + case TransitionInfo::TRANSITION_SPECIAL: { switch( nType ) @@ -288,7 +288,7 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( // TransitionFactoryTable const TransitionInfo* pRandomTransitionInfo( getRandomTransitionInfo() ); - + ENSURE_OR_THROW( pRandomTransitionInfo != NULL, "TransitionFactory::createShapeTransition(): Got invalid random transition info" ); @@ -305,12 +305,12 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( pRandomTransitionInfo->mnTransitionSubType ); } break; - + // TODO(F3): Implement slidewipe for shape case animations::TransitionType::SLIDEWIPE: { sal_Int16 nBarWipeSubType(0); - bool bDirectionForward(true); + bool bDirectionForward(true); // map slidewipe to BARWIPE, for now switch( nSubType ) @@ -342,19 +342,19 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( } // generate parametric poly-polygon - ParametricPolyPolygonSharedPtr pPoly( - ParametricPolyPolygonFactory::createClipPolyPolygon( - animations::TransitionType::BARWIPE, + ParametricPolyPolygonSharedPtr pPoly( + ParametricPolyPolygonFactory::createClipPolyPolygon( + animations::TransitionType::BARWIPE, nBarWipeSubType ) ); - + // create a clip activity from that pGeneratedActivity = ActivitiesFactory::createSimpleActivity( rParms, - NumberAnimationSharedPtr( - new ClippingAnimation( + NumberAnimationSharedPtr( + new ClippingAnimation( pPoly, rShapeManager, - *getTransitionInfo( animations::TransitionType::BARWIPE, + *getTransitionInfo( animations::TransitionType::BARWIPE, nBarWipeSubType ), bDirectionForward, xTransition->getMode() ) ), @@ -371,10 +371,10 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( // for now, map all to fade effect pGeneratedActivity = ActivitiesFactory::createSimpleActivity( rParms, - AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString( + AnimationFactory::createNumberPropertyAnimation( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Opacity") ), - rShape, + rShape, rShapeManager, rSlideSize ), xTransition->getMode() ); @@ -388,7 +388,7 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( if( !pGeneratedActivity ) { - // No animation generated, maybe no table entry for given + // No animation generated, maybe no table entry for given // transition? OSL_TRACE( "TransitionFactory::createShapeTransition(): Unknown type/subtype (%d/%d) " @@ -400,7 +400,7 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( "TransitionFactory::createShapeTransition(): Unknown type/subtype " "combination encountered" ); } - + return pGeneratedActivity; } diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx index 466052b67900..533d2abf7a51 100644 --- a/slideshow/source/engine/transitions/slidechangebase.cxx +++ b/slideshow/source/engine/transitions/slidechangebase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ SlideChangeBase::SlideChangeBase( boost::optional<SlideSharedPtr> const & leavin const UnoViewContainer& rViewContainer, ScreenUpdater& rScreenUpdater, EventMultiplexer& rEventMultiplexer, - bool bCreateLeavingSprites, + bool bCreateLeavingSprites, bool bCreateEnteringSprites ) : mpSoundPlayer( pSoundPlayer ), mrEventMultiplexer(rEventMultiplexer), @@ -77,7 +77,7 @@ SlideChangeBase::SlideChangeBase( boost::optional<SlideSharedPtr> const & leavin SlideBitmapSharedPtr SlideChangeBase::getLeavingBitmap( const ViewEntry& rViewEntry ) const { if( !rViewEntry.mpLeavingBitmap ) - rViewEntry.mpLeavingBitmap = createBitmap(rViewEntry.mpView, + rViewEntry.mpLeavingBitmap = createBitmap(rViewEntry.mpView, maLeavingSlide); return rViewEntry.mpLeavingBitmap; @@ -107,25 +107,25 @@ SlideBitmapSharedPtr SlideChangeBase::createBitmap( const UnoViewSharedPtr& // sprite to black. // create empty, black-filled bitmap - const basegfx::B2ISize slideSizePixel( + const basegfx::B2ISize slideSizePixel( getSlideSizePixel( mpEnteringSlide->getSlideSize(), - rView )); + rView )); cppcanvas::CanvasSharedPtr pCanvas( rView->getCanvas() ); // create a bitmap of appropriate size - cppcanvas::BitmapSharedPtr pBitmap( - cppcanvas::BaseGfxFactory::getInstance().createBitmap( - pCanvas, + cppcanvas::BitmapSharedPtr pBitmap( + cppcanvas::BaseGfxFactory::getInstance().createBitmap( + pCanvas, slideSizePixel ) ); - + ENSURE_OR_THROW( pBitmap, "SlideChangeBase::createBitmap(): Cannot create page bitmap" ); - + cppcanvas::BitmapCanvasSharedPtr pBitmapCanvas( pBitmap->getBitmapCanvas() ); - + ENSURE_OR_THROW( pBitmapCanvas, "SlideChangeBase::createBitmap(): " "Cannot create page bitmap canvas" ); @@ -139,7 +139,7 @@ SlideBitmapSharedPtr SlideChangeBase::createBitmap( const UnoViewSharedPtr& slideSizePixel.getX(), slideSizePixel.getY() ), 0x000000FFU ); - + pRet.reset( new SlideBitmap( pBitmap )); } else @@ -152,13 +152,13 @@ SlideBitmapSharedPtr SlideChangeBase::createBitmap( const UnoViewSharedPtr& ::basegfx::B2ISize SlideChangeBase::getEnteringSlideSizePixel( const UnoViewSharedPtr& pView ) const { - return getSlideSizePixel( mpEnteringSlide->getSlideSize(), + return getSlideSizePixel( mpEnteringSlide->getSlideSize(), pView ); } ::basegfx::B2ISize SlideChangeBase::getLeavingSlideSizePixel( const UnoViewSharedPtr& pView ) const { - return getSlideSizePixel( (*maLeavingSlide)->getSlideSize(), + return getSlideSizePixel( (*maLeavingSlide)->getSlideSize(), pView ); } @@ -181,7 +181,7 @@ void SlideChangeBase::renderBitmap( // render at output position, don't modify bitmap object (no move!): const basegfx::B2DHomMatrix transform(basegfx::tools::createTranslateB2DHomMatrix( pageOrigin.getX(), pageOrigin.getY())); - + pDevicePixelCanvas->setTransformation( transform ); pSlideBitmap->draw( pDevicePixelCanvas ); } @@ -275,10 +275,10 @@ bool SlideChangeBase::operator()( double nValue ) { if( mbFinished ) return false; - - const std::size_t nEntries( maViewData.size() ); + + const std::size_t nEntries( maViewData.size() ); bool bSpritesVisible( mbSpritesVisible ); - + for( ::std::size_t i=0; i<nEntries; ++i ) { // calc sprite offsets. The enter/leaving bitmaps are only @@ -293,7 +293,7 @@ bool SlideChangeBase::operator()( double nValue ) const ::cppcanvas::CanvasSharedPtr& rCanvas( rViewEntry.mpView->getCanvas() ); ::cppcanvas::CustomSpriteSharedPtr& rInSprite( rViewEntry.mpInSprite ); ::cppcanvas::CustomSpriteSharedPtr& rOutSprite( rViewEntry.mpOutSprite ); - + // TODO(F2): Properly respect clip here. // Might have to be transformed, too. @@ -301,14 +301,14 @@ bool SlideChangeBase::operator()( double nValue ) rViewEntry.mpView->getTransformation() ); const ::basegfx::B2DPoint aSpritePosPixel( aViewTransform * ::basegfx::B2DPoint() ); - - // move sprite to final output position, in + + // move sprite to final output position, in // device coordinates if( rOutSprite ) rOutSprite->movePixel( aSpritePosPixel ); if( rInSprite ) rInSprite->movePixel( aSpritePosPixel ); - + if( !mbSpritesVisible ) { if( rOutSprite ) @@ -323,14 +323,14 @@ bool SlideChangeBase::operator()( double nValue ) // TODO(F1): SlideBitmap is not fully portable // between different canvases! - + // render the content OSL_ASSERT( getLeavingBitmap( rViewEntry ) ); if( getLeavingBitmap( rViewEntry ) ) getLeavingBitmap( rViewEntry )->draw( pOutContentCanvas ); } } - + if( rInSprite ) { // only render once: clipping is done @@ -343,20 +343,20 @@ bool SlideChangeBase::operator()( double nValue ) // TODO(F1): SlideBitmap is not fully portable // between different canvases! - + // render the content getEnteringBitmap( rViewEntry )->draw( pInContentCanvas ); } } } - + if( rOutSprite ) performOut( rOutSprite, rViewEntry, rCanvas, nValue ); if( rInSprite ) performIn( rInSprite, rViewEntry, rCanvas, nValue ); - + // finishing deeds for first run. - if( !mbSpritesVisible) + if( !mbSpritesVisible) { // enable sprites: if( rOutSprite ) @@ -366,10 +366,10 @@ bool SlideChangeBase::operator()( double nValue ) bSpritesVisible = true; } } // for_each( sprite ) - + mbSpritesVisible = bSpritesVisible; mrScreenUpdater.notifyUpdate(); - + return true; } @@ -391,7 +391,7 @@ void SlideChangeBase::performOut( double SlideChangeBase::getUnderlyingValue() const { - return 0.0; // though this should be used in concert with + return 0.0; // though this should be used in concert with // ActivitiesFactory::createSimpleActivity, better // explicitely name our start value. // Permissible range for operator() above is [0,1] @@ -420,7 +420,7 @@ void SlideChangeBase::viewRemoved( const UnoViewSharedPtr& rView ) // erase corresponding entry from maViewData maViewData.erase( std::remove_if( - maViewData.begin(), + maViewData.begin(), maViewData.end(), boost::bind( std::equal_to<UnoViewSharedPtr>(), @@ -439,14 +439,14 @@ void SlideChangeBase::viewChanged( const UnoViewSharedPtr& rView ) // find entry corresponding to modified view ViewsVecT::iterator aModifiedEntry( std::find_if( - maViewData.begin(), + maViewData.begin(), maViewData.end(), boost::bind( std::equal_to<UnoViewSharedPtr>(), rView, // select view: boost::bind( &ViewEntry::getView, _1 ) ))); - + OSL_ASSERT( aModifiedEntry != maViewData.end() ); if( aModifiedEntry == maViewData.end() ) return; @@ -471,13 +471,13 @@ void SlideChangeBase::viewsChanged() // resize) clearViewEntry( *aIter ); addSprites( *aIter ); - + ++aIter; } } cppcanvas::CustomSpriteSharedPtr SlideChangeBase::createSprite( - UnoViewSharedPtr const & pView, + UnoViewSharedPtr const & pView, basegfx::B2DSize const & rSpriteSize, double nPrio ) const { @@ -486,7 +486,7 @@ cppcanvas::CustomSpriteSharedPtr SlideChangeBase::createSprite( pView->createSprite( rSpriteSize, nPrio )); - // alpha default is 0.0, which seems to be + // alpha default is 0.0, which seems to be // a bad idea when viewing content... pSprite->setAlpha( 1.0 ); if (mbSpritesVisible) @@ -503,28 +503,28 @@ void SlideChangeBase::addSprites( ViewEntry& rEntry ) const basegfx::B2ISize leavingSlideSizePixel( getLeavingBitmap( rEntry )->getSize() ); - rEntry.mpOutSprite = createSprite( rEntry.mpView, - leavingSlideSizePixel, + rEntry.mpOutSprite = createSprite( rEntry.mpView, + leavingSlideSizePixel, 100 ); } - - if( mbCreateEnteringSprites ) + + if( mbCreateEnteringSprites ) { // create entering sprite: const basegfx::B2ISize enteringSlideSizePixel( getSlideSizePixel( mpEnteringSlide->getSlideSize(), rEntry.mpView )); - rEntry.mpInSprite = createSprite( rEntry.mpView, - enteringSlideSizePixel, + rEntry.mpInSprite = createSprite( rEntry.mpView, + enteringSlideSizePixel, 101 ); } } void SlideChangeBase::clearViewEntry( ViewEntry& rEntry ) { - // clear stale info (both bitmaps and sprites prolly need a - // resize) + // clear stale info (both bitmaps and sprites prolly need a + // resize) rEntry.mpEnteringBitmap.reset(); rEntry.mpLeavingBitmap.reset(); rEntry.mpInSprite.reset(); diff --git a/slideshow/source/engine/transitions/slidechangebase.hxx b/slideshow/source/engine/transitions/slidechangebase.hxx index e0b9c4635996..df4cca31701c 100644 --- a/slideshow/source/engine/transitions/slidechangebase.hxx +++ b/slideshow/source/engine/transitions/slidechangebase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,8 +42,8 @@ #include <boost/optional.hpp> namespace cppcanvas -{ - class Canvas; +{ + class Canvas; class CustomSprite; } @@ -51,7 +51,7 @@ namespace slideshow { namespace internal { /** Base class for all slide change effects. - + This class provides the basic sprite and view handling functionality. Derived classes should normally only need to implement the perform() method. @@ -65,20 +65,20 @@ public: // NumberAnimation virtual bool operator()( double x ); virtual double getUnderlyingValue() const; - + // Animation virtual void prefetch( const AnimatableShapeSharedPtr&, const ShapeAttributeLayerSharedPtr& ); virtual void start( const AnimatableShapeSharedPtr&, const ShapeAttributeLayerSharedPtr& ); - virtual void end(); + virtual void end(); // ViewEventHandler virtual void viewAdded( const UnoViewSharedPtr& rView ); virtual void viewRemoved( const UnoViewSharedPtr& rView ); virtual void viewChanged( const UnoViewSharedPtr& rView ); virtual void viewsChanged(); - + protected: /** Create a new SlideChanger, for the given leaving and entering slides. @@ -90,7 +90,7 @@ protected: const UnoViewContainer& rViewContainer, ScreenUpdater& rScreenUpdater, EventMultiplexer& rEventMultiplexer, - bool bCreateLeavingSprites = true, + bool bCreateLeavingSprites = true, bool bCreateEnteringSprites = true ); /// Info on a per-view basis @@ -98,8 +98,8 @@ protected: { ViewEntry() {} - explicit ViewEntry( const UnoViewSharedPtr& rView ) : - mpView( rView ) + explicit ViewEntry( const UnoViewSharedPtr& rView ) : + mpView( rView ) { } @@ -125,24 +125,24 @@ protected: SlideBitmapSharedPtr getLeavingBitmap( const ViewEntry& rViewEntry ) const; SlideBitmapSharedPtr getEnteringBitmap( const ViewEntry& rViewEntry ) const; - + SlideBitmapSharedPtr createBitmap( const UnoViewSharedPtr& pView, const boost::optional<SlideSharedPtr>& rSlide_ ) const; - + ::basegfx::B2ISize getEnteringSlideSizePixel( const UnoViewSharedPtr& pView ) const; ::basegfx::B2ISize getLeavingSlideSizePixel( const UnoViewSharedPtr& pView ) const; void renderBitmap( SlideBitmapSharedPtr const& pSlideBitmap, - boost::shared_ptr<cppcanvas::Canvas> const& pCanvas ); - + boost::shared_ptr<cppcanvas::Canvas> const& pCanvas ); + /** Called on derived classes to implement actual slide change. - + This method is called with the sprite of the slide coming 'in' - + @param rSprite Current sprite to operate on. This is the sprite of the 'entering' slide - + @param t Current parameter value */ @@ -151,15 +151,15 @@ protected: const ViewEntry& rViewEntry, const boost::shared_ptr<cppcanvas::Canvas>& rDestinationCanvas, double t ); - + /** Called on derived classes to implement actual slide change. - + This method is called with the sprite of the slide moving 'out' - + @param rSprite Current sprite to operate on. This is the sprite of the 'leaving' slide - + @param t Current parameter value */ @@ -172,7 +172,7 @@ protected: ScreenUpdater& getScreenUpdater() const { return mrScreenUpdater; } private: - + boost::shared_ptr<cppcanvas::CustomSprite> createSprite( UnoViewSharedPtr const & pView, ::basegfx::B2DSize const & rSpriteSize, @@ -185,13 +185,13 @@ private: ViewsVecT::const_iterator lookupView( UnoViewSharedPtr const & pView ) const; SoundPlayerSharedPtr mpSoundPlayer; - + EventMultiplexer& mrEventMultiplexer; ScreenUpdater& mrScreenUpdater; ::boost::optional<SlideSharedPtr> maLeavingSlide; SlideSharedPtr mpEnteringSlide; - + ViewsVecT maViewData; const UnoViewContainer& mrViewContainer; diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx index ab1ad816d3f6..28636b2fe49f 100644 --- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,7 +84,7 @@ void fillPage( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, const ::cppcanvas::CanvasSharedPtr pDevicePixelCanvas( rDestinationCanvas->clone() ); pDevicePixelCanvas->setTransformation( ::basegfx::B2DHomMatrix() ); - + // TODO(F2): Properly respect clip here. // Might have to be transformed, too. const ::basegfx::B2DHomMatrix aViewTransform( @@ -138,7 +138,7 @@ public: ScreenUpdater& rScreenUpdater, const uno::Reference< presentation::XTransitionFactory>& xFactory, - const SoundPlayerSharedPtr& pSoundPlayer, + const SoundPlayerSharedPtr& pSoundPlayer, EventMultiplexer& rEventMultiplexer) : SlideChangeBase( leavingSlide_, pEnteringSlide, @@ -184,7 +184,7 @@ public: bool addTransition( const UnoViewSharedPtr& rView ) { uno::Reference<presentation::XTransition> rTransition = mxFactory->createTransition( - mnTransitionType, + mnTransitionType, mnTransitionSubType, rView->getUnoView(), getLeavingBitmap(ViewEntry(rView))->getXBitmap(), @@ -197,7 +197,7 @@ public: return true; } - + virtual bool operator()( double t ) { std::for_each(maTransitions.begin(), @@ -294,7 +294,7 @@ public: } } -private: +private: // One transition object per view std::vector< TransitionViewPair* > maTransitions; @@ -337,19 +337,19 @@ public: bDirectionForward, true ) {} - + virtual void performIn( const ::cppcanvas::CustomSpriteSharedPtr& rSprite, const ViewEntry& rViewEntry, const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, double t ); - + virtual void performOut( const ::cppcanvas::CustomSpriteSharedPtr& rSprite, const ViewEntry& rViewEntry, const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, double t ); - + private: ClippingFunctor maClippingFunctor; }; @@ -365,8 +365,8 @@ void ClippedSlideChange::performIn( // that, getEnteringSizePixel() _guarantees_ to cover the whole // slide bitmap. There's a catch, though: this removes any effect // of the view transformation (e.g. rotation) from the transition. - rSprite->setClipPixel( - maClippingFunctor( t, + rSprite->setClipPixel( + maClippingFunctor( t, getEnteringSlideSizePixel(rViewEntry.mpView) ) ); } @@ -403,19 +403,19 @@ public: maFadeColor( rFadeColor ), mbFirstTurn( true ) {} - + virtual void performIn( const ::cppcanvas::CustomSpriteSharedPtr& rSprite, const ViewEntry& rViewEntry, const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, double t ); - + virtual void performOut( const ::cppcanvas::CustomSpriteSharedPtr& rSprite, const ViewEntry& rViewEntry, const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, double t ); - + private: const boost::optional< RGBColor > maFadeColor; bool mbFirstTurn; @@ -430,7 +430,7 @@ void FadingSlideChange::performIn( ENSURE_OR_THROW( rSprite, "FadingSlideChange::performIn(): Invalid sprite" ); - + if( maFadeColor ) // After half of the active time, fade in new slide rSprite->setAlpha( t > 0.5 ? 2.0*(t-0.5) : 0.0 ); @@ -451,21 +451,21 @@ void FadingSlideChange::performOut( ENSURE_OR_THROW( rDestinationCanvas, "FadingSlideChange::performOut(): Invalid dest canvas" ); - + // only needed for color fades if( maFadeColor ) { if( mbFirstTurn ) { mbFirstTurn = false; - + // clear page to given fade color. 'Leaving' slide is // painted atop of that, but slowly fading out. fillPage( rDestinationCanvas, getEnteringSlideSizePixel( rViewEntry.mpView ), *maFadeColor ); } - + // Until half of the active time, fade out old // slide. After half of the active time, old slide // will be invisible. @@ -477,23 +477,23 @@ class MovingSlideChange : public SlideChangeBase { /// Direction vector for leaving slide, const ::basegfx::B2DVector maLeavingDirection; - + /// Direction vector for entering slide, const ::basegfx::B2DVector maEnteringDirection; - + bool mbFirstPerformCall; - + public: /** Create a new SlideChanger, for the given entering slide bitmaps, which performes a moving slide change effect - + @param rLeavingDirection Direction vector. The move is performed along this direction vector, starting at a position where the leaving slide is fully visible, and ending at a position where the leaving slide is just not visible. The vector must have unit length. - + @param rEnteringDirection Direction vector. The move is performed along this direction vector, starting at a position where the @@ -527,13 +527,13 @@ public: maEnteringDirection( rEnteringDirection ), mbFirstPerformCall( true ) {} - + virtual void performIn( const ::cppcanvas::CustomSpriteSharedPtr& rSprite, const ViewEntry& rViewEntry, const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, double t ); - + virtual void performOut( const ::cppcanvas::CustomSpriteSharedPtr& rSprite, const ViewEntry& rViewEntry, @@ -548,20 +548,20 @@ void MovingSlideChange::performIn( double t ) { // intro sprite moves: - + ENSURE_OR_THROW( rSprite, "MovingSlideChange::performIn(): Invalid sprite" ); ENSURE_OR_THROW( rDestinationCanvas, "MovingSlideChange::performIn(): Invalid dest canvas" ); - - if (mbFirstPerformCall && maLeavingDirection.equalZero()) + + if (mbFirstPerformCall && maLeavingDirection.equalZero()) { mbFirstPerformCall = false; renderBitmap( getLeavingBitmap(rViewEntry), rDestinationCanvas ); } - + // TODO(F1): This does not account for non-translational // transformations! If the canvas is rotated, we still // move the sprite unrotated (which might or might not @@ -570,12 +570,12 @@ void MovingSlideChange::performIn( rDestinationCanvas->getTransformation() ); const basegfx::B2DPoint aPageOrigin( aViewTransform * basegfx::B2DPoint() ); - + // move sprite rSprite->movePixel( aPageOrigin + - ((t - 1.0) * - ::basegfx::B2DSize( getEnteringSlideSizePixel(rViewEntry.mpView) ) * + ((t - 1.0) * + ::basegfx::B2DSize( getEnteringSlideSizePixel(rViewEntry.mpView) ) * maEnteringDirection) ); } @@ -586,20 +586,20 @@ void MovingSlideChange::performOut( double t ) { // outro sprite moves: - + ENSURE_OR_THROW( rSprite, "MovingSlideChange::performOut(): Invalid sprite" ); ENSURE_OR_THROW( rDestinationCanvas, "MovingSlideChange::performOut(): Invalid dest canvas" ); - - if (mbFirstPerformCall && maEnteringDirection.equalZero()) + + if (mbFirstPerformCall && maEnteringDirection.equalZero()) { mbFirstPerformCall = false; renderBitmap( getEnteringBitmap(rViewEntry), rDestinationCanvas ); } - + // TODO(F1): This does not account for non-translational // transformations! If the canvas is rotated, we still // move the sprite unrotated (which might or might not @@ -608,11 +608,11 @@ void MovingSlideChange::performOut( rDestinationCanvas->getTransformation() ); const basegfx::B2DPoint aPageOrigin( aViewTransform * basegfx::B2DPoint() ); - + // move sprite rSprite->movePixel( - aPageOrigin + (t * - ::basegfx::B2DSize( getEnteringSlideSizePixel(rViewEntry.mpView) ) * + aPageOrigin + (t * + ::basegfx::B2DSize( getEnteringSlideSizePixel(rViewEntry.mpView) ) * maLeavingDirection) ); } @@ -638,7 +638,7 @@ NumberAnimationSharedPtr createPushWipeTransition( // wipes. leavingSlide = leavingSlide_; } - + // setup direction vector bool bComb( false ); ::basegfx::B2DVector aDirection; @@ -646,55 +646,55 @@ NumberAnimationSharedPtr createPushWipeTransition( { default: OSL_ENSURE( - false, + false, "createPushWipeTransition(): Unexpected transition " "subtype for animations::TransitionType::PUSHWIPE " "transitions" ); return NumberAnimationSharedPtr(); - + case animations::TransitionSubType::FROMTOP: aDirection = ::basegfx::B2DVector( 0.0, 1.0 ); break; - + case animations::TransitionSubType::FROMBOTTOM: aDirection = ::basegfx::B2DVector( 0.0, -1.0 ); break; - + case animations::TransitionSubType::FROMLEFT: aDirection = ::basegfx::B2DVector( 1.0, 0.0 ); break; - + case animations::TransitionSubType::FROMRIGHT: aDirection = ::basegfx::B2DVector( -1.0, 0.0 ); break; - + case animations::TransitionSubType::FROMBOTTOMRIGHT: aDirection = ::basegfx::B2DVector( -1.0, -1.0 ); break; - + case animations::TransitionSubType::FROMBOTTOMLEFT: aDirection = ::basegfx::B2DVector( 1.0, -1.0 ); break; - + case animations::TransitionSubType::FROMTOPRIGHT: aDirection = ::basegfx::B2DVector( -1.0, 1.0 ); break; - + case animations::TransitionSubType::FROMTOPLEFT: aDirection = ::basegfx::B2DVector( 1.0, 1.0 ); break; - + case animations::TransitionSubType::COMBHORIZONTAL: aDirection = ::basegfx::B2DVector( 1.0, 0.0 ); bComb = true; break; - + case animations::TransitionSubType::COMBVERTICAL: aDirection = ::basegfx::B2DVector( 0.0, 1.0 ); bComb = true; break; } - + if( bComb ) { return NumberAnimationSharedPtr( @@ -704,19 +704,19 @@ NumberAnimationSharedPtr createPushWipeTransition( rViewContainer, rScreenUpdater, rEventMultiplexer, - aDirection, + aDirection, 24 /* comb with 12 stripes */ )); } else { - return NumberAnimationSharedPtr( + return NumberAnimationSharedPtr( new MovingSlideChange( leavingSlide, pEnteringSlide, pSoundPlayer, rViewContainer, rScreenUpdater, rEventMultiplexer, - aDirection, + aDirection, aDirection )); } } @@ -738,53 +738,53 @@ NumberAnimationSharedPtr createSlideWipeTransition( { default: OSL_ENSURE( - false, + false, "createSlideWipeTransition(): Unexpected transition " "subtype for animations::TransitionType::SLIDEWIPE " "transitions" ); return NumberAnimationSharedPtr(); - + case animations::TransitionSubType::FROMTOP: aInDirection = ::basegfx::B2DVector( 0.0, 1.0 ); break; - + case animations::TransitionSubType::FROMRIGHT: aInDirection = ::basegfx::B2DVector( -1.0, 0.0 ); break; - + case animations::TransitionSubType::FROMLEFT: aInDirection = ::basegfx::B2DVector( 1.0, 0.0 ); break; - + case animations::TransitionSubType::FROMBOTTOM: aInDirection = ::basegfx::B2DVector( 0.0, -1.0 ); break; - + case animations::TransitionSubType::FROMBOTTOMRIGHT: aInDirection = ::basegfx::B2DVector( -1.0, -1.0 ); break; - + case animations::TransitionSubType::FROMBOTTOMLEFT: aInDirection = ::basegfx::B2DVector( 1.0, -1.0 ); break; - + case animations::TransitionSubType::FROMTOPRIGHT: aInDirection = ::basegfx::B2DVector( -1.0, 1.0 ); break; - + case animations::TransitionSubType::FROMTOPLEFT: aInDirection = ::basegfx::B2DVector( 1.0, 1.0 ); break; } - + if( bTransitionDirection ) { // normal, 'forward' slide wipe effect. Since the old // content is still on screen (and does not move), we omit // the 'leaving' slide. // ======================================================= - - return NumberAnimationSharedPtr( + + return NumberAnimationSharedPtr( new MovingSlideChange( boost::optional<SlideSharedPtr>() /* no slide */, pEnteringSlide, @@ -801,8 +801,8 @@ NumberAnimationSharedPtr createSlideWipeTransition( // means, that the new slide is in the back, statically, // and the old one is moving off in the foreground. // ======================================================= - - return NumberAnimationSharedPtr( + + return NumberAnimationSharedPtr( new MovingSlideChange( leavingSlide, pEnteringSlide, pSoundPlayer, @@ -823,10 +823,10 @@ NumberAnimationSharedPtr createPluginTransition( ScreenUpdater& rScreenUpdater, const uno::Reference< presentation::XTransitionFactory>& xFactory, - const SoundPlayerSharedPtr& pSoundPlayer, + const SoundPlayerSharedPtr& pSoundPlayer, EventMultiplexer& rEventMultiplexer) { - PluginSlideChange* pTransition = + PluginSlideChange* pTransition = new PluginSlideChange( nTransitionType, nTransitionSubType, @@ -872,12 +872,12 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( } return NumberAnimationSharedPtr(); } - + ENSURE_OR_THROW( pEnteringSlide, "TransitionFactory::createSlideTransition(): Invalid entering slide" ); - - if( xOptionalFactory.is() && + + if( xOptionalFactory.is() && xOptionalFactory->hasTransition(nTransitionType, nTransitionSubType) ) { // #i82460# - optional plugin factory claims this transition. delegate. @@ -897,7 +897,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( return pTransition; } - const TransitionInfo* pTransitionInfo( + const TransitionInfo* pTransitionInfo( getTransitionInfo( nTransitionType, nTransitionSubType ) ); if( pTransitionInfo != NULL ) @@ -913,12 +913,12 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( nTransitionSubType ); return NumberAnimationSharedPtr(); - + case TransitionInfo::TRANSITION_CLIP_POLYPOLYGON: { // generate parametric poly-polygon - ParametricPolyPolygonSharedPtr pPoly( - ParametricPolyPolygonFactory::createClipPolyPolygon( + ParametricPolyPolygonSharedPtr pPoly( + ParametricPolyPolygonFactory::createClipPolyPolygon( nTransitionType, nTransitionSubType ) ); // create a clip transition from that @@ -932,14 +932,14 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( bTransitionDirection, pSoundPlayer )); } - + case TransitionInfo::TRANSITION_SPECIAL: { switch( nTransitionType ) { default: OSL_ENSURE( - false, + false, "TransitionFactory::createSlideTransition(): " "Unexpected transition type for " "TRANSITION_SPECIAL transitions" ); @@ -952,7 +952,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( const TransitionInfo* pRandomTransitionInfo( getRandomTransitionInfo() ); - + ENSURE_OR_THROW( pRandomTransitionInfo != NULL, "TransitionFactory::createSlideTransition(): " @@ -1038,7 +1038,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( "SlideTransitionFactory::createSlideTransition(): Unknown FADE subtype" ); } - return NumberAnimationSharedPtr( + return NumberAnimationSharedPtr( new FadingSlideChange( leavingSlide, pEnteringSlide, @@ -1054,8 +1054,8 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( break; } } - - // No animation generated, maybe no table entry for given + + // No animation generated, maybe no table entry for given // transition? OSL_TRACE( "TransitionFactory::createSlideTransition(): " @@ -1066,7 +1066,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( false, "TransitionFactory::createSlideTransition(): " "Unknown type/subtype combination encountered" ); - + return NumberAnimationSharedPtr(); } diff --git a/slideshow/source/engine/transitions/snakewipe.cxx b/slideshow/source/engine/transitions/snakewipe.cxx index a65f8ec583ee..2d7b1a5a7eba 100644 --- a/slideshow/source/engine/transitions/snakewipe.cxx +++ b/slideshow/source/engine/transitions/snakewipe.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) static_cast<double>(line_) / m_sqrtElements ); const double col = ::basegfx::pruneScaleValue( (area - (line_ * m_sqrtElements)) / m_sqrtElements ); - + if (! ::basegfx::fTools::equalZero( line )) { ::basegfx::B2DPolygon poly; poly.append( ::basegfx::B2DPoint( 0.0, 0.0 ) ); @@ -85,7 +85,7 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) poly.setClosed(true); res.append(poly); } - + return res; } @@ -93,13 +93,13 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) double t, bool in ) const { ::basegfx::B2DPolyPolygon res; - + if (in) { const double sqrtArea2 = sqrt( t * m_sqrtElements * m_sqrtElements ); const double edge = ::basegfx::pruneScaleValue( static_cast<double>( static_cast<sal_Int32>(sqrtArea2) ) / m_sqrtElements ); - + ::basegfx::B2DPolygon poly; if (! ::basegfx::fTools::equalZero( edge )) { poly.append( ::basegfx::B2DPoint( 0.0, 0.0 ) ); @@ -119,20 +119,20 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) poly.append( ::basegfx::B2DPoint( len + a, 0.0 ) ); poly.setClosed(true); ::basegfx::B2DHomMatrix aTransform; - - if ((static_cast<sal_Int32>(sqrtArea2) & 1) == 1) + + if ((static_cast<sal_Int32>(sqrtArea2) & 1) == 1) { // odd line aTransform = basegfx::tools::createRotateB2DHomMatrix(M_PI_2 + M_PI_4); aTransform.translate(edge + m_elementEdge, 0.0); } - else + else { aTransform = basegfx::tools::createTranslateB2DHomMatrix(-a, 0.0); aTransform.rotate( -M_PI_4 ); aTransform.translate( 0.0, edge ); } - + poly.transform( aTransform ); res.append(poly); } @@ -142,7 +142,7 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) const double edge = ::basegfx::pruneScaleValue( static_cast<double>( static_cast<sal_Int32>(sqrtArea2) ) / m_sqrtElements ); - + ::basegfx::B2DPolygon poly; if (! ::basegfx::fTools::equalZero( edge )) { poly.append( ::basegfx::B2DPoint( 0.0, 1.0 ) ); @@ -163,15 +163,15 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) poly.append( ::basegfx::B2DPoint( len + a, 0.0 ) ); poly.setClosed(true); ::basegfx::B2DHomMatrix aTransform; - - if ((static_cast<sal_Int32>(sqrtArea2) & 1) == 1) + + if ((static_cast<sal_Int32>(sqrtArea2) & 1) == 1) { // odd line aTransform = basegfx::tools::createTranslateB2DHomMatrix(0.0, -height); aTransform.rotate( M_PI_2 + M_PI_4 ); aTransform.translate( 1.0, edge ); } - else + else { aTransform = basegfx::tools::createRotateB2DHomMatrix(-M_PI_4); aTransform.translate( edge, 1.0 ); @@ -179,7 +179,7 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) poly.transform( aTransform ); res.append(poly); } - + return res; } @@ -236,7 +236,7 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) res.append( flipOnYAxis(half) ); res.append( m_opposite ? flipOnXAxis(half) : half ); } - + return m_flipOnYAxis ? flipOnYAxis(res) : res; } diff --git a/slideshow/source/engine/transitions/snakewipe.hxx b/slideshow/source/engine/transitions/snakewipe.hxx index 265f383757d9..2a3ae2ebee40 100644 --- a/slideshow/source/engine/transitions/snakewipe.hxx +++ b/slideshow/source/engine/transitions/snakewipe.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ protected: ::basegfx::B2DPolyPolygon calcSnake( double t ) const; // topLeftDiagonal: ::basegfx::B2DPolyPolygon calcHalfDiagonalSnake( double t, bool in ) const; - + const sal_Int32 m_sqrtElements; const double m_elementEdge; const bool m_diagonal; diff --git a/slideshow/source/engine/transitions/spiralwipe.cxx b/slideshow/source/engine/transitions/spiralwipe.cxx index 0ceb38cacc53..aaa1f5c280c1 100644 --- a/slideshow/source/engine/transitions/spiralwipe.cxx +++ b/slideshow/source/engine/transitions/spiralwipe.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ SpiralWipe::SpiralWipe( sal_Int32 nElements, bool flipOnYAxis ) const double area = (t * m_elements); const double e = (sqrt(area) / 2.0); const sal_Int32 edge = (static_cast<sal_Int32>(e) * 2); - + basegfx::B2DHomMatrix aTransform(basegfx::tools::createTranslateB2DHomMatrix(-0.5, -0.5)); const double edge_ = ::basegfx::pruneScaleValue( static_cast<double>(edge) / m_sqrtElements ); @@ -63,7 +63,7 @@ SpiralWipe::SpiralWipe( sal_Int32 nElements, bool flipOnYAxis ) ::basegfx::B2DPolygon poly( createUnitRect() ); poly.transform( aTransform ); ::basegfx::B2DPolyPolygon res(poly); - + if (! ::basegfx::fTools::equalZero( 1.0 - t )) { const sal_Int32 edge1 = (edge + 1); sal_Int32 len = static_cast<sal_Int32>( (e - (edge /2)) * edge1 * 4 ); @@ -87,7 +87,7 @@ SpiralWipe::SpiralWipe( sal_Int32 nElements, bool flipOnYAxis ) res.append(poly); } } - + return res; } @@ -105,7 +105,7 @@ SpiralWipe::SpiralWipe( sal_Int32 nElements, bool flipOnYAxis ) ::basegfx::B2DPolyPolygon res( createUnitRect() ); ::basegfx::B2DPolyPolygon innerSpiral( calcNegSpiral( 1.0 - t ) ); innerSpiral.flip(); - + if (m_fourBox) { ::basegfx::B2DHomMatrix aTransform; aTransform.scale( 0.5, 0.5 ); @@ -123,7 +123,7 @@ SpiralWipe::SpiralWipe( sal_Int32 nElements, bool flipOnYAxis ) res.append(innerSpiral); res.append( flipOnXAxis(innerSpiral) ); } - + return m_flipOnYAxis ? flipOnYAxis(res) : res; } diff --git a/slideshow/source/engine/transitions/spiralwipe.hxx b/slideshow/source/engine/transitions/spiralwipe.hxx index 35727caa2c76..716ebbe93c4d 100644 --- a/slideshow/source/engine/transitions/spiralwipe.hxx +++ b/slideshow/source/engine/transitions/spiralwipe.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ public: virtual ::basegfx::B2DPolyPolygon operator () ( double t ); protected: ::basegfx::B2DPolyPolygon calcNegSpiral( double t ) const; - + const sal_Int32 m_elements; const sal_Int32 m_sqrtElements; const bool m_flipOnYAxis; diff --git a/slideshow/source/engine/transitions/sweepwipe.cxx b/slideshow/source/engine/transitions/sweepwipe.cxx index d5361121743c..04779af000d8 100644 --- a/slideshow/source/engine/transitions/sweepwipe.cxx +++ b/slideshow/source/engine/transitions/sweepwipe.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,27 +47,27 @@ namespace internal { t /= 2.0; if (!m_single && !m_oppositeVertical) t /= 2.0; - + ::basegfx::B2DPolygon poly( ClockWipe::calcCenteredClock( 0.25 + t ) ); ::basegfx::B2DHomMatrix aTransform; - - if (m_center) + + if (m_center) { aTransform = basegfx::tools::createTranslateB2DHomMatrix(0.5, 0.0); poly.transform( aTransform ); } ::basegfx::B2DPolyPolygon res(poly); - - if (! m_single) + + if (! m_single) { - if (m_oppositeVertical) + if (m_oppositeVertical) { aTransform = basegfx::tools::createScaleB2DHomMatrix(1.0, -1.0); aTransform.translate( 0.0, 1.0 ); poly.transform( aTransform ); poly.flip(); } - else + else { aTransform = basegfx::tools::createTranslateB2DHomMatrix(-0.5, -0.5); aTransform.rotate( M_PI ); @@ -76,7 +76,7 @@ namespace internal { } res.append(poly); } - + return m_flipOnYAxis ? flipOnYAxis(res) : res; } diff --git a/slideshow/source/engine/transitions/sweepwipe.hxx b/slideshow/source/engine/transitions/sweepwipe.hxx index f641b4afad12..2ab1f7c695ee 100644 --- a/slideshow/source/engine/transitions/sweepwipe.hxx +++ b/slideshow/source/engine/transitions/sweepwipe.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/transitionfactorytab.cxx b/slideshow/source/engine/transitions/transitionfactorytab.cxx index 671df2ab0fae..5a467fd23434 100644 --- a/slideshow/source/engine/transitions/transitionfactorytab.cxx +++ b/slideshow/source/engine/transitions/transitionfactorytab.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_slideshow.hxx" -#include <boost/current_function.hpp> +#include <boost/current_function.hpp> #include <basegfx/numeric/ftools.hxx> #include <com/sun/star/animations/TransitionType.hpp> #include <com/sun/star/animations/TransitionSubType.hpp> @@ -46,7 +46,7 @@ namespace internal { namespace { static const TransitionInfo lcl_transitionInfo[] = -{ +{ { 0, 0, @@ -107,7 +107,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to BoxWipe: animations::TransitionType::BOXWIPE, @@ -204,7 +204,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to FourBoxWipe: animations::TransitionType::FOURBOXWIPE, @@ -229,7 +229,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to BarnDoorWipe: animations::TransitionType::BARNDOORWIPE, @@ -278,7 +278,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to BarWipePolyPolygon: animations::TransitionType::DIAGONALWIPE, @@ -304,7 +304,7 @@ static const TransitionInfo lcl_transitionInfo[] = false // scale isotrophically to target size }, - + { animations::TransitionType::BOWTIEWIPE, animations::TransitionSubType::VERTICAL, @@ -329,7 +329,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to BarnDoorWipe (doubled=true): animations::TransitionType::MISCDIAGONALWIPE, @@ -354,7 +354,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to VeeWipe: animations::TransitionType::VEEWIPE, @@ -402,7 +402,7 @@ static const TransitionInfo lcl_transitionInfo[] = false // scale isotrophically to target size }, - + { animations::TransitionType::BARNVEEWIPE, animations::TransitionSubType::TOP, @@ -451,7 +451,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to ZigZagWipe: animations::TransitionType::ZIGZAGWIPE, @@ -500,7 +500,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to IrisWipe: animations::TransitionType::IRISWIPE, @@ -526,7 +526,7 @@ static const TransitionInfo lcl_transitionInfo[] = false // scale isotrophically to target size }, - + { // mapped to FigureWipe(triangle): animations::TransitionType::TRIANGLEWIPE, @@ -575,7 +575,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to FigureWipe(arrowHead): animations::TransitionType::ARROWHEADWIPE, @@ -624,7 +624,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to FigureWipe(pentagon): animations::TransitionType::PENTAGONWIPE, @@ -649,7 +649,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to FigureWipe(hexagon): animations::TransitionType::HEXAGONWIPE, @@ -674,7 +674,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to EllipseWipe: animations::TransitionType::ELLIPSEWIPE, @@ -712,7 +712,7 @@ static const TransitionInfo lcl_transitionInfo[] = false // scale isotrophically to target size }, - + { animations::TransitionType::EYEWIPE, animations::TransitionSubType::HORIZONTAL, @@ -761,7 +761,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to FigureWipe(star, points=4): animations::TransitionType::STARWIPE, @@ -798,7 +798,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { animations::TransitionType::MISCSHAPEWIPE, animations::TransitionSubType::HEART, @@ -823,7 +823,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to ClockWipe: animations::TransitionType::CLOCKWIPE, @@ -872,7 +872,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to PinWheelWipe: animations::TransitionType::PINWHEELWIPE, @@ -945,7 +945,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion true // scale isotrophically to target size, like ppt }, - + { // mapped to SweepWipe (center=true, single=true): animations::TransitionType::SINGLESWEEPWIPE, @@ -1042,7 +1042,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to FanWipe(center=true): animations::TransitionType::FANWIPE, @@ -1115,7 +1115,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to FanWipe(center=true, single=false, fanIn=false): animations::TransitionType::DOUBLEFANWIPE, @@ -1164,7 +1164,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to SweepWipe (center=true, single=false): animations::TransitionType::DOUBLESWEEPWIPE, @@ -1239,7 +1239,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { animations::TransitionType::SALOONDOORWIPE, animations::TransitionSubType::TOP, // (251) @@ -1336,7 +1336,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to SnakeWipe: animations::TransitionType::SNAKEWIPE, @@ -1409,7 +1409,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to SpiralWipe: animations::TransitionType::SPIRALWIPE, @@ -1506,7 +1506,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to ParallelSnakesWipe: animations::TransitionType::PARALLELSNAKESWIPE, @@ -1628,7 +1628,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to BoxSnakesWipe: animations::TransitionType::BOXSNAKESWIPE, @@ -1701,7 +1701,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to WaterfallWipe: animations::TransitionType::WATERFALLWIPE, @@ -1750,7 +1750,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { animations::TransitionType::PUSHWIPE, animations::TransitionSubType::FROMLEFT, @@ -2015,7 +2015,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to RandomWipe: animations::TransitionType::RANDOMBARWIPE, @@ -2040,7 +2040,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to CheckerBoard: animations::TransitionType::CHECKERBOARDWIPE, @@ -2078,7 +2078,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion true // scale isotrophically to target size }, - + ///////////////////////////////////////////////////////// // NOTE: This entry MUST be the last, to keep // createSlideTransition() from infinite recursion. Because @@ -2110,7 +2110,7 @@ const TransitionInfo* TransitionFactory::getTransitionInfo( static const ::std::size_t lcl_tableSize( sizeof(lcl_transitionInfo)/sizeof(TransitionInfo) ); static const TransitionInfo* pTableEnd = lcl_transitionInfo+lcl_tableSize; - + const TransitionInfo* pRes = ::std::find_if( lcl_transitionInfo, pTableEnd, TransitionInfo::Comparator( nTransitionType, diff --git a/slideshow/source/engine/transitions/transitiontools.cxx b/slideshow/source/engine/transitions/transitiontools.cxx index f57994e3d25c..bc174d3a5986 100644 --- a/slideshow/source/engine/transitions/transitiontools.cxx +++ b/slideshow/source/engine/transitions/transitiontools.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace internal { return ::basegfx::tools::createPolygonFromRect( ::basegfx::B2DRectangle(0.0,0.0, 1.0,1.0 ) ); -} +} ::basegfx::B2DPolyPolygon flipOnYAxis( ::basegfx::B2DPolyPolygon const & polypoly ) diff --git a/slideshow/source/engine/transitions/transitiontools.hxx b/slideshow/source/engine/transitions/transitiontools.hxx index 4653b2ced6dd..b5e61cb032ab 100644 --- a/slideshow/source/engine/transitions/transitiontools.hxx +++ b/slideshow/source/engine/transitions/transitiontools.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/veewipe.cxx b/slideshow/source/engine/transitions/veewipe.cxx index 0fa3635a63c6..19702b37f1f5 100644 --- a/slideshow/source/engine/transitions/veewipe.cxx +++ b/slideshow/source/engine/transitions/veewipe.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/veewipe.hxx b/slideshow/source/engine/transitions/veewipe.hxx index 0e6771820cd2..ac2e8d1907b6 100644 --- a/slideshow/source/engine/transitions/veewipe.hxx +++ b/slideshow/source/engine/transitions/veewipe.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/waterfallwipe.cxx b/slideshow/source/engine/transitions/waterfallwipe.cxx index b7d55be55bcd..7fca4ae582d4 100644 --- a/slideshow/source/engine/transitions/waterfallwipe.cxx +++ b/slideshow/source/engine/transitions/waterfallwipe.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/waterfallwipe.hxx b/slideshow/source/engine/transitions/waterfallwipe.hxx index bffc5227f4da..e039a998527e 100644 --- a/slideshow/source/engine/transitions/waterfallwipe.hxx +++ b/slideshow/source/engine/transitions/waterfallwipe.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/zigzagwipe.cxx b/slideshow/source/engine/transitions/zigzagwipe.cxx index 478024999c61..9eb18795c4ec 100644 --- a/slideshow/source/engine/transitions/zigzagwipe.cxx +++ b/slideshow/source/engine/transitions/zigzagwipe.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/transitions/zigzagwipe.hxx b/slideshow/source/engine/transitions/zigzagwipe.hxx index ab08cfbdada4..722749053652 100644 --- a/slideshow/source/engine/transitions/zigzagwipe.hxx +++ b/slideshow/source/engine/transitions/zigzagwipe.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/engine/unoviewcontainer.cxx b/slideshow/source/engine/unoviewcontainer.cxx index 8f7a8039d6f1..034b78485d3e 100644 --- a/slideshow/source/engine/unoviewcontainer.cxx +++ b/slideshow/source/engine/unoviewcontainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,8 +55,8 @@ namespace slideshow const UnoViewVector::iterator aEnd( maViews.end() ); // already added? - if( ::std::find_if( maViews.begin(), - aEnd, + if( ::std::find_if( maViews.begin(), + aEnd, ::boost::bind( ::std::equal_to< uno::Reference< presentation::XSlideShowView > >(), ::boost::cref( rView->getUnoView() ), @@ -74,15 +74,15 @@ namespace slideshow return true; } - UnoViewSharedPtr UnoViewContainer::removeView( const uno::Reference< presentation::XSlideShowView >& xView ) + UnoViewSharedPtr UnoViewContainer::removeView( const uno::Reference< presentation::XSlideShowView >& xView ) { // check whether same view is already added const UnoViewVector::iterator aEnd( maViews.end() ); UnoViewVector::iterator aIter; // added in the first place? - if( (aIter=::std::find_if( maViews.begin(), - aEnd, + if( (aIter=::std::find_if( maViews.begin(), + aEnd, ::boost::bind( ::std::equal_to< uno::Reference< presentation::XSlideShowView > >(), ::boost::cref( xView ), @@ -94,10 +94,10 @@ namespace slideshow return UnoViewSharedPtr(); } - OSL_ENSURE( - ::std::count_if( - maViews.begin(), - aEnd, + OSL_ENSURE( + ::std::count_if( + maViews.begin(), + aEnd, ::boost::bind( ::std::equal_to< uno::Reference< presentation::XSlideShowView > >(), ::boost::cref( xView ), @@ -119,16 +119,16 @@ namespace slideshow // remove locally const UnoViewVector::iterator aEnd( maViews.end() ); UnoViewVector::iterator aIter; - if( (aIter=::std::find( maViews.begin(), - aEnd, + if( (aIter=::std::find( maViews.begin(), + aEnd, rView )) == aEnd ) { // view seemingly was not added, failed return false; } - OSL_ENSURE( ::std::count( maViews.begin(), - aEnd, + OSL_ENSURE( ::std::count( maViews.begin(), + aEnd, rView ) == 1, "UnoViewContainer::removeView(): View was added multiple times" ); @@ -143,7 +143,7 @@ namespace slideshow ::std::for_each( maViews.begin(), maViews.end(), ::boost::mem_fn(&UnoView::_dispose) ); - maViews.clear(); + maViews.clear(); } } } diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx index 0b043968b9c6..d62a831c06cb 100644 --- a/slideshow/source/engine/usereventqueue.cxx +++ b/slideshow/source/engine/usereventqueue.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,7 +91,7 @@ bool fireSingleEvent( ContainerT & rQueue, EventQueue & rEventQueue ) { EventSharedPtr const pEvent(rQueue.front()); rQueue.pop(); - + // skip all inactive events (as the purpose of // nextEventFromQueue() is to activate the next // event, and events which return false on @@ -117,25 +117,25 @@ bool fireAllEvents( ContainerT & rQueue, EventQueue & rEventQueue ) class EventContainer { public: - EventContainer() : - maEvents() + EventContainer() : + maEvents() {} - + void clearContainer() { maEvents = ImpEventQueue(); } - + void addEvent( const EventSharedPtr& rEvent ) { maEvents.push( rEvent ); } - + bool isEmpty() { return maEvents.empty(); } - + protected: ImpEventQueue maEvents; }; @@ -148,17 +148,17 @@ class PlainEventHandler : public EventHandler, public: PlainEventHandler( EventQueue & rEventQueue ) : EventContainer(), mrEventQueue(rEventQueue) {} - + virtual void dispose() { clearContainer(); } - + virtual bool handleEvent() { return fireAllEvents( maEvents, mrEventQueue ); } - + private: EventQueue & mrEventQueue; }; @@ -168,41 +168,41 @@ class AllAnimationEventHandler : public AnimationEventHandler public: AllAnimationEventHandler( EventQueue& rEventQueue ) : mrEventQueue( rEventQueue ), - maAnimationEventMap() + maAnimationEventMap() {} - + virtual void dispose() { maAnimationEventMap.clear(); } - + virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode ) { ENSURE_OR_RETURN_FALSE( rNode, "AllAnimationEventHandler::handleAnimationEvent(): Invalid node" ); - + bool bRet( false ); - + ImpAnimationEventMap::iterator aIter; - if( (aIter=maAnimationEventMap.find( + if( (aIter=maAnimationEventMap.find( rNode->getXAnimationNode() )) != maAnimationEventMap.end() ) { ImpEventVector& rVec( aIter->second ); - + bRet = !rVec.empty(); - + // registered node found -> fire all events in the vector std::for_each( rVec.begin(), rVec.end(), boost::bind( &EventQueue::addEvent, boost::ref( mrEventQueue ), _1 ) ); - + rVec.clear(); } - + return bRet; } - + void addEvent( const EventSharedPtr& rEvent, const uno::Reference< animations::XAnimationNode >& xNode ) { @@ -215,11 +215,11 @@ public: ImpAnimationEventMap::value_type( xNode, ImpEventVector() ) ).first; } - + // add new event to queue aIter->second.push_back( rEvent ); } - + bool isEmpty() { // find at least one animation with a non-empty vector @@ -229,13 +229,13 @@ public: { if( !aCurr->second.empty() ) return false; // at least one non-empty entry found - + ++aCurr; } - + return true; // not a single non-empty entry found } - + private: EventQueue& mrEventQueue; ImpAnimationEventMap maAnimationEventMap; @@ -249,14 +249,14 @@ public: ClickEventHandler( EventQueue& rEventQueue ) : EventContainer(), mrEventQueue( rEventQueue ), - mbAdvanceOnClick( true ) + mbAdvanceOnClick( true ) {} - + void setAdvanceOnClick( bool bAdvanceOnClick ) { mbAdvanceOnClick = bAdvanceOnClick; } - + private: virtual void dispose() { @@ -268,13 +268,13 @@ private: { return handleEvent_impl(); } - + // triggered by mouse release: virtual bool handleMouseReleased( const awt::MouseEvent& evt ) { if(evt.Buttons != awt::MouseButton::LEFT) return false; - + if( mbAdvanceOnClick ) { // fire next event return handleEvent_impl(); @@ -283,14 +283,14 @@ private: return false; // advance-on-click disabled } } - + // triggered by both: virtual bool handleEvent_impl() { // fire next event: return fireSingleEvent( maEvents, mrEventQueue ); } - + private: EventQueue& mrEventQueue; bool mbAdvanceOnClick; @@ -314,7 +314,7 @@ public: /// Skip the current effect but do not triggere the next effect. void skipEffect (void) { handleEvent_impl(false); } - + private: virtual bool handleEvent_impl() { @@ -325,7 +325,7 @@ private: { // fire all events, so animation nodes can register their // next effect listeners: - if(fireAllEvents( maEvents, mrEventQueue )) + if(fireAllEvents( maEvents, mrEventQueue )) { if (mbSkipTriggersNextEffect && bNotifyNextEffect) { @@ -345,7 +345,7 @@ private: } return false; } - + private: EventQueue & mrEventQueue; EventMultiplexer & mrEventMultiplexer; @@ -358,28 +358,28 @@ class RewindEffectEventHandler : public MouseEventHandler_, public: RewindEffectEventHandler( EventQueue & rEventQueue ) : EventContainer(), mrEventQueue(rEventQueue) {} - + private: virtual void dispose() { clearContainer(); } - + virtual bool handleMouseReleased( awt::MouseEvent const& evt ) { if(evt.Buttons != awt::MouseButton::RIGHT) return false; - + return fireAllEvents( maEvents, mrEventQueue ); } - + private: EventQueue & mrEventQueue; }; /** Base class to share some common code between ShapeClickEventHandler and MouseMoveHandler - + @derive override necessary MouseEventHandler interface methods, call sendEvent() method to actually process the event. */ @@ -388,16 +388,16 @@ class MouseHandlerBase : public MouseEventHandler_ public: MouseHandlerBase( EventQueue& rEventQueue ) : mrEventQueue( rEventQueue ), - maShapeEventMap() + maShapeEventMap() {} - + virtual void dispose() { - // TODO(Q1): Check whether plain vector with swap idiom is + // TODO(Q1): Check whether plain vector with swap idiom is // okay here maShapeEventMap = ImpShapeEventMap(); } - + void addEvent( const EventSharedPtr& rEvent, const ShapeSharedPtr& rShape ) { @@ -409,11 +409,11 @@ public: ImpShapeEventMap::value_type( rShape, ImpEventQueue() ) ).first; } - + // add new event to queue aIter->second.push( rEvent ); } - + bool isEmpty() { // find at least one shape with a non-empty queue @@ -423,20 +423,20 @@ public: { if( !aCurrShape->second.empty() ) return false; // at least one non-empty entry found - + ++aCurrShape; } - + return true; // not a single non-empty entry found } - + protected: bool hitTest( const awt::MouseEvent& e, ImpShapeEventMap::reverse_iterator& o_rHitShape ) { // find hit shape in map const basegfx::B2DPoint aPosition( e.X, e.Y ); - + // find matching shape (scan reversely, to coarsely match // paint order) ImpShapeEventMap::reverse_iterator aCurrShape(maShapeEventMap.rbegin()); @@ -454,19 +454,19 @@ protected: o_rHitShape = aCurrShape; return true; } - + ++aCurrShape; } - + return false; // nothing hit } - + bool sendEvent( ImpShapeEventMap::reverse_iterator& io_rHitShape ) { // take next event from queue const bool bRet( fireSingleEvent( io_rHitShape->second, mrEventQueue ) ); - + // clear shape entry, if its queue is // empty. This is important, since the shapes // are held by shared ptr, and might otherwise @@ -482,20 +482,20 @@ protected: // orthogonality, eh?) maShapeEventMap.erase( io_rHitShape->first ); } - + return bRet; } - + bool processEvent( const awt::MouseEvent& e ) { ImpShapeEventMap::reverse_iterator aCurrShape; - + if( hitTest( e, aCurrShape ) ) return sendEvent( aCurrShape ); - + return false; // did not handle the event } - + private: EventQueue& mrEventQueue; ImpShapeEventMap maShapeEventMap; @@ -507,20 +507,20 @@ public: ShapeClickEventHandler( CursorManager& rCursorManager, EventQueue& rEventQueue ) : MouseHandlerBase( rEventQueue ), - mrCursorManager( rCursorManager ) + mrCursorManager( rCursorManager ) {} - + virtual bool handleMouseReleased( const awt::MouseEvent& e ) { if(e.Buttons != awt::MouseButton::LEFT) return false; return processEvent( e ); } - + virtual bool handleMouseMoved( const awt::MouseEvent& e ) { // TODO(P2): Maybe buffer last shape touched - + // if we have a shape click event, and the mouse // hovers over this shape, change cursor to hand ImpShapeEventMap::reverse_iterator aDummy; @@ -530,7 +530,7 @@ public: return false; // we don't /eat/ this event. Lower prio // handler should see it, too. } - + private: CursorManager& mrCursorManager; }; @@ -541,12 +541,12 @@ public: MouseEnterHandler( EventQueue& rEventQueue ) : MouseHandlerBase( rEventQueue ), mpLastShape() {} - + virtual bool handleMouseMoved( const awt::MouseEvent& e ) { // TODO(P2): Maybe buffer last shape touched, and // check against that _first_ - + ImpShapeEventMap::reverse_iterator aCurr; if( hitTest( e, aCurr ) ) { @@ -564,11 +564,11 @@ public: // don't hit no shape - thus, last shape is NULL mpLastShape.reset(); } - + return false; // we don't /eat/ this event. Lower prio // handler should see it, too. } - + private: ShapeSharedPtr mpLastShape; }; @@ -579,12 +579,12 @@ public: MouseLeaveHandler( EventQueue& rEventQueue ) : MouseHandlerBase( rEventQueue ), maLastIter() {} - + virtual bool handleMouseMoved( const awt::MouseEvent& e ) { // TODO(P2): Maybe buffer last shape touched, and // check against that _first_ - + ImpShapeEventMap::reverse_iterator aCurr; if( hitTest( e, aCurr ) ) { @@ -599,21 +599,21 @@ public: // event sendEvent( maLastIter ); } - + // in any case, when we hit this else-branch: no // shape hit, thus have to clear maLastIter maLastIter = ImpShapeEventMap::reverse_iterator(); } - + return false; // we don't /eat/ this event. Lower prio // handler should see it, too. } - + private: ImpShapeEventMap::reverse_iterator maLastIter; }; -template< typename Handler, typename Functor > +template< typename Handler, typename Functor > void UserEventQueue::registerEvent( boost::shared_ptr< Handler >& rHandler, const EventSharedPtr& rEvent, @@ -621,18 +621,18 @@ void UserEventQueue::registerEvent( { ENSURE_OR_THROW( rEvent, "UserEventQueue::registerEvent(): Invalid event" ); - + if( !rHandler ) { // create handler - rHandler.reset( new Handler( mrEventQueue ) ); + rHandler.reset( new Handler( mrEventQueue ) ); // register handler on EventMultiplexer rRegistrationFunctor( rHandler ); } - + rHandler->addEvent( rEvent ); } -template< typename Handler, typename Arg, typename Functor > +template< typename Handler, typename Arg, typename Functor > void UserEventQueue::registerEvent( boost::shared_ptr< Handler >& rHandler, const EventSharedPtr& rEvent, @@ -641,15 +641,15 @@ void UserEventQueue::registerEvent( { ENSURE_OR_THROW( rEvent, "UserEventQueue::registerEvent(): Invalid event" ); - + if( !rHandler ) { // create handler rHandler.reset( new Handler( mrEventQueue ) ); - + // register handler on EventMultiplexer rRegistrationFunctor( rHandler ); } - + rHandler->addEvent( rEvent, rArg ); } @@ -673,7 +673,7 @@ UserEventQueue::UserEventQueue( EventMultiplexer& rMultiplexer, mpRewindEffectEventHandler(), mpDoubleClickEventHandler(), mpMouseEnterHandler(), - mpMouseLeaveHandler(), + mpMouseLeaveHandler(), mbAdvanceOnClick( true ) { } @@ -682,7 +682,7 @@ UserEventQueue::~UserEventQueue() { try { - // unregister all handlers + // unregister all handlers clear(); } catch (uno::Exception &) { @@ -692,16 +692,16 @@ UserEventQueue::~UserEventQueue() RTL_TEXTENCODING_UTF8 ).getStr() ); } } - + bool UserEventQueue::isEmpty() const { - // TODO(T2): This is not thread safe, the handlers are all - // only separately synchronized. This poses the danger of + // TODO(T2): This is not thread safe, the handlers are all + // only separately synchronized. This poses the danger of // generating false empty status on XSlideShow::update(), such // that the last events of a slide are not triggered. - + // we're empty iff all handler queues are empty - return + return (mpStartEventHandler ? mpStartEventHandler->isEmpty() : true) && (mpEndEventHandler ? mpEndEventHandler->isEmpty() : true) && (mpAnimationStartEventHandler ? mpAnimationStartEventHandler->isEmpty() : true) && @@ -782,7 +782,7 @@ void UserEventQueue::clear() void UserEventQueue::setAdvanceOnClick( bool bAdvanceOnClick ) { mbAdvanceOnClick = bAdvanceOnClick; - + // forward to handler, if existing. Otherwise, the handler // creation will do the forwarding. if( mpClickEventHandler ) @@ -792,7 +792,7 @@ void UserEventQueue::setAdvanceOnClick( bool bAdvanceOnClick ) void UserEventQueue::registerSlideStartEvent( const EventSharedPtr& rEvent ) { - registerEvent( mpStartEventHandler, + registerEvent( mpStartEventHandler, rEvent, boost::bind( &EventMultiplexer::addSlideStartHandler, boost::ref( mrMultiplexer ), _1 ) ); @@ -800,7 +800,7 @@ void UserEventQueue::registerSlideStartEvent( const EventSharedPtr& rEvent ) void UserEventQueue::registerSlideEndEvent( const EventSharedPtr& rEvent ) { - registerEvent( mpEndEventHandler, + registerEvent( mpEndEventHandler, rEvent, boost::bind( &EventMultiplexer::addSlideEndHandler, boost::ref( mrMultiplexer ), _1 ) ); @@ -810,7 +810,7 @@ void UserEventQueue::registerAnimationStartEvent( const EventSharedPtr& rEvent, const uno::Reference< animations::XAnimationNode>& xNode ) { - registerEvent( mpAnimationStartEventHandler, + registerEvent( mpAnimationStartEventHandler, rEvent, xNode, boost::bind( &EventMultiplexer::addAnimationStartHandler, @@ -821,7 +821,7 @@ void UserEventQueue::registerAnimationEndEvent( const EventSharedPtr& rEvent, const uno::Reference<animations::XAnimationNode>& xNode ) { - registerEvent( mpAnimationEndEventHandler, + registerEvent( mpAnimationEndEventHandler, rEvent, xNode, boost::bind( &EventMultiplexer::addAnimationEndHandler, @@ -832,7 +832,7 @@ void UserEventQueue::registerAudioStoppedEvent( const EventSharedPtr& rEvent, const uno::Reference<animations::XAnimationNode>& xNode ) { - registerEvent( mpAudioStoppedEventHandler, + registerEvent( mpAudioStoppedEventHandler, rEvent, xNode, boost::bind( &EventMultiplexer::addAudioStoppedHandler, @@ -845,19 +845,19 @@ void UserEventQueue::registerShapeClickEvent( const EventSharedPtr& rEvent, ENSURE_OR_THROW( rEvent, "UserEventQueue::registerShapeClickEvent(): Invalid event" ); - + if( !mpShapeClickEventHandler ) { // create handler mpShapeClickEventHandler.reset( new ShapeClickEventHandler(mrCursorManager, mrEventQueue) ); - + // register handler on EventMultiplexer mrMultiplexer.addClickHandler( mpShapeClickEventHandler, 1.0 ); mrMultiplexer.addMouseMoveHandler( mpShapeClickEventHandler, 1.0 ); } - + mpShapeClickEventHandler->addEvent( rEvent, rShape ); } @@ -871,20 +871,20 @@ public: : mrMultiplexer( rMultiplexer ), mnPrio(nPrio), mbAdvanceOnClick( bAdvanceOnClick ) {} - + void operator()( const boost::shared_ptr<ClickEventHandler>& rHandler )const { // register the handler on _two_ sources: we want the // nextEffect events, e.g. space bar, to trigger clicks, as well! mrMultiplexer.addClickHandler( rHandler, mnPrio ); mrMultiplexer.addNextEffectHandler( rHandler, mnPrio ); - + // forward advance-on-click state to newly // generated handler (that's the only reason why // we're called here) rHandler->setAdvanceOnClick( mbAdvanceOnClick ); } - + private: EventMultiplexer& mrMultiplexer; double const mnPrio; @@ -899,7 +899,7 @@ void UserEventQueue::registerNextEffectEvent( const EventSharedPtr& rEvent ) // skip effect (skipping the currently running one) // rewind effect (rewinding back running one and waiting (again) // to be started) - registerEvent( mpClickEventHandler, + registerEvent( mpClickEventHandler, rEvent, ClickEventRegistrationFunctor( mrMultiplexer, 0.0 /* default prio */, @@ -910,7 +910,7 @@ void UserEventQueue::registerSkipEffectEvent( EventSharedPtr const & pEvent, const bool bSkipTriggersNextEffect) { - if(!mpSkipEffectEventHandler) + if(!mpSkipEffectEventHandler) { mpSkipEffectEventHandler.reset( new SkipEffectEventHandler( mrEventQueue, mrMultiplexer ) ); @@ -945,27 +945,27 @@ void UserEventQueue::registerShapeDoubleClickEvent( ENSURE_OR_THROW( rEvent, "UserEventQueue::registerShapeDoubleClickEvent(): Invalid event" ); - + if( !mpShapeDoubleClickEventHandler ) { // create handler mpShapeDoubleClickEventHandler.reset( new ShapeClickEventHandler(mrCursorManager, mrEventQueue) ); - + // register handler on EventMultiplexer mrMultiplexer.addDoubleClickHandler( mpShapeDoubleClickEventHandler, 1.0 ); mrMultiplexer.addMouseMoveHandler( mpShapeDoubleClickEventHandler, 1.0 ); } - + mpShapeDoubleClickEventHandler->addEvent( rEvent, rShape ); } void UserEventQueue::registerDoubleClickEvent( const EventSharedPtr& rEvent ) { - registerEvent( mpDoubleClickEventHandler, + registerEvent( mpDoubleClickEventHandler, rEvent, boost::bind( &EventMultiplexer::addDoubleClickHandler, boost::ref( mrMultiplexer ), _1, @@ -975,7 +975,7 @@ void UserEventQueue::registerDoubleClickEvent( const EventSharedPtr& rEvent ) void UserEventQueue::registerMouseEnterEvent( const EventSharedPtr& rEvent, const ShapeSharedPtr& rShape ) { - registerEvent( mpMouseEnterHandler, + registerEvent( mpMouseEnterHandler, rEvent, rShape, boost::bind( &EventMultiplexer::addMouseMoveHandler, @@ -986,7 +986,7 @@ void UserEventQueue::registerMouseEnterEvent( const EventSharedPtr& rEvent, void UserEventQueue::registerMouseLeaveEvent( const EventSharedPtr& rEvent, const ShapeSharedPtr& rShape ) { - registerEvent( mpMouseLeaveHandler, + registerEvent( mpMouseLeaveHandler, rEvent, rShape, boost::bind( &EventMultiplexer::addMouseMoveHandler, diff --git a/slideshow/source/engine/waitsymbol.cxx b/slideshow/source/engine/waitsymbol.cxx index 2d82e80211c2..78c913d57eaa 100644 --- a/slideshow/source/engine/waitsymbol.cxx +++ b/slideshow/source/engine/waitsymbol.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_slideshow.hxx" -#include <boost/current_function.hpp> +#include <boost/current_function.hpp> #include <canvas/canvastools.hxx> #include <comphelper/anytostring.hxx> @@ -58,11 +58,11 @@ WaitSymbolSharedPtr WaitSymbol::create( const uno::Reference<rendering::XBitmap> EventMultiplexer& rEventMultiplexer, const UnoViewContainer& rViewContainer ) { - WaitSymbolSharedPtr pRet( - new WaitSymbol( xBitmap, - rScreenUpdater, + WaitSymbolSharedPtr pRet( + new WaitSymbol( xBitmap, + rScreenUpdater, rViewContainer )); - + rEventMultiplexer.addViewHandler( pRet ); return pRet; @@ -85,7 +85,7 @@ WaitSymbol::WaitSymbol( uno::Reference<rendering::XBitmap> const & xBitmap, void WaitSymbol::setVisible( const bool bVisible ) { - if( mbVisible != bVisible ) + if( mbVisible != bVisible ) { mbVisible = bVisible; @@ -112,7 +112,7 @@ void WaitSymbol::setVisible( const bool bVisible ) basegfx::B2DPoint WaitSymbol::calcSpritePos( UnoViewSharedPtr const & rView ) const { - const uno::Reference<rendering::XBitmap> xBitmap( rView->getCanvas()->getUNOCanvas(), + const uno::Reference<rendering::XBitmap> xBitmap( rView->getCanvas()->getUNOCanvas(), uno::UNO_QUERY_THROW ); const geometry::IntegerSize2D realSize( xBitmap->getSize() ); return basegfx::B2DPoint( @@ -125,12 +125,12 @@ void WaitSymbol::viewAdded( const UnoViewSharedPtr& rView ) { cppcanvas::CustomSpriteSharedPtr sprite; - try + try { const geometry::IntegerSize2D spriteSize( mxBitmap->getSize() ); sprite = rView->createSprite( basegfx::B2DVector( spriteSize.Width, spriteSize.Height ), - 1000.0 ); // sprite should be in front of all + 1000.0 ); // sprite should be in front of all // other sprites rendering::ViewState viewState; canvas::tools::initViewState( viewState ); @@ -150,7 +150,7 @@ void WaitSymbol::viewAdded( const UnoViewSharedPtr& rView ) rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); - } + } maViews.push_back( ViewsVecT::value_type( rView, sprite ) ); } @@ -173,12 +173,12 @@ void WaitSymbol::viewChanged( const UnoViewSharedPtr& rView ) // find entry corresponding to modified view ViewsVecT::iterator aModifiedEntry( std::find_if( - maViews.begin(), + maViews.begin(), maViews.end(), boost::bind( std::equal_to<UnoViewSharedPtr>(), rView, - // select view: + // select view: boost::bind( std::select1st<ViewsVecT::value_type>(), _1 )))); OSL_ASSERT( aModifiedEntry != maViews.end() ); @@ -186,7 +186,7 @@ void WaitSymbol::viewChanged( const UnoViewSharedPtr& rView ) return; if( aModifiedEntry->second ) - aModifiedEntry->second->movePixel( + aModifiedEntry->second->movePixel( calcSpritePos(aModifiedEntry->first) ); } diff --git a/slideshow/source/engine/waitsymbol.hxx b/slideshow/source/engine/waitsymbol.hxx index af15548b3f10..06c11ace0791 100644 --- a/slideshow/source/engine/waitsymbol.hxx +++ b/slideshow/source/engine/waitsymbol.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ public: ScreenUpdater& rScreenUpdater, EventMultiplexer& rEventMultiplexer, const UnoViewContainer& rViewContainer ); - + /** Shows the wait symbol. */ void show() { setVisible(true); } diff --git a/slideshow/source/engine/wakeupevent.cxx b/slideshow/source/engine/wakeupevent.cxx index 443f0de8ea26..597c9d182b16 100644 --- a/slideshow/source/engine/wakeupevent.cxx +++ b/slideshow/source/engine/wakeupevent.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ namespace slideshow mrActivityQueue( rActivityQueue ) { } - + void WakeupEvent::dispose() { mpActivity.reset(); @@ -61,25 +61,25 @@ namespace slideshow { if( !mpActivity ) return false; - + return mrActivityQueue.addActivity( mpActivity ); } - + bool WakeupEvent::isCharged() const { // this event won't expire, we fire everytime we're // re-inserted into the event queue. return true; } - + double WakeupEvent::getActivationTime( double nCurrentTime ) const { const double nElapsedTime( maTimer.getElapsedTime() ); - + return ::std::max( nCurrentTime, nCurrentTime - nElapsedTime + mnNextTime ); - } - + } + void WakeupEvent::start() { // start timer @@ -90,7 +90,7 @@ namespace slideshow { mnNextTime = rNextTime; } - + void WakeupEvent::setActivity( const ActivitySharedPtr& rActivity ) { mpActivity = rActivity; diff --git a/slideshow/source/inc/activitiesfactory.hxx b/slideshow/source/inc/activitiesfactory.hxx index 6de80ed5ec90..c123928e3539 100644 --- a/slideshow/source/inc/activitiesfactory.hxx +++ b/slideshow/source/inc/activitiesfactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,17 +81,17 @@ public: mpShape( rShape ), maSlideBounds( rSlideBounds ), mbAutoReverse( bAutoReverse ) {} - + /// End event to fire when animation is over EventSharedPtr mpEndEvent; - + /// Event queue to insert the end event into. EventQueue& mrEventQueue; /// Event queue to insert the end event into. ActivitiesQueue& mrActivitiesQueue; - + /** Simple duration of the activity - + Specifies the minimal simple duration of the activity (minimal, because mnMinNumberOfFrames might prolongue the activity). According to SMIL, @@ -101,9 +101,9 @@ public: animation over time). */ double mnMinDuration; - + /** Minimal number of frames for this activity. - + This specifies the minimal number of frames this activity will display per simple duration. If less than this number are displayed until mnMinDuration @@ -111,9 +111,9 @@ public: mnMinNumberOfFrames are rendered. */ sal_uInt32 mnMinNumberOfFrames; - + /** Number of repeats for the simple duration - + This specified the number of repeats. The mnMinDuration times maRepeats yields the total duration of this activity. If this value is @@ -121,197 +121,197 @@ public: indefinitely. */ ::boost::optional<double> const maRepeats; - + /// Fraction of simple time to accelerate animation double mnAcceleration; - + /// Fraction of simple time to decelerate animation double mnDeceleration; - + /// Shape, to get bounds from ShapeSharedPtr mpShape; - + /// LayerManager, to get page size from ::basegfx::B2DVector maSlideBounds; - + /// When true, activity is played reversed after mnDuration. bool mbAutoReverse; }; - + /** Create an activity from an XAnimate node. - + This method creates an animated activity from the given XAnimate node, extracting all necessary animation parameters from that. Note that due to the animator parameter, the animation values must be convertible to a double value. - + @param rParms Factory parameter structure - + @param rAnimator Animator sub-object - + @param xNode The SMIL animation node to animate */ static AnimationActivitySharedPtr createAnimateActivity( const CommonParameters& rParms, - const NumberAnimationSharedPtr& rAnimator, - const ::com::sun::star::uno::Reference< + const NumberAnimationSharedPtr& rAnimator, + const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate >& xNode ); - + /** Create an activity from an XAnimate node. - + This method creates an animated activity from the given XAnimate node, extracting all necessary animation parameters from that. Note that due to the animator parameter, the animation values must be convertible to a double value. - + @param rParms Factory parameter structure - + @param rAnimator Animator sub-object - + @param xNode The SMIL animation node to animate */ static AnimationActivitySharedPtr createAnimateActivity( const CommonParameters& rParms, - const EnumAnimationSharedPtr& rAnimator, - const ::com::sun::star::uno::Reference< + const EnumAnimationSharedPtr& rAnimator, + const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate >& xNode ); - + /** Create an activity from an XAnimate node. - + This method creates an animated activity from the given XAnimate node, extracting all necessary animation parameters from that. Note that due to the animator parameter, the animation values must be convertible to a color value. - + @param rParms Factory parameter structure - + @param rAnimator Animator sub-object - + @param xNode The SMIL animation node to animate */ static AnimationActivitySharedPtr createAnimateActivity( const CommonParameters& rParms, - const ColorAnimationSharedPtr& rAnimator, - const ::com::sun::star::uno::Reference< + const ColorAnimationSharedPtr& rAnimator, + const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate >& xNode ); - + /** Create an activity from an XAnimate node. - + This method creates an animated activity from the given XAnimate node, extracting all necessary animation parameters from that. Note that due to the animator parameter, the animation values must be convertible to a color value. - + @param rParms Factory parameter structure - + @param rAnimator Animator sub-object - + @param xNode The SMIL animation node to animate */ static AnimationActivitySharedPtr createAnimateActivity( const CommonParameters& rParms, - const HSLColorAnimationSharedPtr& rAnimator, - const ::com::sun::star::uno::Reference< + const HSLColorAnimationSharedPtr& rAnimator, + const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimateColor >& xNode ); - + /** Create an activity from an XAnimate node. - + This method creates an animated activity from the given XAnimate node, extracting all necessary animation parameters from that. Note that due to the animator parameter, the animation values must be convertible to a pair of double values. - + @param rParms Factory parameter structure - + @param rAnimator Animator sub-object - + @param xNode The SMIL animation node to animate */ static AnimationActivitySharedPtr createAnimateActivity( const CommonParameters& rParms, - const PairAnimationSharedPtr& rAnimator, - const ::com::sun::star::uno::Reference< + const PairAnimationSharedPtr& rAnimator, + const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate >& xNode ); - + /** Create an activity from an XAnimate node. - + This method creates an animated activity from the given XAnimate node, extracting all necessary animation parameters from that. Note that due to the animator parameter, the animation values must be convertible to a string. - + @param rParms Factory parameter structure - + @param rAnimator Animator sub-object - + @param xNode The SMIL animation node to animate */ static AnimationActivitySharedPtr createAnimateActivity( const CommonParameters& rParms, - const StringAnimationSharedPtr& rAnimator, - const ::com::sun::star::uno::Reference< + const StringAnimationSharedPtr& rAnimator, + const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate >& xNode ); - + /** Create an activity from an XAnimate node. - + This method creates an animated activity from the given XAnimate node, extracting all necessary animation parameters from that. Note that due to the animator parameter, the animation values must be convertible to a bool value. - + @param rParms Factory parameter structure - + @param rAnimator Animator sub-object - + @param xNode The SMIL animation node to animate */ static AnimationActivitySharedPtr createAnimateActivity( const CommonParameters& rParms, - const BoolAnimationSharedPtr& rAnimator, - const ::com::sun::star::uno::Reference< + const BoolAnimationSharedPtr& rAnimator, + const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate >& xNode ); - + /** Create a simple activity for the given animator - + This method is suited to create activities for custom animations, which need a simple double value and lasts a given timespan. This activity always generates values from the [0,1] range. - + @param rParms Factory parameter structure - + @param rAnimator Animator sub-object - + @param bDirectionForward If true, the activity goes 'forward', i.e. from 0 to 1. With false, the direction is reversed. @@ -320,7 +320,7 @@ public: const CommonParameters& rParms, const NumberAnimationSharedPtr& rAnimator, bool bDirectionForward ); - + private: // default: constructor/destructor disabed ActivitiesFactory(); diff --git a/slideshow/source/inc/activitiesqueue.hxx b/slideshow/source/inc/activitiesqueue.hxx index 927d12545640..918216634081 100644 --- a/slideshow/source/inc/activitiesqueue.hxx +++ b/slideshow/source/inc/activitiesqueue.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ namespace slideshow adjusting and holding global presentation time. */ ActivitiesQueue( - const ::boost::shared_ptr< ::canvas::tools::ElapsedTime >& pPresTimer ); + const ::boost::shared_ptr< ::canvas::tools::ElapsedTime >& pPresTimer ); ~ActivitiesQueue(); /** Add the given activity to the queue. @@ -97,22 +97,22 @@ namespace slideshow /** returns number of all activities, waiting, reinserted and dequeued */ std::size_t size() const - { + { return maCurrentActivitiesWaiting.size() + maCurrentActivitiesReinsert.size() + maDequeuedActivities.size(); } - + private: ::boost::shared_ptr< ::canvas::tools::ElapsedTime > mpTimer; - + typedef ::std::deque< ActivitySharedPtr > ActivityQueue; - ActivityQueue maCurrentActivitiesWaiting; // currently running - // activities, that still + ActivityQueue maCurrentActivitiesWaiting; // currently running + // activities, that still // await processing for this // round - ActivityQueue maCurrentActivitiesReinsert; // currently running - // activities, that are + ActivityQueue maCurrentActivitiesReinsert; // currently running + // activities, that are // already processed for // this round, and wants // to be reinserted next diff --git a/slideshow/source/inc/activity.hxx b/slideshow/source/inc/activity.hxx index 13e68af9529a..d2b4fcdc27b3 100644 --- a/slideshow/source/inc/activity.hxx +++ b/slideshow/source/inc/activity.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,12 +58,12 @@ namespace slideshow If this method returns a time lag greater than 0.0, the ActivitiesQueue will adjust the global slideshow time, by subtracting the given amount of lag. - + @return time lag or 0.0. Value must be greater or equal than zero. */ virtual double calcTimeLag() const = 0; - + /** Query whether this activity is still continuing @return true, if this activity still @@ -85,7 +85,7 @@ namespace slideshow shape. */ virtual void dequeued() = 0; - + /** Forces this activity deactivate and get to its end state (if possible), but does _not_ dispose. */ diff --git a/slideshow/source/inc/animatableshape.hxx b/slideshow/source/inc/animatableshape.hxx index ce033d6dcb1d..0e0d2c8515c3 100644 --- a/slideshow/source/inc/animatableshape.hxx +++ b/slideshow/source/inc/animatableshape.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/inc/animatedsprite.hxx b/slideshow/source/inc/animatedsprite.hxx index d2c697d5ed2c..3ac5bc4cf0fc 100644 --- a/slideshow/source/inc/animatedsprite.hxx +++ b/slideshow/source/inc/animatedsprite.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,8 +73,8 @@ namespace slideshow Priority of the sprite. Must remain static over the lifetime of this object */ - AnimatedSprite( const ViewLayerSharedPtr& rViewLayer, - const ::basegfx::B2DSize& rSpriteSizePixel, + AnimatedSprite( const ViewLayerSharedPtr& rViewLayer, + const ::basegfx::B2DSize& rSpriteSizePixel, double nSpritePrio ); /** Resize the sprite. @@ -93,10 +93,10 @@ namespace slideshow canvas by the specified amount of device pixel (for subsequent render operations). */ - void setPixelOffset( const ::basegfx::B2DSize& rPixelOffset ); + void setPixelOffset( const ::basegfx::B2DSize& rPixelOffset ); /// Retrieve current pixel offset for content output. - ::basegfx::B2DSize getPixelOffset() const; + ::basegfx::B2DSize getPixelOffset() const; /// Show the sprite void show(); @@ -159,23 +159,23 @@ namespace slideshow @param rPrio The new sprite prio. Must be in the range [0,1] - */ + */ void setPriority( double rPrio ); private: - ViewLayerSharedPtr mpViewLayer; + ViewLayerSharedPtr mpViewLayer; - ::cppcanvas::CustomSpriteSharedPtr mpSprite; - ::basegfx::B2DSize maEffectiveSpriteSizePixel; - ::basegfx::B2DSize maContentPixelOffset; + ::cppcanvas::CustomSpriteSharedPtr mpSprite; + ::basegfx::B2DSize maEffectiveSpriteSizePixel; + ::basegfx::B2DSize maContentPixelOffset; double mnSpritePrio; - double mnAlpha; + double mnAlpha; ::boost::optional< ::basegfx::B2DPoint > maPosPixel; ::boost::optional< ::basegfx::B2DPolyPolygon > maClip; ::boost::optional< ::basegfx::B2DHomMatrix > maTransform; - bool mbSpriteVisible; + bool mbSpriteVisible; }; typedef ::boost::shared_ptr< AnimatedSprite > AnimatedSpriteSharedPtr; diff --git a/slideshow/source/inc/animation.hxx b/slideshow/source/inc/animation.hxx index 54de93bb3fd8..91d137bf048e 100644 --- a/slideshow/source/inc/animation.hxx +++ b/slideshow/source/inc/animation.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ namespace slideshow @param rAttrLayer Attribute layer to play the animation on. */ - virtual void start( const AnimatableShapeSharedPtr& rShape, + virtual void start( const AnimatableShapeSharedPtr& rShape, const ShapeAttributeLayerSharedPtr& rAttrLayer ) = 0; /** Notify that the animation is about to end. diff --git a/slideshow/source/inc/animationactivity.hxx b/slideshow/source/inc/animationactivity.hxx index 656b14ab02fc..d712947106a8 100644 --- a/slideshow/source/inc/animationactivity.hxx +++ b/slideshow/source/inc/animationactivity.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,8 +63,8 @@ namespace slideshow @param rAttrLayer Attribute layer to change the animated values on. */ - virtual void setTargets( const AnimatableShapeSharedPtr& rShape, - const ShapeAttributeLayerSharedPtr& rAttrLayer ) = 0; + virtual void setTargets( const AnimatableShapeSharedPtr& rShape, + const ShapeAttributeLayerSharedPtr& rAttrLayer ) = 0; }; typedef ::boost::shared_ptr< AnimationActivity > AnimationActivitySharedPtr; diff --git a/slideshow/source/inc/animationeventhandler.hxx b/slideshow/source/inc/animationeventhandler.hxx index 73d4cbc8b2f9..44a7e137eb8b 100644 --- a/slideshow/source/inc/animationeventhandler.hxx +++ b/slideshow/source/inc/animationeventhandler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/inc/animationfactory.hxx b/slideshow/source/inc/animationfactory.hxx index 53ee69d726dc..a8ca2cfe7d56 100644 --- a/slideshow/source/inc/animationfactory.hxx +++ b/slideshow/source/inc/animationfactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ namespace slideshow Given a SMIL XAnimate node, this factory generates the appropriate Animation object from that, which will modify the attribute as specified. - */ + */ class AnimationFactory : private boost::noncopyable { public: @@ -97,23 +97,23 @@ namespace slideshow FLAG_NO_SPRITE = 1 }; - static NumberAnimationSharedPtr createNumberPropertyAnimation( const ::rtl::OUString& rAttrName, - const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + static NumberAnimationSharedPtr createNumberPropertyAnimation( const ::rtl::OUString& rAttrName, + const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - int nFlags=0 ); + int nFlags=0 ); - static EnumAnimationSharedPtr createEnumPropertyAnimation( const ::rtl::OUString& rAttrName, - const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + static EnumAnimationSharedPtr createEnumPropertyAnimation( const ::rtl::OUString& rAttrName, + const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - int nFlags=0 ); + int nFlags=0 ); - static ColorAnimationSharedPtr createColorPropertyAnimation( const ::rtl::OUString& rAttrName, - const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + static ColorAnimationSharedPtr createColorPropertyAnimation( const ::rtl::OUString& rAttrName, + const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - int nFlags=0 ); + int nFlags=0 ); /** Create scale or move animation @@ -122,30 +122,30 @@ namespace slideshow animations::AnimationTransformType::TRANSLATE or animations::AnimationTransformType::SCALE. */ - static PairAnimationSharedPtr createPairPropertyAnimation( const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + static PairAnimationSharedPtr createPairPropertyAnimation( const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - sal_Int16 nTransformType, - int nFlags=0 ); + sal_Int16 nTransformType, + int nFlags=0 ); - static StringAnimationSharedPtr createStringPropertyAnimation( const ::rtl::OUString& rAttrName, - const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + static StringAnimationSharedPtr createStringPropertyAnimation( const ::rtl::OUString& rAttrName, + const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - int nFlags=0 ); + int nFlags=0 ); - static BoolAnimationSharedPtr createBoolPropertyAnimation( const ::rtl::OUString& rAttrName, - const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + static BoolAnimationSharedPtr createBoolPropertyAnimation( const ::rtl::OUString& rAttrName, + const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - int nFlags=0 ); + int nFlags=0 ); - static NumberAnimationSharedPtr createPathMotionAnimation( const ::rtl::OUString& rSVGDPath, - sal_Int16 nAdditive, - const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + static NumberAnimationSharedPtr createPathMotionAnimation( const ::rtl::OUString& rSVGDPath, + sal_Int16 nAdditive, + const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - int nFlags=0); + int nFlags=0); private: // default: constructor/destructor disabed AnimationFactory(); diff --git a/slideshow/source/inc/animationfunction.hxx b/slideshow/source/inc/animationfunction.hxx index c1cf5b825792..683410f8e989 100644 --- a/slideshow/source/inc/animationfunction.hxx +++ b/slideshow/source/inc/animationfunction.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ namespace slideshow /** Operator to calculate function value. This method calculates the function value for the - given time instant t. + given time instant t. @param t Current time instant, must be in the range [0,1] diff --git a/slideshow/source/inc/animationnode.hxx b/slideshow/source/inc/animationnode.hxx index 52de5f2f69cc..582ad2c0fb35 100644 --- a/slideshow/source/inc/animationnode.hxx +++ b/slideshow/source/inc/animationnode.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ namespace slideshow { namespace internal { -/** This interface is used to mirror every XAnimateNode object +/** This interface is used to mirror every XAnimateNode object in the presentation core. */ class AnimationNode : public Disposable @@ -58,27 +58,27 @@ public: /// and any effect is removed from the document ENDED =16 }; - + /** Query the corresponding XAnimationNode. */ - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getXAnimationNode() const = 0; - + /** Init this node - + If this node is not in state INVALID, init() sets up the node state and schedules necessary events. If this node has children, they have their init() called, too. You will call this method whenever a slide is going to be shown. - + @return true, if init was successful; state has changed to UNRESOLVED */ virtual bool init() = 0; - + /** Resolve node start time - + Nodes can have unresolved start times, i.e. indefinite start time for container nodes, or child nodes whose parent has not yet started. Calling this method fixes @@ -86,32 +86,32 @@ public: node immediately starts its animations, that is only the case for begin=0.0. The node will change its state to RESOLVED. - + @return true, if a start event was successfully scheduled. */ virtual bool resolve() = 0; - + /** Immediately start this node - + This method starts the animation on this node, without begin timeout. The node will change its state to ACTIVE. - + @return true, if start was successful. This method might return false, if e.g. a restart is not permitted on this node. */ virtual bool activate() = 0; - + /** Immediately stop this node - + This method stops the animation on this node. The node will change its state to either ENDED or FROZEN, depending on XAnimationNode attributes. */ virtual void deactivate() = 0; - + /** End the animation on this node - + This method force-ends animation on this node. Parents may call this for their children, if their active duration ends. An ended animation will no longer have @@ -119,34 +119,34 @@ public: change its state to ENDED. */ virtual void end() = 0; - + /** Query node state - + @return the current state of this animation node. */ virtual NodeState getState() const = 0; - + /** Register a deactivating listener - + This method registers another AnimationNode as an deactivating listener, which gets notified via a notifyDeactivating() call. The node calls all registered listener, when it leaves the ACTIVE state. - + @param rNotifee AnimationNode to notify */ virtual bool registerDeactivatingListener( const ::boost::shared_ptr< AnimationNode >& rNotifee ) = 0; - + /** Called to notify another AnimationNode's deactivation - + @param rNotifier The instance who calls this method. */ virtual void notifyDeactivating( const ::boost::shared_ptr< AnimationNode >& rNotifier ) = 0; - + /** Query node whether it has an animation pending. - + @return true, if this node (or at least one of its children) has an animation pending. Used to determine if the main sequence is actually empty, or contains effects diff --git a/slideshow/source/inc/animationnodefactory.hxx b/slideshow/source/inc/animationnodefactory.hxx index 7f692486f7eb..83468f6fbe52 100644 --- a/slideshow/source/inc/animationnodefactory.hxx +++ b/slideshow/source/inc/animationnodefactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,19 +54,19 @@ namespace slideshow public: /** Create an AnimatioNode for the given XAnimationNode */ - static AnimationNodeSharedPtr createAnimationNode( const ::com::sun::star::uno::Reference< + static AnimationNodeSharedPtr createAnimationNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, const ::basegfx::B2DVector& rSlideSize, - const SlideShowContext& rContext ); - + const SlideShowContext& rContext ); + #if defined(VERBOSE) && defined(DBG_UTIL) static void showTree( AnimationNodeSharedPtr& pRootNode ); # define SHOW_NODE_TREE(a) AnimationNodeFactory::showTree(a) #else # define SHOW_NODE_TREE(a) #endif - + private: // default: constructor/destructor disabled AnimationNodeFactory(); diff --git a/slideshow/source/inc/attributableshape.hxx b/slideshow/source/inc/attributableshape.hxx index 5d255e75e569..76281592736f 100644 --- a/slideshow/source/inc/attributableshape.hxx +++ b/slideshow/source/inc/attributableshape.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -117,7 +117,7 @@ namespace slideshow @return the topmost layer */ virtual ShapeAttributeLayerSharedPtr getTopmostAttributeLayer() const = 0; - + /** Change default shape visibility @@ -129,8 +129,8 @@ namespace slideshow When true, shape will be visible, when false, invisible (modulo attribute layer overrides). */ - virtual void setVisibility( bool bVisible ) = 0; - + virtual void setVisibility( bool bVisible ) = 0; + // Sub-item handling //------------------------------------------------------------------ @@ -141,7 +141,7 @@ namespace slideshow to request specific tree nodes for this shape. */ virtual const DocTreeNodeSupplier& getTreeNodeSupplier() const = 0; - virtual DocTreeNodeSupplier& getTreeNodeSupplier() = 0; + virtual DocTreeNodeSupplier& getTreeNodeSupplier() = 0; /** Query the subset this shape displays. @@ -191,7 +191,7 @@ namespace slideshow @attention To maintain view integrity, this method should only be called from the LayerManager - + @param o_rSubset The requested Shape @@ -202,8 +202,8 @@ namespace slideshow @return true, if the shape was newly created, and false, if an already existing subset is returned. */ - virtual bool createSubset( AttributableShapeSharedPtr& o_rSubset, - const DocTreeNode& rTreeNode ) = 0; + virtual bool createSubset( AttributableShapeSharedPtr& o_rSubset, + const DocTreeNode& rTreeNode ) = 0; /** Revoke a previously generated shape subset. diff --git a/slideshow/source/inc/attributemap.hxx b/slideshow/source/inc/attributemap.hxx index 4149cb956b68..b3a956c3fce3 100644 --- a/slideshow/source/inc/attributemap.hxx +++ b/slideshow/source/inc/attributemap.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ namespace slideshow { /** Type of to-be-animated attribute. - This enum describes the type of an animated + This enum describes the type of an animated attribute. */ enum AttributeType diff --git a/slideshow/source/inc/boolanimation.hxx b/slideshow/source/inc/boolanimation.hxx index 0e4ea31072d4..01273e822c78 100644 --- a/slideshow/source/inc/boolanimation.hxx +++ b/slideshow/source/inc/boolanimation.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ namespace slideshow { public: typedef bool ValueType; - + /** Set the animation to the given value @param bValue diff --git a/slideshow/source/inc/coloranimation.hxx b/slideshow/source/inc/coloranimation.hxx index a0c54c9c6625..adbfdef16b0f 100644 --- a/slideshow/source/inc/coloranimation.hxx +++ b/slideshow/source/inc/coloranimation.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/inc/cursormanager.hxx b/slideshow/source/inc/cursormanager.hxx index a8d25ce2f40f..5fa86e05e104 100644 --- a/slideshow/source/inc/cursormanager.hxx +++ b/slideshow/source/inc/cursormanager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ namespace slideshow { public: virtual ~CursorManager() {} - + /** Request different cursor shape. @param nCursorShape diff --git a/slideshow/source/inc/debug.hxx b/slideshow/source/inc/debug.hxx index 0819eb7bcaeb..d9b3a91d0086 100644 --- a/slideshow/source/inc/debug.hxx +++ b/slideshow/source/inc/debug.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/inc/delayevent.hxx b/slideshow/source/inc/delayevent.hxx index 08299df52a33..ed934bfcd102 100644 --- a/slideshow/source/inc/delayevent.hxx +++ b/slideshow/source/inc/delayevent.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ class Delay : public Event, private ::boost::noncopyable { public: typedef ::boost::function0<void> FunctorT; - + template <typename FuncT> Delay( FuncT const& func, double nTimeout @@ -53,7 +53,7 @@ public: ) : #endif mnTimeout(nTimeout), maFunc(func), mbWasFired(false) {} - + Delay( const boost::function0<void>& func, double nTimeout #if OSL_DEBUG_LEVEL > 1 @@ -65,16 +65,16 @@ public: mnTimeout(nTimeout), maFunc(func), mbWasFired(false) {} - + // Event: virtual bool fire(); virtual bool isCharged() const; virtual double getActivationTime( double nCurrentTime ) const; // Disposable: virtual void dispose(); - + private: - double const mnTimeout; + double const mnTimeout; FunctorT maFunc; bool mbWasFired; }; @@ -82,13 +82,13 @@ private: #if OSL_DEBUG_LEVEL <= 1 /** Generate delay event - + @param func Functor to call when the event fires. - + @param nTimeout Timeout in seconds, to wait until functor is called. - + @return generated delay event */ template <typename FuncT> @@ -98,10 +98,10 @@ inline EventSharedPtr makeDelay_( FuncT const& func, double nTimeout ) } /** Generate immediate event - + @param func Functor to call when the event fires. - + @return generated immediate event. */ template <typename FuncT> @@ -126,7 +126,7 @@ public: : Delay(func, nTimeout, rsDescription), FROM_FUNCTION(from_function), FROM_FILE(from_file), FROM_LINE(from_line) {} - + char const* const FROM_FUNCTION; char const* const FROM_FILE; int const FROM_LINE; diff --git a/slideshow/source/inc/disposable.hxx b/slideshow/source/inc/disposable.hxx index 56fdf8420c2e..e9aed9bf8629 100644 --- a/slideshow/source/inc/disposable.hxx +++ b/slideshow/source/inc/disposable.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/inc/doctreenode.hxx b/slideshow/source/inc/doctreenode.hxx index 88ed798b9583..b1cc9f7ccc23 100644 --- a/slideshow/source/inc/doctreenode.hxx +++ b/slideshow/source/inc/doctreenode.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ namespace slideshow represented in a tree structure, with DocTreeNodes as the nodes. Instances of this class can be queried from the DocTreeNodeSupplier interface. - + This class has nothing to do with the Draw document tree. */ class DocTreeNode @@ -82,7 +82,7 @@ namespace slideshow /** Create empty tree node */ - DocTreeNode() : + DocTreeNode() : mnStartIndex(-1), mnEndIndex(-1), meType(NODETYPE_INVALID) @@ -91,7 +91,7 @@ namespace slideshow /** Create tree node from start and end index. - Create a tree node for the given range and type. + Create a tree node for the given range and type. @param nStartIndex Start index @@ -102,23 +102,23 @@ namespace slideshow @param eType Node type */ - DocTreeNode( sal_Int32 nStartIndex, - sal_Int32 nEndIndex, - NodeType eType ) : + DocTreeNode( sal_Int32 nStartIndex, + sal_Int32 nEndIndex, + NodeType eType ) : mnStartIndex(nStartIndex), mnEndIndex(nEndIndex), meType(eType) { } - bool isEmpty() const { return mnStartIndex == mnEndIndex; } + bool isEmpty() const { return mnStartIndex == mnEndIndex; } - sal_Int32 getStartIndex() const { return mnStartIndex; } - sal_Int32 getEndIndex() const { return mnEndIndex; } - void setStartIndex( sal_Int32 nIndex ) { mnStartIndex = nIndex; } - void setEndIndex( sal_Int32 nIndex ) { mnEndIndex = nIndex; } + sal_Int32 getStartIndex() const { return mnStartIndex; } + sal_Int32 getEndIndex() const { return mnEndIndex; } + void setStartIndex( sal_Int32 nIndex ) { mnStartIndex = nIndex; } + void setEndIndex( sal_Int32 nIndex ) { mnEndIndex = nIndex; } - NodeType getType() const { return meType; } + NodeType getType() const { return meType; } void reset() { @@ -128,9 +128,9 @@ namespace slideshow } private: - sal_Int32 mnStartIndex; - sal_Int32 mnEndIndex; - NodeType meType; + sal_Int32 mnStartIndex; + sal_Int32 mnEndIndex; + NodeType meType; }; diff --git a/slideshow/source/inc/doctreenodesupplier.hxx b/slideshow/source/inc/doctreenodesupplier.hxx index 455dc8361413..9ef6df8e2b15 100644 --- a/slideshow/source/inc/doctreenodesupplier.hxx +++ b/slideshow/source/inc/doctreenodesupplier.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,9 +91,9 @@ namespace slideshow @throws ShapeLoadFailedException, if tree node structure cannot be determined. - */ - virtual DocTreeNode getTreeNode( sal_Int32 nNodeIndex, - DocTreeNode::NodeType eNodeType ) const = 0; // throw ShapeLoadFailedException; + */ + virtual DocTreeNode getTreeNode( sal_Int32 nNodeIndex, + DocTreeNode::NodeType eNodeType ) const = 0; // throw ShapeLoadFailedException; /** Query number of tree nodes of the given type this subset contains. @@ -113,7 +113,7 @@ namespace slideshow @throws ShapeLoadFailedException, if tree node structure cannot be determined. */ - virtual sal_Int32 getNumberOfSubsetTreeNodes( const DocTreeNode& rParentNode, + virtual sal_Int32 getNumberOfSubsetTreeNodes( const DocTreeNode& rParentNode, DocTreeNode::NodeType eNodeType ) const = 0; // throw ShapeLoadFailedException; /** Create DocTreeNode from shape subset. @@ -139,10 +139,10 @@ namespace slideshow @throws ShapeLoadFailedException, if tree node structure cannot be determined. - */ - virtual DocTreeNode getSubsetTreeNode( const DocTreeNode& rParentNode, - sal_Int32 nNodeIndex, - DocTreeNode::NodeType eNodeType ) const = 0; // throw ShapeLoadFailedException; + */ + virtual DocTreeNode getSubsetTreeNode( const DocTreeNode& rParentNode, + sal_Int32 nNodeIndex, + DocTreeNode::NodeType eNodeType ) const = 0; // throw ShapeLoadFailedException; }; } diff --git a/slideshow/source/inc/enumanimation.hxx b/slideshow/source/inc/enumanimation.hxx index bb84e7bfb7e2..137a7f2f17d1 100644 --- a/slideshow/source/inc/enumanimation.hxx +++ b/slideshow/source/inc/enumanimation.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ namespace slideshow This is necessary for pure To or By animations, as the Activity cannot determine a sensible start value - otherwise. + otherwise. @attention Note that you are only permitted to query for the underlying value, if the animation has actually diff --git a/slideshow/source/inc/event.hxx b/slideshow/source/inc/event.hxx index 8acd93c0d108..dfc8ca1965c5 100644 --- a/slideshow/source/inc/event.hxx +++ b/slideshow/source/inc/event.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,30 +46,30 @@ public: #endif /** Execute the event. - + @return true, if event was successfully executed. */ virtual bool fire() = 0; - + /** Query whether this event is still charged, i.e. able to fire. - + Inactive events are ignored by the normal event containers (EventQueue, UserEventQueue etc.), and no explicit fire() is called upon them. - + @return true, if this event has already been fired. */ virtual bool isCharged() const = 0; - + /** Query the activation time instant this event shall be fired, if it was inserted at instant nCurrentTime into the queue. - + @param nCurrentTime The time from which the activation time is to be calculated from. - + @return the time instant in seconds, on which this event is to be fired. */ diff --git a/slideshow/source/inc/eventhandler.hxx b/slideshow/source/inc/eventhandler.hxx index c2ded2e99209..5620310b21e7 100644 --- a/slideshow/source/inc/eventhandler.hxx +++ b/slideshow/source/inc/eventhandler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/inc/eventmultiplexer.hxx b/slideshow/source/inc/eventmultiplexer.hxx index 99370bb4d886..a1c9210487b2 100644 --- a/slideshow/source/inc/eventmultiplexer.hxx +++ b/slideshow/source/inc/eventmultiplexer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ struct EventMultiplexerImpl; /** This class multiplexes user-activated and slide-show global events. - + This class listens at the XSlideShowView and fires events registered for certain user actions. Furthermore, global slide show state changes (such as start or end of a slide) @@ -67,7 +67,7 @@ class EventMultiplexer : private ::boost::noncopyable { public: /** Create an event multiplexer - + @param rEventQueue Reference to the main event queue. Since we hold this object by plain reference, it must live longer than we @@ -89,49 +89,49 @@ public: UnoViewContainer const& rViewContainer ); ~EventMultiplexer(); - + // Management methods // ========================================================= - + /** Clear all registered handlers. */ void clear(); - + // Automatic mode methods // ========================================================= - + /** Change automatic mode. - + @param bIsAuto When true, events will be fired automatically, not only triggered by UI events. When false, auto events will quit. */ void setAutomaticMode( bool bIsAuto ); - + /** Get automatic mode setting. */ bool getAutomaticMode() const; - + /** Set the timeout for automatic mode. - + @param nTimeout Timeout, between end of effect until start of next effect. */ void setAutomaticTimeout( double nTimeout ); - + /** Get automatic mode timeout value. */ double getAutomaticTimeout() const; - + // Handler registration methods // ========================================================= - + /** Register an event handler that will be called when views are changed. - + For each view added, viewAdded() will be called on the handler. For each view removed, viewRemoved() will be called. Each modified view will cause a viewChanged() call on @@ -139,19 +139,19 @@ public: You don't need to deregister the handler, it will be automatically removed, once the pointee becomes stale. - + @param rHandler Handler to call. */ void addViewHandler( const ViewEventHandlerWeakPtr& rHandler ); void removeViewHandler( const ViewEventHandlerWeakPtr& rHandler ); - + /** Register an event handler that will be called when a view gets clobbered. - + Note that <em>all</em> registered handlers will be called when the event. This is in contrast to the mouse events below. - + @param rHandler Handler to call when a view needs a repaint */ @@ -160,7 +160,7 @@ public: /** Register an event handler that will be called when XShapeListeners are changed. - + @param rHandler Handler to call when a shape listener changes */ @@ -169,7 +169,7 @@ public: /** Register an event handler that will be called when XShapeListeners are changed. - + @param rHandler Handler to call when a shape listener changes */ @@ -178,7 +178,7 @@ public: /** Register an event handler that will be called when user paint parameters change. - + @param rHandler Handler to call when a shape listener changes */ @@ -187,15 +187,15 @@ public: /** Register an event handler that will be called when the user requests the next effect. - + For every nextEffect event, only one of the handlers registered here is called. The handlers are considered with decreasing priority, i.e. the handler with the currently highest priority will be called. - + @param rHandler Handler to call when the next effect should start - + @param nPriority Priority with which the handlers are called. The higher the priority, the earlier this handler will be @@ -204,40 +204,40 @@ public: void addNextEffectHandler( const EventHandlerSharedPtr& rHandler, double nPriority ); void removeNextEffectHandler( const EventHandlerSharedPtr& rHandler ); - + /** Register an event handler that will be called when the slide is just shown. - + Note that <em>all</em> registered handlers will be called when the slide start occurs. This is in contrast to the mouse events below. - + @param rHandler Handler to call when the next slide starts */ void addSlideStartHandler( const EventHandlerSharedPtr& rHandler ); void removeSlideStartHandler( const EventHandlerSharedPtr& rHandler ); - + /** Register an event handler that will be called when the slide is about to vanish. - + Note that <em>all</em> registered handlers will be called when the slide end occurs. This is in contrast to the mouse events below. - + @param rHandler Handler to call when the current slide ends */ void addSlideEndHandler( const EventHandlerSharedPtr& rHandler ); void removeSlideEndHandler( const EventHandlerSharedPtr& rHandler ); - + /** Register an event handler that will be called when an XAnimationNode starts its active duration. - + Note that <em>all</em> registered handlers will be called when the animation start occurs. This is in contrast to the mouse events below. - + @param rHandler Handler to call when the animation start */ @@ -245,14 +245,14 @@ public: const AnimationEventHandlerSharedPtr& rHandler ); void removeAnimationStartHandler( const AnimationEventHandlerSharedPtr& rHandler ); - + /** Register an event handler that will be called when an XAnimationNode ends its active duration. - + Note that <em>all</em> registered handlers will be called when the animation end occurs. This is in contrast to the mouse events below. - + @param rHandler Handler to call when the animation ends */ @@ -264,11 +264,11 @@ public: /** Register an event handler that will be called when the main animation sequence of a slide ends its active duration. - + Note that <em>all</em> registered handlers will be called when the animation end occurs. This is in contrast to the mouse events below. - + @param rHandler Handler to call when the animation ends */ @@ -276,14 +276,14 @@ public: const EventHandlerSharedPtr& rHandler ); void removeSlideAnimationsEndHandler( const EventHandlerSharedPtr& rHandler ); - + /** Register an event handler that will be called when an XAudio node's sound stops playing. - + Note that <em>all</em> registered handlers will be called when the audio stops. This is in contrast to the mouse events below. - + @param rHandler Handler to call when the audio stops */ @@ -291,14 +291,14 @@ public: const AnimationEventHandlerSharedPtr& rHandler ); void removeAudioStoppedHandler( const AnimationEventHandlerSharedPtr& rHandler ); - + /** Register an event handler that will be called when an XCommand node's with the command STOPAUDIO is activated. - + Note that <em>all</em> registered handlers will be called when the audio stops. This is in contrast to the mouse events below. - + @param rHandler Handler to call when command is activated */ @@ -306,20 +306,20 @@ public: const AnimationEventHandlerSharedPtr& rHandler ); void removeCommandStopAudioHandler( const AnimationEventHandlerSharedPtr& rHandler ); - + /** Register a handler that is called when the show enters or exits pause mode. */ void addPauseHandler( const PauseEventHandlerSharedPtr& rHandler ); void removePauseHandler( const PauseEventHandlerSharedPtr& rHandler ); - + /** Register a mouse handler that is called on mouse click - + For every mouse click, only one of the handlers registered here is called. The handlers are considered with decreasing priority, i.e. the handler with the currently highest priority will be called. - + Since the handlers can reject down and up events individually, handlers should expect to be called with non-matching down and up-press counts. If your handler @@ -329,15 +329,15 @@ public: void addClickHandler( const MouseEventHandlerSharedPtr& rHandler, double nPriority ); void removeClickHandler( const MouseEventHandlerSharedPtr& rHandler ); - + /** Register a mouse handler that is called on a double mouse click - + For every mouse double click, only one of the handlers registered here is called. The handlers are considered with decreasing priority, i.e. the handler with the currently highest priority will be called. - + Since the handlers can reject down and up events individually, handlers should expect to be called with non-matching down and up-press counts. If your handler @@ -347,9 +347,9 @@ public: void addDoubleClickHandler( const MouseEventHandlerSharedPtr& rHandler, double nPriority ); void removeDoubleClickHandler( const MouseEventHandlerSharedPtr& rHandler ); - + /** Register a mouse handler that is called for mouse moves. - + For every mouse move, only one of the handlers registered here is called. The handlers are considered with decreasing priority, i.e. the handler with the @@ -359,7 +359,7 @@ public: double nPriority ); void removeMouseMoveHandler( const MouseEventHandlerSharedPtr& rHandler ); - + /** Registers a hyperlink click handler. For every hyperlink click, only one of the handlers registered @@ -370,31 +370,31 @@ public: @param rHandler @param nPriority */ - void addHyperlinkHandler( const HyperlinkHandlerSharedPtr& rHandler, + void addHyperlinkHandler( const HyperlinkHandlerSharedPtr& rHandler, double nPriority ); void removeHyperlinkHandler( const HyperlinkHandlerSharedPtr& rHandler ); - - + + // External event notifications // ========================================================= - + /** View added. - + This method adds another view, which the show is displayed on. On every added view, the EventMultiplexer registers mouse and motion event listeners. */ bool notifyViewAdded( const UnoViewSharedPtr& rView ); - + /** View removed - + This method removes a view. Registered mouse and motion event listeners are revoked. */ bool notifyViewRemoved( const UnoViewSharedPtr& rView ); - + /** View changed - + This method announces a changed view to all view listeners. View changes include size and transformation. @@ -402,9 +402,9 @@ public: View that has changed */ bool notifyViewChanged( const UnoViewSharedPtr& rView ); - + /** View changed - + This method announces a changed view to all view listeners. View changes include size and transformation. @@ -415,15 +415,15 @@ public: ::com::sun::star::presentation::XSlideShowView>& xView ); /** All Views changed - + This method announces to all view listeners that <em>every</em> known view has changed. View changes include size and transformation. */ bool notifyViewsChanged(); - + /** View clobbered - + This method announces that the given view has been clobbered by something external to the slideshow, and needs an update. @@ -468,11 +468,11 @@ public: the notification. */ bool notifyShapeCursorChange( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape, + ::com::sun::star::drawing::XShape>& xShape, sal_Int16 nPointerShape ); /** Notify a new user paint color - + Sending this notification also implies that user paint is enabled. User paint denotes the feature to draw colored lines on top of the slide content. @@ -484,23 +484,23 @@ public: bool notifyUserPaintColor( RGBColor const& rUserColor ); /** Notify a new user paint width - + Sending this notification also implies that user paint is enabled. . - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) */ bool notifyUserPaintStrokeWidth( double rUserStrokeWidth ); - - + + /** Notify a new user paint erase all ink mode - + Sending this notification also implies that user paint is enabled. User paint denotes the feature to draw colored lines on top of the slide content. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) @@ -509,9 +509,9 @@ public: bool notifySwitchPenMode(); bool notifySwitchEraserMode(); bool notifyEraseInkWidth( sal_Int32 rEraseInkSize ); - + /** Notify that user paint is disabled - + User paint denotes the feature to draw colored lines on top of the slide content. @@ -522,120 +522,120 @@ public: bool notifyUserPaintDisabled(); /** Notify that the user requested the next effect. - + This requests the slideshow to display the next effect, or move to the next slide, if none are left. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) */ bool notifyNextEffect(); - - /** Notify that a new slide is about to be displayed + + /** Notify that a new slide is about to be displayed */ bool notifySlideTransitionStarted(); /** Notify that a new slide has started - + This method is to be used from the Presentation object to signal that a new slide is starting now. This will invoke all registered slide start handlers. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) */ bool notifySlideStartEvent(); - + /** Notify that a slide has ended - + This method is to be used from the Presentation object to signal that a slide is ending now. This will invoke all registered slide end handlers. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) */ bool notifySlideEndEvent(); - + /** Notify that the given node enters its active duration. - + This method is to be used from the AnimationNode objects to signal that the active duration begins. This will invoke all registered animation start handlers. - + @param rNode Node which enters active duration. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) */ bool notifyAnimationStart( const boost::shared_ptr<AnimationNode>& rNode ); - + /** Notify that the given node leaves its active duration. - + This method is to be used from the AnimationNode objects to signal that the active duration ends now. This will invoke all registered animation end handlers. - + @param rNode Node which leaves active duration. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) */ bool notifyAnimationEnd( const boost::shared_ptr<AnimationNode>& rNode ); - + /** Notify that the slide animations sequence leaves its active duration. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) */ bool notifySlideAnimationsEnd(); - + /** Notify that for the given node, audio output has stopped. - + This method is to be used from the AnimationNode objects to signal that audio playback has just stopped. This will invoke all registered audio stopped andlers. - + @param rNode Node for which audio has stopped. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) */ bool notifyAudioStopped( const boost::shared_ptr<AnimationNode>& rNode ); - + /** Notify that the show has entered or exited pause mode - + This method is to be used from the Presentation object to signal that a slide is entering (bPauseShow=true) or exiting (bPauseShow=false) pause mode. This will invoke all registered slide end handlers. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) */ bool notifyPauseMode( bool bPauseShow ); - + /** Notify that all audio has to be stoped. - + This method is used by XCommand nodes and all sound playing nodes should listen for this command and stop theire sounds when its fired. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) @@ -643,13 +643,13 @@ public: bool notifyCommandStopAudio( const boost::shared_ptr<AnimationNode>& rNode ); /** Botifies that a hyperlink has been clicked. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) */ bool notifyHyperlinkClicked( ::rtl::OUString const& hyperLink ); - + private: boost::scoped_ptr<EventMultiplexerImpl> mpImpl; }; diff --git a/slideshow/source/inc/eventqueue.hxx b/slideshow/source/inc/eventqueue.hxx index 946b8cbcba9c..bf1954eaf784 100644 --- a/slideshow/source/inc/eventqueue.hxx +++ b/slideshow/source/inc/eventqueue.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ namespace slideshow even when they schedule new regular events without delay. */ bool addEventWhenQueueIsEmpty (const EventSharedPtr& rpEvent); - + /** Process the event queue. This method executes all events whose timeout has @@ -96,7 +96,7 @@ namespace slideshow bool isEmpty() const; /** Query timeout for the topmost event in the queue. - + @return Timeout in seconds, until the next event is ready. The time returned here is relative to the pres timer (i.e. the timer specified at the EventQueue @@ -118,19 +118,19 @@ namespace slideshow @attention do only call from event loop, this calls process_()! */ void forceEmpty(); - + /** Gets the queue's timer object. */ ::boost::shared_ptr< ::canvas::tools::ElapsedTime > const & getTimer() const { return mpTimer; } - + private: mutable ::osl::Mutex maMutex; struct EventEntry : public ::std::unary_function<EventEntry, bool> { - EventSharedPtr pEvent; - double nTime; + EventSharedPtr pEvent; + double nTime; bool operator<( const EventEntry& ) const; // to leverage priority_queue's default compare @@ -139,12 +139,12 @@ namespace slideshow }; typedef ::std::priority_queue< EventEntry > ImplQueueType; - ImplQueueType maEvents; + ImplQueueType maEvents; typedef ::std::vector<EventEntry> EventEntryVector; EventEntryVector maNextEvents; ImplQueueType maNextNextEvents; void process_( bool bFireAllEvents ); - + // perform timing of events via relative time // measurements. The world time starts, when the // EventQueue object is created diff --git a/slideshow/source/inc/expressionnode.hxx b/slideshow/source/inc/expressionnode.hxx index 624b61022cb3..1604dcc54ec2 100644 --- a/slideshow/source/inc/expressionnode.hxx +++ b/slideshow/source/inc/expressionnode.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ namespace slideshow { public: /** Predicate whether this node is constant. - + This predicate returns true, if this node is neither time- nor ViewInfo dependent. This allows for certain obtimizations, i.e. not the full diff --git a/slideshow/source/inc/expressionnodefactory.hxx b/slideshow/source/inc/expressionnodefactory.hxx index 2ffd8aa5b254..1beae509df33 100644 --- a/slideshow/source/inc/expressionnodefactory.hxx +++ b/slideshow/source/inc/expressionnodefactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,30 +51,30 @@ namespace slideshow public: static ExpressionNodeSharedPtr createConstantValueExpression( double rConstantValue ); - static ExpressionNodeSharedPtr createValueTExpression (); + static ExpressionNodeSharedPtr createValueTExpression (); - static ExpressionNodeSharedPtr createPlusExpression ( const ExpressionNodeSharedPtr& rLHS, - const ExpressionNodeSharedPtr& rRHS ); - static ExpressionNodeSharedPtr createMinusExpression ( const ExpressionNodeSharedPtr& rLHS, - const ExpressionNodeSharedPtr& rRHS ); - static ExpressionNodeSharedPtr createMultipliesExpression( const ExpressionNodeSharedPtr& rLHS, - const ExpressionNodeSharedPtr& rRHS ); - static ExpressionNodeSharedPtr createDividesExpression ( const ExpressionNodeSharedPtr& rLHS, - const ExpressionNodeSharedPtr& rRHS ); + static ExpressionNodeSharedPtr createPlusExpression ( const ExpressionNodeSharedPtr& rLHS, + const ExpressionNodeSharedPtr& rRHS ); + static ExpressionNodeSharedPtr createMinusExpression ( const ExpressionNodeSharedPtr& rLHS, + const ExpressionNodeSharedPtr& rRHS ); + static ExpressionNodeSharedPtr createMultipliesExpression( const ExpressionNodeSharedPtr& rLHS, + const ExpressionNodeSharedPtr& rRHS ); + static ExpressionNodeSharedPtr createDividesExpression ( const ExpressionNodeSharedPtr& rLHS, + const ExpressionNodeSharedPtr& rRHS ); /** Composes two ExpressionNode function. The resulting expression will calculate rOuterFunction( rInnerFunction(t) ). */ - static ExpressionNodeSharedPtr createComposedExpression ( const ExpressionNodeSharedPtr& rOuterFunction, - const ExpressionNodeSharedPtr& rInnerFunction ); + static ExpressionNodeSharedPtr createComposedExpression ( const ExpressionNodeSharedPtr& rOuterFunction, + const ExpressionNodeSharedPtr& rInnerFunction ); - static ExpressionNodeSharedPtr createMinExpression ( const ExpressionNodeSharedPtr& rOuterFunction, - const ExpressionNodeSharedPtr& rInnerFunction ); + static ExpressionNodeSharedPtr createMinExpression ( const ExpressionNodeSharedPtr& rOuterFunction, + const ExpressionNodeSharedPtr& rInnerFunction ); - static ExpressionNodeSharedPtr createMaxExpression ( const ExpressionNodeSharedPtr& rOuterFunction, - const ExpressionNodeSharedPtr& rInnerFunction ); + static ExpressionNodeSharedPtr createMaxExpression ( const ExpressionNodeSharedPtr& rOuterFunction, + const ExpressionNodeSharedPtr& rInnerFunction ); }; } } diff --git a/slideshow/source/inc/externalmediashape.hxx b/slideshow/source/inc/externalmediashape.hxx index bb4f4120ffe6..c848ee3dd3c9 100644 --- a/slideshow/source/inc/externalmediashape.hxx +++ b/slideshow/source/inc/externalmediashape.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ namespace slideshow /** Notify the Shape that it should start with playback This method enters playback mode on all registered - views. It makes the media initially visible (for videos). + views. It makes the media initially visible (for videos). */ virtual void play() = 0; diff --git a/slideshow/source/inc/framerate.hxx b/slideshow/source/inc/framerate.hxx index 4c18ca93a5c7..8899db86576c 100644 --- a/slideshow/source/inc/framerate.hxx +++ b/slideshow/source/inc/framerate.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/inc/hslcolor.hxx b/slideshow/source/inc/hslcolor.hxx index 3d260e3c42f3..797f5624f569 100644 --- a/slideshow/source/inc/hslcolor.hxx +++ b/slideshow/source/inc/hslcolor.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace slideshow { class RGBColor; - /** HSL color space class. + /** HSL color space class. */ class HSLColor { @@ -50,19 +50,19 @@ namespace slideshow explicit HSLColor( const RGBColor& rColor ); /** Hue of the color. - + @return hue, is in the range [0,360] */ double getHue() const; /** Saturation of the color. - + @return saturation, is in the range [0,1] */ double getSaturation() const; /** Luminance of the color. - + @return luminance, is in the range [0,1] */ double getLuminance() const; @@ -95,21 +95,21 @@ namespace slideshow private: // default copy/assignment are okay - // HSLColor(const HSLColor&); + // HSLColor(const HSLColor&); // HSLColor& operator=( const HSLColor& ); - HSLTriple maHSLTriple; + HSLTriple maHSLTriple; /// Pre-calculated value, needed for conversion back to RGB - double mnMagicValue; - }; + double mnMagicValue; + }; HSLColor operator+( const HSLColor& rLHS, const HSLColor& rRHS ); HSLColor operator*( const HSLColor& rLHS, const HSLColor& rRHS ); HSLColor operator*( double nFactor, const HSLColor& rRHS ); /** HSL color linear interpolator. - + @param t As usual, t must be in the [0,1] range diff --git a/slideshow/source/inc/hslcoloranimation.hxx b/slideshow/source/inc/hslcoloranimation.hxx index 2c4d61a8c574..aa05c179c3b1 100644 --- a/slideshow/source/inc/hslcoloranimation.hxx +++ b/slideshow/source/inc/hslcoloranimation.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/inc/hyperlinkarea.hxx b/slideshow/source/inc/hyperlinkarea.hxx index 1fbc46ac3d39..3255911e0f1d 100644 --- a/slideshow/source/inc/hyperlinkarea.hxx +++ b/slideshow/source/inc/hyperlinkarea.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,7 +66,7 @@ namespace slideshow virtual HyperlinkRegions getHyperlinkRegions() const = 0; /** Retrieve priority of link area - + @return the priority of the link area. Link areas with higher priority will receive hyperlink clicks in favor of areas with less priority, if they cover the same @@ -85,12 +85,12 @@ namespace slideshow // make functor adaptable (to boost::bind) typedef bool result_type; - bool operator()(const boost::shared_ptr< HyperlinkArea >& rLHS, + bool operator()(const boost::shared_ptr< HyperlinkArea >& rLHS, const boost::shared_ptr< HyperlinkArea >& rRHS) const { const double nPrioL( rLHS->getHyperlinkPriority() ); const double nPrioR( rRHS->getHyperlinkPriority() ); - + // if prios are equal, tie-break on ptr value return nPrioL == nPrioR ? rLHS.get() < rRHS.get() : nPrioL < nPrioR; } diff --git a/slideshow/source/inc/hyperlinkhandler.hxx b/slideshow/source/inc/hyperlinkhandler.hxx index 69e8ecc252d6..22a00ac09ac5 100644 --- a/slideshow/source/inc/hyperlinkhandler.hxx +++ b/slideshow/source/inc/hyperlinkhandler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/inc/interruptabledelayevent.hxx b/slideshow/source/inc/interruptabledelayevent.hxx index 4a6f6e3000e0..8e824faa2453 100644 --- a/slideshow/source/inc/interruptabledelayevent.hxx +++ b/slideshow/source/inc/interruptabledelayevent.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,8 +44,8 @@ namespace slideshow class DelayFacade : public Event { public: - DelayFacade( const EventSharedPtr& rEvent, - double nTimeout ) : + DelayFacade( const EventSharedPtr& rEvent, + double nTimeout ) : #if OSL_DEBUG_LEVEL > 1 Event(::rtl::OUString::createFromAscii("DelayFacade")), #endif @@ -88,8 +88,8 @@ namespace slideshow } private: - EventSharedPtr mpEvent; - double mnTimeout; + EventSharedPtr mpEvent; + double mnTimeout; }; /// Return value for makeInterruptableDelay() @@ -99,14 +99,14 @@ namespace slideshow event. When enqueued, this event will fire the requested action only after the specified timeout. */ - EventSharedPtr mpTimeoutEvent; + EventSharedPtr mpTimeoutEvent; /** This member contains a pointer to the interruption event. When enqueued, this event will fire immediately, interrupting a potentially waiting timeout event. */ - EventSharedPtr mpImmediateEvent; + EventSharedPtr mpImmediateEvent; }; /** Generate an interruptable delay event. @@ -133,8 +133,8 @@ namespace slideshow specified amount of time, and the other fires the given functor immediately. */ - template< typename Functor > InterruptableEventPair makeInterruptableDelay( const Functor& rFunctor, - double nTimeout ) + template< typename Functor > InterruptableEventPair makeInterruptableDelay( const Functor& rFunctor, + double nTimeout ) { InterruptableEventPair aRes; diff --git a/slideshow/source/inc/intrinsicanimationeventhandler.hxx b/slideshow/source/inc/intrinsicanimationeventhandler.hxx index ccfca5261505..6ef140953779 100644 --- a/slideshow/source/inc/intrinsicanimationeventhandler.hxx +++ b/slideshow/source/inc/intrinsicanimationeventhandler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/inc/listenercontainer.hxx b/slideshow/source/inc/listenercontainer.hxx index 303063ab027f..e9f66670e5cb 100644 --- a/slideshow/source/inc/listenercontainer.hxx +++ b/slideshow/source/inc/listenercontainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,10 +38,10 @@ namespace slideshow { namespace internal { /** Container for objects that can be notified. - + This templatized container holds listener objects, than can get notified (by calling certain methods on them). - + @tpl Listener Type for the listener objects to be held @@ -91,8 +91,8 @@ public: Guard aGuard(*this); const typename container_type::const_iterator aEnd( maListeners.end() ); - if( std::find( maListeners.begin(), - aEnd, + if( std::find( maListeners.begin(), + aEnd, rListener ) != aEnd ) { return true; // already added @@ -154,7 +154,7 @@ public: if( maListeners.size() > 1 ) { std::inplace_merge( - maListeners.begin(), + maListeners.begin(), boost::prior(maListeners.end()), maListeners.end() ); } @@ -180,24 +180,24 @@ public: const typename container_type::iterator aEnd( maListeners.end() ); typename container_type::iterator aIter; - if( (aIter=std::remove(maListeners.begin(), - aEnd, + if( (aIter=std::remove(maListeners.begin(), + aEnd, rListener)) == aEnd ) { return false; // listener not found } - + maListeners.erase( aIter, aEnd ); return true; } /// Removes all listeners in one go - void clear() + void clear() { Guard aGuard(*this); - - maListeners.clear(); + + maListeners.clear(); } /** Apply functor to one listener @@ -223,7 +223,7 @@ public: const bool bRet( ListenerOperations<ListenerT>::notifySingleListener( - local, + local, func )); { @@ -259,7 +259,7 @@ public: const bool bRet( ListenerOperations<ListenerT>::notifyAllListeners( - local, + local, func )); { @@ -286,7 +286,7 @@ private: listeners. */ template< typename ListenerT, - typename ContainerT=std::vector<ListenerT> > + typename ContainerT=std::vector<ListenerT> > class ThreadSafeListenerContainer : public ListenerContainerBase<ListenerT, MutexBase, ContainerT> @@ -301,7 +301,7 @@ class ThreadSafeListenerContainer : public ListenerContainerBase<ListenerT, multi-threaded scenario, but has less overhead. */ template< typename ListenerT, - typename ContainerT=std::vector<ListenerT> > + typename ContainerT=std::vector<ListenerT> > class ThreadUnsafeListenerContainer : public ListenerContainerBase<ListenerT, EmptyBase, ContainerT> diff --git a/slideshow/source/inc/listenercontainerimpl.hxx b/slideshow/source/inc/listenercontainerimpl.hxx index 8644ab9d09d2..721d20df886d 100644 --- a/slideshow/source/inc/listenercontainerimpl.hxx +++ b/slideshow/source/inc/listenercontainerimpl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,29 +40,29 @@ struct EmptyBase struct EmptyGuard{ explicit EmptyGuard(EmptyBase) {} }; struct EmptyClearableGuard { - explicit EmptyClearableGuard(EmptyBase) {} - void clear() {} - void reset() {} + explicit EmptyClearableGuard(EmptyBase) {} + void clear() {} + void reset() {} }; typedef EmptyGuard Guard; typedef EmptyClearableGuard ClearableGuard; }; - + class MutexBase { public: - struct Guard : public osl::MutexGuard - { - explicit Guard(MutexBase const& rBase) : - osl::MutexGuard(rBase.maMutex) - {} + struct Guard : public osl::MutexGuard + { + explicit Guard(MutexBase const& rBase) : + osl::MutexGuard(rBase.maMutex) + {} }; struct ClearableGuard : public osl::ClearableMutexGuard - { - explicit ClearableGuard(MutexBase const& rBase) : - osl::ClearableMutexGuard(rBase.maMutex) - {} + { + explicit ClearableGuard(MutexBase const& rBase) : + osl::ClearableMutexGuard(rBase.maMutex) + {} }; mutable osl::Mutex maMutex; @@ -72,7 +72,7 @@ public: template< typename result_type, typename ListenerTargetT > struct FunctionApply { - template<typename FuncT> static bool apply( + template<typename FuncT> static bool apply( FuncT func, ListenerTargetT const& rArg ) { @@ -82,7 +82,7 @@ template< typename result_type, typename ListenerTargetT > struct FunctionApply template<typename ListenerTargetT> struct FunctionApply<void,ListenerTargetT> { - template<typename FuncT> static bool apply( + template<typename FuncT> static bool apply( FuncT func, ListenerTargetT const& rArg ) { @@ -96,7 +96,7 @@ template<typename ListenerTargetT> struct FunctionApply<void,ListenerTargetT> template< typename ListenerT > struct ListenerOperations { /// Notify a single one of the listeners - template< typename ContainerT, + template< typename ContainerT, typename FuncT > static bool notifySingleListener( ContainerT& rContainer, FuncT func ) @@ -105,13 +105,13 @@ template< typename ListenerT > struct ListenerOperations // true: a handler in this queue processed the event // false: no handler in this queue finally processed the event - return (std::find_if( rContainer.begin(), + return (std::find_if( rContainer.begin(), aEnd, func ) != aEnd); } /// Notify all listeners - template< typename ContainerT, + template< typename ContainerT, typename FuncT > static bool notifyAllListeners( ContainerT& rContainer, FuncT func ) @@ -128,7 +128,7 @@ template< typename ListenerT > struct ListenerOperations { bRet = true; } - + ++aCurr; } @@ -146,10 +146,10 @@ template< typename ListenerT > struct ListenerOperations // specializations for weak_ptr // ---------------------------- -template< typename ListenerTargetT > +template< typename ListenerTargetT > struct ListenerOperations< boost::weak_ptr<ListenerTargetT> > { - template< typename ContainerT, + template< typename ContainerT, typename FuncT > static bool notifySingleListener( ContainerT& rContainer, FuncT func ) @@ -159,17 +159,17 @@ struct ListenerOperations< boost::weak_ptr<ListenerTargetT> > while( aCurr != aEnd ) { boost::shared_ptr<ListenerTargetT> pListener( aCurr->lock() ); - + if( pListener && func(pListener) ) return true; - + ++aCurr; } return false; } - template< typename ContainerT, + template< typename ContainerT, typename FuncT > static bool notifyAllListeners( ContainerT& rContainer, FuncT func ) @@ -180,14 +180,14 @@ struct ListenerOperations< boost::weak_ptr<ListenerTargetT> > while( aCurr != aEnd ) { boost::shared_ptr<ListenerTargetT> pListener( aCurr->lock() ); - - if( pListener.get() && + + if( pListener.get() && FunctionApply< typename FuncT::result_type, boost::shared_ptr<ListenerTargetT> >::apply(func,pListener) ) { bRet = true; } - + ++aCurr; } @@ -203,7 +203,7 @@ struct ListenerOperations< boost::weak_ptr<ListenerTargetT> > ContainerT aAliveListeners; aAliveListeners.reserve(rContainer.size()); - + typename ContainerT::const_iterator aCurr( rContainer.begin() ); typename ContainerT::const_iterator const aEnd ( rContainer.end() ); while( aCurr != aEnd ) diff --git a/slideshow/source/inc/mouseeventhandler.hxx b/slideshow/source/inc/mouseeventhandler.hxx index f8e3f37a6df9..195c7de2a503 100644 --- a/slideshow/source/inc/mouseeventhandler.hxx +++ b/slideshow/source/inc/mouseeventhandler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/inc/numberanimation.hxx b/slideshow/source/inc/numberanimation.hxx index 44a66a2b0aad..faf5aae64393 100644 --- a/slideshow/source/inc/numberanimation.hxx +++ b/slideshow/source/inc/numberanimation.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ namespace slideshow This is necessary for pure To or By animations, as the Activity cannot determine a sensible start value - otherwise. + otherwise. @attention Note that you are only permitted to query for the underlying value, if the animation has actually diff --git a/slideshow/source/inc/pairanimation.hxx b/slideshow/source/inc/pairanimation.hxx index b14553aa1642..6c8357b244da 100644 --- a/slideshow/source/inc/pairanimation.hxx +++ b/slideshow/source/inc/pairanimation.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/inc/pauseeventhandler.hxx b/slideshow/source/inc/pauseeventhandler.hxx index 1ba587018a68..9e78b38de56f 100644 --- a/slideshow/source/inc/pauseeventhandler.hxx +++ b/slideshow/source/inc/pauseeventhandler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/inc/rgbcolor.hxx b/slideshow/source/inc/rgbcolor.hxx index 70f8a8d88499..db096e4532e5 100644 --- a/slideshow/source/inc/rgbcolor.hxx +++ b/slideshow/source/inc/rgbcolor.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,11 +35,11 @@ namespace slideshow { - namespace internal + namespace internal { class HSLColor; - /** RGB color space class. + /** RGB color space class. */ class RGBColor { @@ -50,19 +50,19 @@ namespace slideshow explicit RGBColor( const HSLColor& rColor ); /** Hue of the color. - + @return hue, is in the range [0,360] */ double getHue() const; /** Saturation of the color. - + @return saturation, is in the range [0,1] */ double getSaturation() const; /** Luminance of the color. - + @return luminance, is in the range [0,1] */ double getLuminance() const; @@ -86,9 +86,9 @@ namespace slideshow /** Create an integer sRGBA color. */ ::cppcanvas::Color::IntSRGBA getIntegerColor() const; - + RGBColor(const RGBColor& rLHS); - RGBColor& operator=( const RGBColor& rLHS); + RGBColor& operator=( const RGBColor& rLHS); struct RGBTriple { @@ -102,19 +102,19 @@ namespace slideshow private: // default copy/assignment are okay - // RGBColor(const RGBColor&); + // RGBColor(const RGBColor&); // RGBColor& operator=( const RGBColor& ); - RGBTriple maRGBTriple; - }; + RGBTriple maRGBTriple; + }; RGBColor operator+( const RGBColor& rLHS, const RGBColor& rRHS ); RGBColor operator*( const RGBColor& rLHS, const RGBColor& rRHS ); RGBColor operator*( double nFactor, const RGBColor& rRHS ); - + /** RGB color linear interpolator. - + @param t As usual, t must be in the [0,1] range */ diff --git a/slideshow/source/inc/screenupdater.hxx b/slideshow/source/inc/screenupdater.hxx index 517bf4f46624..96a8ca9b5310 100644 --- a/slideshow/source/inc/screenupdater.hxx +++ b/slideshow/source/inc/screenupdater.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,20 +57,20 @@ namespace slideshow ~ScreenUpdater(); /** Notify screen update - + This method records a screen content update request for all views. */ void notifyUpdate(); - + /** Notify screen update - + This method records a screen content update request for the given view. @param rView The view that needs an update - + @param bViewClobbered When true, notifies update that view content is clobbered by external circumstances (e.g. by another diff --git a/slideshow/source/inc/shape.hxx b/slideshow/source/inc/shape.hxx index ac369287b5fa..3bfec3f67ff8 100644 --- a/slideshow/source/inc/shape.hxx +++ b/slideshow/source/inc/shape.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ namespace slideshow direct corresponding XShape (the background comes to mind here). */ - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getXShape() const = 0; @@ -91,15 +91,15 @@ namespace slideshow @param bRedrawLayer Redraw shape on given layer */ - virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer, - bool bRedrawLayer ) = 0; + virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer, + bool bRedrawLayer ) = 0; /** Withdraw the shape from a view layer This method removes the shape from the given view layer. - @return true, if the shape was successfully removed + @return true, if the shape was successfully removed */ virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ) = 0; @@ -229,23 +229,23 @@ namespace slideshow // make functor adaptable (to boost::bind) typedef bool result_type; - // since the ZOrder property on the XShape has somewhat + // since the ZOrder property on the XShape has somewhat // peculiar attributes (it's basically the index of the shapes // in the drawing layer's SdrObjList - which means, it starts - // from 0 for children of group objects), we cannot use it to determine - // drawing order. Thus, we rely on importer-provided order values here, + // from 0 for children of group objects), we cannot use it to determine + // drawing order. Thus, we rely on importer-provided order values here, // which is basically a running counter during shape import (i.e. denotes // the order of shape import). This is the correct order, at least for the // current drawing core. // - // If, someday, the above proposition is no longer true, one directly use + // If, someday, the above proposition is no longer true, one directly use // the shape's ZOrder property // static bool compare(const Shape* pLHS, const Shape* pRHS) { const double nPrioL( pLHS->getPriority() ); const double nPrioR( pRHS->getPriority() ); - + // if prios are equal, tie-break on ptr value return nPrioL == nPrioR ? pLHS < pRHS : nPrioL < nPrioR; } @@ -266,7 +266,7 @@ namespace slideshow /** A set which contains all shapes in an ordered fashion. */ - typedef ::std::set< ShapeSharedPtr, Shape::lessThanShape > ShapeSet; + typedef ::std::set< ShapeSharedPtr, Shape::lessThanShape > ShapeSet; } } diff --git a/slideshow/source/inc/shapeattributelayer.hxx b/slideshow/source/inc/shapeattributelayer.hxx index afdcead16368..513b772665a4 100644 --- a/slideshow/source/inc/shapeattributelayer.hxx +++ b/slideshow/source/inc/shapeattributelayer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -264,7 +264,7 @@ namespace slideshow New alpha value, must be in the [0,1] range */ void setAlpha( const double& rNewValue ); - + /** Query whether the clip attribute is valid */ bool isClipValid() const; @@ -279,7 +279,7 @@ namespace slideshow with the origin of the clip polygon). */ void setClip( const ::basegfx::B2DPolyPolygon& rNewClip ); - + /** Query whether the dim color attribute is valid The dim color globally 'dims' the shape towards that @@ -335,7 +335,7 @@ namespace slideshow */ bool isLineStyleValid() const; /** Get the current line mode for line drawing. - + @returns the current line style */ sal_Int16 getLineStyle() const; @@ -367,7 +367,7 @@ namespace slideshow /** Set the text color globally for the whole shape. */ void setCharColor( const RGBColor& nNewColor ); - + /** Query whether the char rotation angle attribute is valid */ bool isCharRotationAngleValid() const; @@ -399,7 +399,7 @@ namespace slideshow ::com::sun::star::awt::FontWeight constant group. */ void setCharWeight( const double& rStyle ); - + /** Query whether the underline mode attribute is valid */ bool isUnderlineModeValid() const; @@ -478,76 +478,76 @@ namespace slideshow bool haveChild() const { return mpChild; } void updateStateIds(); - template< typename T > T calcValue( const T& rCurrValue, - bool bThisInstanceValid, + template< typename T > T calcValue( const T& rCurrValue, + bool bThisInstanceValid, bool (ShapeAttributeLayer::*pIsValid)() const, - T (ShapeAttributeLayer::*pGetValue)() const ) const; - - ShapeAttributeLayerSharedPtr mpChild; // may be NULL - - ::basegfx::B2DSize maSize; - ::basegfx::B2DPoint maPosition; - ::basegfx::B2DPolyPolygon maClip; - - ::rtl::OUString maFontFamily; - - double mnRotationAngle; - double mnShearXAngle; - double mnShearYAngle; - double mnAlpha; - double mnCharRotationAngle; - double mnCharScale; - double mnCharWeight; - - ::com::sun::star::drawing::FillStyle meFillStyle; - ::com::sun::star::drawing::LineStyle meLineStyle; - ::com::sun::star::awt::FontSlant meCharPosture; - sal_Int16 mnUnderlineMode; - - RGBColor maDimColor; - RGBColor maFillColor; - RGBColor maLineColor; - RGBColor maCharColor; - - State::StateId mnTransformationState; - State::StateId mnClipState; - State::StateId mnAlphaState; - State::StateId mnPositionState; - State::StateId mnContentState; - State::StateId mnVisibilityState; - - sal_Int16 mnAdditiveMode; - - bool mbVisibility : 1; - - bool mbWidthValid : 1; - bool mbHeightValid : 1; - bool mbPosXValid : 1; - bool mbPosYValid : 1; - bool mbClipValid : 1; - - bool mbFontFamilyValid : 1; - - bool mbRotationAngleValid : 1; - bool mbShearXAngleValid : 1; - bool mbShearYAngleValid : 1; - - bool mbAlphaValid : 1; - - bool mbCharRotationAngleValid: 1; - bool mbCharScaleValid : 1; - - bool mbDimColorValid : 1; - bool mbFillColorValid : 1; - bool mbLineColorValid : 1; - bool mbCharColorValid : 1; - - bool mbFillStyleValid : 1; - bool mbLineStyleValid : 1; - bool mbCharWeightValid : 1; - bool mbUnderlineModeValid : 1; - bool mbCharPostureValid : 1; - bool mbVisibilityValid : 1; + T (ShapeAttributeLayer::*pGetValue)() const ) const; + + ShapeAttributeLayerSharedPtr mpChild; // may be NULL + + ::basegfx::B2DSize maSize; + ::basegfx::B2DPoint maPosition; + ::basegfx::B2DPolyPolygon maClip; + + ::rtl::OUString maFontFamily; + + double mnRotationAngle; + double mnShearXAngle; + double mnShearYAngle; + double mnAlpha; + double mnCharRotationAngle; + double mnCharScale; + double mnCharWeight; + + ::com::sun::star::drawing::FillStyle meFillStyle; + ::com::sun::star::drawing::LineStyle meLineStyle; + ::com::sun::star::awt::FontSlant meCharPosture; + sal_Int16 mnUnderlineMode; + + RGBColor maDimColor; + RGBColor maFillColor; + RGBColor maLineColor; + RGBColor maCharColor; + + State::StateId mnTransformationState; + State::StateId mnClipState; + State::StateId mnAlphaState; + State::StateId mnPositionState; + State::StateId mnContentState; + State::StateId mnVisibilityState; + + sal_Int16 mnAdditiveMode; + + bool mbVisibility : 1; + + bool mbWidthValid : 1; + bool mbHeightValid : 1; + bool mbPosXValid : 1; + bool mbPosYValid : 1; + bool mbClipValid : 1; + + bool mbFontFamilyValid : 1; + + bool mbRotationAngleValid : 1; + bool mbShearXAngleValid : 1; + bool mbShearYAngleValid : 1; + + bool mbAlphaValid : 1; + + bool mbCharRotationAngleValid: 1; + bool mbCharScaleValid : 1; + + bool mbDimColorValid : 1; + bool mbFillColorValid : 1; + bool mbLineColorValid : 1; + bool mbCharColorValid : 1; + + bool mbFillStyleValid : 1; + bool mbLineStyleValid : 1; + bool mbCharWeightValid : 1; + bool mbUnderlineModeValid : 1; + bool mbCharPostureValid : 1; + bool mbVisibilityValid : 1; }; } diff --git a/slideshow/source/inc/shapeattributelayerholder.hxx b/slideshow/source/inc/shapeattributelayerholder.hxx index 17131e3eeb43..43c2a2f4942f 100644 --- a/slideshow/source/inc/shapeattributelayerholder.hxx +++ b/slideshow/source/inc/shapeattributelayerholder.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,7 +90,7 @@ namespace slideshow if( mpShape ) mpAttributeLayer = mpShape->createAttributeLayer(); - + return mpAttributeLayer; } @@ -100,8 +100,8 @@ namespace slideshow } private: - AttributableShapeSharedPtr mpShape; - ShapeAttributeLayerSharedPtr mpAttributeLayer; + AttributableShapeSharedPtr mpShape; + ShapeAttributeLayerSharedPtr mpAttributeLayer; }; } diff --git a/slideshow/source/inc/shapecursoreventhandler.hxx b/slideshow/source/inc/shapecursoreventhandler.hxx index 9e0cc4f17303..be421f7010d0 100644 --- a/slideshow/source/inc/shapecursoreventhandler.hxx +++ b/slideshow/source/inc/shapecursoreventhandler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/inc/shapeimporter.hxx b/slideshow/source/inc/shapeimporter.hxx index 6bf3012eb377..9d6528b795a5 100644 --- a/slideshow/source/inc/shapeimporter.hxx +++ b/slideshow/source/inc/shapeimporter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,25 +44,25 @@ namespace internal { struct SlideShowContext; typedef ::std::vector< ::cppcanvas::PolyPolygonSharedPtr> PolyPolygonVector; -typedef ::boost::shared_ptr< UnoView > UnoViewSharedPtr; -typedef ::std::vector< UnoViewSharedPtr > UnoViewVector; - +typedef ::boost::shared_ptr< UnoView > UnoViewSharedPtr; +typedef ::std::vector< UnoViewSharedPtr > UnoViewVector; + /** This class imports all shapes from a given XShapes object */ -class ShapeImporter +class ShapeImporter { public: /** Create shape importer. - + @param xPage Page containing the shapes - + @param xActualPage Actual page that's imported - if xPage is a master page, this argument must refer to the using, i.e the page that embeds this specific masterpage. Otherwise, this argument is probably equal to xPage. - + @param nOrdNumStart Each shape receives a z order number, in order of import (which relies on the fact that the API returns @@ -70,33 +70,33 @@ public: currently). Since we might mix several pages on screen (e.g. master page and foreground page), this value can be used as an offset to distinguish those pages. - + @param bConvertingMasterPage When true, then the master page is imported. Otherwise, this object imports the draw page. */ - ShapeImporter( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage >& xPage, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage >& xActualPage, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPagesSupplier>& xPagesSupplier, + ShapeImporter( const ::com::sun::star::uno::Reference< + ::com::sun::star::drawing::XDrawPage >& xPage, + const ::com::sun::star::uno::Reference< + ::com::sun::star::drawing::XDrawPage >& xActualPage, + const ::com::sun::star::uno::Reference< + ::com::sun::star::drawing::XDrawPagesSupplier>& xPagesSupplier, const SlideShowContext& rContext, sal_Int32 nOrdNumStart, bool bConvertingMasterPage ); - + /** This method imports the presentation background shape */ ShapeSharedPtr importBackgroundShape(); // throw (ShapeLoadFailedException) /** This method imports presentation-visible shapes (and skips all others). - + @return the generated Shape, or NULL for no more shapes. */ ShapeSharedPtr importShape(); // throw (ConversionFailedException) - + /** Test whether import is done. - + @return true, if all shapes are imported via the importShape() call. */ @@ -107,25 +107,25 @@ private: ::com::sun::star::beans::XPropertySet> const& xPropSet, ::rtl::OUString const& shapeType, ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XLayer> const& xLayer); - + ::com::sun::star::drawing::XLayer> const& xLayer); + ShapeSharedPtr createShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape> const& xCurrShape, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> const& xPropSet, ::rtl::OUString const& shapeType ) const; - + void importPolygons(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > const& xPropSet) ; - - struct XShapesEntry + + struct XShapesEntry { ShapeSharedPtr const mpGroupShape; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes> const mxShapes; sal_Int32 const mnCount; sal_Int32 mnPos; - + explicit XShapesEntry( ShapeSharedPtr const& pGroupShape ) : mpGroupShape(pGroupShape), mxShapes( pGroupShape->getXShape(), @@ -137,11 +137,11 @@ private: mnCount(xShapes->getCount()), mnPos(0) {} }; typedef ::std::stack<XShapesEntry> XShapesStack; - + ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage> mxPage; + ::com::sun::star::drawing::XDrawPage> mxPage; ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPagesSupplier> mxPagesSupplier; + ::com::sun::star::drawing::XDrawPagesSupplier> mxPagesSupplier; const SlideShowContext& mrContext; PolyPolygonVector maPolygons; XShapesStack maShapesStack; diff --git a/slideshow/source/inc/shapelistenereventhandler.hxx b/slideshow/source/inc/shapelistenereventhandler.hxx index af899dfe0c94..abedde580cfb 100644 --- a/slideshow/source/inc/shapelistenereventhandler.hxx +++ b/slideshow/source/inc/shapelistenereventhandler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/inc/shapemanager.hxx b/slideshow/source/inc/shapemanager.hxx index 41d1216e5683..c067fb20da9e 100644 --- a/slideshow/source/inc/shapemanager.hxx +++ b/slideshow/source/inc/shapemanager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,7 +97,7 @@ namespace slideshow should be looked up. */ virtual boost::shared_ptr<Shape> lookupShape( - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > const & xShape ) const = 0; /** Register given shape as a hyperlink target diff --git a/slideshow/source/inc/shapemaps.hxx b/slideshow/source/inc/shapemaps.hxx index 4f74ea98e753..81e15efa3e78 100644 --- a/slideshow/source/inc/shapemaps.hxx +++ b/slideshow/source/inc/shapemaps.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,10 +48,10 @@ namespace slideshow /// Maps XShape to shape listener typedef ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>, - boost::shared_ptr< ::cppu::OInterfaceContainerHelper > + boost::shared_ptr< ::cppu::OInterfaceContainerHelper > > ShapeEventListenerMap; - /// Maps XShape to mouse cursor + /// Maps XShape to mouse cursor typedef ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>, sal_Int16> ShapeCursorMap; diff --git a/slideshow/source/inc/shapesubset.hxx b/slideshow/source/inc/shapesubset.hxx index 8b541d303675..7100bd015e52 100644 --- a/slideshow/source/inc/shapesubset.hxx +++ b/slideshow/source/inc/shapesubset.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,8 +68,8 @@ namespace slideshow Manager object, where subsets are registered/unregistered */ - ShapeSubset( const AttributableShapeSharedPtr& rOriginalShape, - const DocTreeNode& rTreeNode, + ShapeSubset( const AttributableShapeSharedPtr& rOriginalShape, + const DocTreeNode& rTreeNode, const SubsettableShapeManagerSharedPtr& rSubsetManager ); /** Create a subset from another subset. @@ -85,8 +85,8 @@ namespace slideshow @param rTreeNode Subset of the original subset */ - ShapeSubset( const ShapeSubsetSharedPtr& rOriginalSubset, - const DocTreeNode& rTreeNode ); + ShapeSubset( const ShapeSubsetSharedPtr& rOriginalSubset, + const DocTreeNode& rTreeNode ); /** Create full set for the given shape. @@ -94,7 +94,7 @@ namespace slideshow Original shape, which will be represented as a whole by this object */ - ShapeSubset( const AttributableShapeSharedPtr& rOriginalShape, + ShapeSubset( const AttributableShapeSharedPtr& rOriginalShape, const SubsettableShapeManagerSharedPtr& rShapeManager ); ~ShapeSubset(); @@ -104,7 +104,7 @@ namespace slideshow If the subset is currently revoked, this method returns the original shape. */ - AttributableShapeSharedPtr getSubsetShape() const; + AttributableShapeSharedPtr getSubsetShape() const; /** Enable the subset shape. @@ -115,7 +115,7 @@ namespace slideshow @return true, if subsetting was successfully enabled. */ - bool enableSubsetShape(); + bool enableSubsetShape(); /** Disable the subset shape. @@ -123,7 +123,7 @@ namespace slideshow shape. That means, the original shape will again show the hidden range. */ - void disableSubsetShape(); + void disableSubsetShape(); /** Query whether this subset actually is none, but contains the whole original shape's content @@ -139,7 +139,7 @@ namespace slideshow //ShapeSubset(const ShapeSubset&); //ShapeSubset& operator=( const ShapeSubset& ); - AttributableShapeSharedPtr mpOriginalShape; + AttributableShapeSharedPtr mpOriginalShape; AttributableShapeSharedPtr mpSubsetShape; DocTreeNode maTreeNode; SubsettableShapeManagerSharedPtr mpShapeManager; diff --git a/slideshow/source/inc/slide.hxx b/slideshow/source/inc/slide.hxx index 9f4e6b8f5055..3c3bdfd1972f 100644 --- a/slideshow/source/inc/slide.hxx +++ b/slideshow/source/inc/slide.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace com { namespace sun { namespace star { class XDrawPage; class XDrawPagesSupplier; } - namespace uno { + namespace uno { class XComponentContext; } namespace animations { @@ -61,7 +61,7 @@ namespace slideshow { class RGBColor; class ScreenUpdater; - typedef ::std::vector< ::cppcanvas::PolyPolygonSharedPtr> PolyPolygonVector; + typedef ::std::vector< ::cppcanvas::PolyPolygonSharedPtr> PolyPolygonVector; class Slide { public: @@ -105,25 +105,25 @@ namespace slideshow This value is retrieved from the XDrawPage properties. */ - virtual basegfx::B2IVector getSlideSize() const = 0; + virtual basegfx::B2IVector getSlideSize() const = 0; /// Gets the underlying API page virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > getXDrawPage() const = 0; - + /// Gets the animation node. - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getXAnimationNode() const = 0; ///Gets the slide Polygons virtual PolyPolygonVector getPolygons() = 0; - + ///Draw the slide Polygons virtual void drawPolygons() const = 0; - + ///Check if slide is already active virtual bool isPaintOverlayActive() const = 0; - + // Slide bitmaps // ------------------------------------------------------------------- @@ -147,7 +147,7 @@ namespace slideshow that the view must have been added to this slide before via viewAdded(). */ - virtual SlideBitmapSharedPtr + virtual SlideBitmapSharedPtr getCurrentSlideBitmap( const UnoViewSharedPtr& rView ) const = 0; }; @@ -159,7 +159,7 @@ namespace slideshow class ActivitiesQueue; class UserEventQueue; class RGBColor; - + /** Construct from XDrawPage The Slide object generally works in XDrawPage model @@ -167,7 +167,7 @@ namespace slideshow height as specified in the XDrawPage's property set. The top, left corner of the page will be rendered at (0,0) in the given canvas' view coordinate system. - + Does not render anything initially @param xDrawPage @@ -188,20 +188,20 @@ namespace slideshow @param rUserEventQueue UserEeventQueue */ - SlideSharedPtr createSlide( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage >& xDrawPage, + SlideSharedPtr createSlide( const ::com::sun::star::uno::Reference< + ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPagesSupplier >& xDrawPages, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xRootNode, - EventQueue& rEventQueue, - EventMultiplexer& rEventMultiplexer, + EventQueue& rEventQueue, + EventMultiplexer& rEventMultiplexer, ScreenUpdater& rScreenUpdater, - ActivitiesQueue& rActivitiesQueue, - UserEventQueue& rUserEventQueue, + ActivitiesQueue& rActivitiesQueue, + UserEventQueue& rUserEventQueue, CursorManager& rCursorManager, const UnoViewContainer& rViewContainer, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const ShapeEventListenerMap& rShapeListenerMap, const ShapeCursorMap& rShapeCursorMap, diff --git a/slideshow/source/inc/slidebitmap.hxx b/slideshow/source/inc/slidebitmap.hxx index dcbe49c7a4cf..2f2229f9d095 100644 --- a/slideshow/source/inc/slidebitmap.hxx +++ b/slideshow/source/inc/slidebitmap.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,22 +70,22 @@ namespace slideshow public: SlideBitmap( const ::cppcanvas::BitmapSharedPtr& rBitmap ); - bool draw( const ::cppcanvas::CanvasSharedPtr& rCanvas ) const; - ::basegfx::B2ISize getSize() const; + bool draw( const ::cppcanvas::CanvasSharedPtr& rCanvas ) const; + ::basegfx::B2ISize getSize() const; ::basegfx::B2DPoint getOutputPos() const{return maOutputPos;} - void move( const ::basegfx::B2DPoint& rNewPos ); - void clip( const ::basegfx::B2DPolyPolygon& rClipPoly ); - + void move( const ::basegfx::B2DPoint& rNewPos ); + void clip( const ::basegfx::B2DPolyPolygon& rClipPoly ); + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > getXBitmap(); private: - ::basegfx::B2DPoint maOutputPos; - ::basegfx::B2DPolyPolygon maClipPoly; + ::basegfx::B2DPoint maOutputPos; + ::basegfx::B2DPolyPolygon maClipPoly; // TODO(Q2): Remove UNO bitmap as the transport medium ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmap > mxBitmap; + ::com::sun::star::rendering::XBitmap > mxBitmap; }; typedef ::boost::shared_ptr< SlideBitmap > SlideBitmapSharedPtr; diff --git a/slideshow/source/inc/slideshowcontext.hxx b/slideshow/source/inc/slideshowcontext.hxx index 46843dd235f2..dd24d52c8896 100644 --- a/slideshow/source/inc/slideshowcontext.hxx +++ b/slideshow/source/inc/slideshowcontext.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,16 +62,16 @@ namespace slideshow @param rShapeManager ShapeManager, which handles all shapes - + @param rEventQueue Event queue, where time-based events are to be scheduled. A node must not schedule events there before it's not resolved. - + @param rEventMultiplexer Event multiplexer. Clients can register there for about any event that happens in the slideshow - + @param rScreenUpdater Screen updater. Gets notified of necessary screen updates. @@ -79,9 +79,9 @@ namespace slideshow @param rActivitiesQueue Activities queue, where repeating activities are to be scheduled. - + @param rUserEventQueue - User event queue + User event queue @param rViewContainer Holds all views added to slideshow @@ -97,20 +97,20 @@ namespace slideshow UserEventQueue& rUserEventQueue, CursorManager& rCursorManager, const UnoViewContainer& rViewContainer, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rComponentContext ); void dispose(); boost::shared_ptr<SubsettableShapeManager>& mpSubsettableShapeManager; - EventQueue& mrEventQueue; - EventMultiplexer& mrEventMultiplexer; + EventQueue& mrEventQueue; + EventMultiplexer& mrEventMultiplexer; ScreenUpdater& mrScreenUpdater; - ActivitiesQueue& mrActivitiesQueue; - UserEventQueue& mrUserEventQueue; + ActivitiesQueue& mrActivitiesQueue; + UserEventQueue& mrUserEventQueue; CursorManager& mrCursorManager; const UnoViewContainer& mrViewContainer; - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext> mxComponentContext; + ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XComponentContext> mxComponentContext; }; } } diff --git a/slideshow/source/inc/slideshowexceptions.hxx b/slideshow/source/inc/slideshowexceptions.hxx index 6932d0302dcc..84752224c2cb 100644 --- a/slideshow/source/inc/slideshowexceptions.hxx +++ b/slideshow/source/inc/slideshowexceptions.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ namespace slideshow { ParseError() {} explicit ParseError( const char* ) {} - }; + }; } diff --git a/slideshow/source/inc/slideview.hxx b/slideshow/source/inc/slideview.hxx index 3f8b159423f4..758088baaa51 100644 --- a/slideshow/source/inc/slideview.hxx +++ b/slideshow/source/inc/slideview.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/inc/smilfunctionparser.hxx b/slideshow/source/inc/smilfunctionparser.hxx index 208f7112e0f4..dd60fb593ab6 100644 --- a/slideshow/source/inc/smilfunctionparser.hxx +++ b/slideshow/source/inc/smilfunctionparser.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ namespace slideshow { public: /** Parse a string containing a SMIL value. - + This method parses a string representing a fixed value (i.e. a value that does not change by time). Due to the dynamic view @@ -58,38 +58,38 @@ namespace slideshow this value can sometimes only be determined during runtime of the animation (because e.g. mixed screen/view coordinates are - involved), and is thus still returned as an - ExpressionNode object. An example for + involved), and is thus still returned as an + ExpressionNode object. An example for such a case is the "Width+1.0" string, which - contains the width of the shape in user + contains the width of the shape in user coordinate space, and the screen width in device coordinate space. The following grammar is accepted by this method: <code> - identifier = 'pi'|'e'|'X'|'Y'|'Width'|'Height' - + identifier = 'pi'|'e'|'X'|'Y'|'Width'|'Height' + function = 'abs'|'sqrt'|'sin'|'cos'|'tan'|'atan'|'acos'|'asin'|'exp'|'log' - basic_expression = - number | - identifier | - function '(' additive_expression ')' | - '(' additive_expression ')' - - unary_expression = + basic_expression = + number | + identifier | + function '(' additive_expression ')' | + '(' additive_expression ')' + + unary_expression = '-' basic_expression | basic_expression - - multiplicative_expression = - unary_expression ( ( '*' unary_expression )* | + + multiplicative_expression = + unary_expression ( ( '*' unary_expression )* | ( '/' unary_expression )* ) + + additive_expression = + multiplicative_expression ( ( '+' multiplicative_expression )* | + ( '-' multiplicative_expression )* ) - additive_expression = - multiplicative_expression ( ( '+' multiplicative_expression )* | - ( '-' multiplicative_expression )* ) - - </code> + </code> @param rSmilValue The string to parse @@ -100,44 +100,44 @@ namespace slideshow the page the shape is part of, i.e. within the [0,1] range. This is necessary, since the string might contain symbolic references to the shape bounding box. - + @throws ParseError if an invalid expression is given. @return the generated function object. */ - static ExpressionNodeSharedPtr parseSmilValue( const ::rtl::OUString& rSmilValue, - const ::basegfx::B2DRectangle& rRelativeShapeBounds ); // throw ParseError + static ExpressionNodeSharedPtr parseSmilValue( const ::rtl::OUString& rSmilValue, + const ::basegfx::B2DRectangle& rRelativeShapeBounds ); // throw ParseError /** Parse a string containing a SMIL function. - + This method parses a string representing a possibly time-varying SMIL function. The following grammar is accepted by this method: <code> - identifier = 't'|'pi'|'e'|'X'|'Y'|'Width'|'Height' - + identifier = 't'|'pi'|'e'|'X'|'Y'|'Width'|'Height' + function = 'abs'|'sqrt'|'sin'|'cos'|'tan'|'atan'|'acos'|'asin'|'exp'|'log' - basic_expression = - number | - identifier | - function '(' additive_expression ')' | - '(' additive_expression ')' - - unary_expression = + basic_expression = + number | + identifier | + function '(' additive_expression ')' | + '(' additive_expression ')' + + unary_expression = '-' basic_expression | basic_expression - - multiplicative_expression = - unary_expression ( ( '*' unary_expression )* | + + multiplicative_expression = + unary_expression ( ( '*' unary_expression )* | ( '/' unary_expression )* ) + + additive_expression = + multiplicative_expression ( ( '+' multiplicative_expression )* | + ( '-' multiplicative_expression )* ) - additive_expression = - multiplicative_expression ( ( '+' multiplicative_expression )* | - ( '-' multiplicative_expression )* ) - - </code> + </code> @param rSmilFunction The string to parse @@ -153,11 +153,11 @@ namespace slideshow @return the generated function object. */ - static ExpressionNodeSharedPtr parseSmilFunction( const ::rtl::OUString& rSmilFunction, - const ::basegfx::B2DRectangle& rRelativeShapeBounds ); // throw ParseError + static ExpressionNodeSharedPtr parseSmilFunction( const ::rtl::OUString& rSmilFunction, + const ::basegfx::B2DRectangle& rRelativeShapeBounds ); // throw ParseError private: - // disabled constructor/destructor, since this is + // disabled constructor/destructor, since this is // supposed to be a singleton SmilFunctionParser(); }; diff --git a/slideshow/source/inc/soundplayer.hxx b/slideshow/source/inc/soundplayer.hxx index 1f0a6f9bbc2b..edc10d98bc31 100644 --- a/slideshow/source/inc/soundplayer.hxx +++ b/slideshow/source/inc/soundplayer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ namespace slideshow /** Create a sound player object. @param rSoundURL - URL to a sound file. + URL to a sound file. @param rComponentContext Reference to a component context, used to create the @@ -72,7 +72,7 @@ namespace slideshow static ::boost::shared_ptr<SoundPlayer> create( EventMultiplexer & rEventMultiplexer, const ::rtl::OUString& rSoundURL, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rComponentContext ); virtual ~SoundPlayer(); @@ -101,7 +101,7 @@ namespace slideshow SoundPlayer( EventMultiplexer & rEventMultiplexer, const ::rtl::OUString& rSoundURL, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rComponentContext ); EventMultiplexer & mrEventMultiplexer; @@ -109,7 +109,7 @@ namespace slideshow // is available ::boost::shared_ptr<SoundPlayer> mThis; ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer; - }; + }; typedef ::boost::shared_ptr< SoundPlayer > SoundPlayerSharedPtr; } diff --git a/slideshow/source/inc/state.hxx b/slideshow/source/inc/state.hxx index 8f4ea7805b95..e2d84e8edd0c 100644 --- a/slideshow/source/inc/state.hxx +++ b/slideshow/source/inc/state.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ namespace slideshow public: virtual ~State() {} - /// Abstract, numerically encoded state ID + /// Abstract, numerically encoded state ID typedef ::std::size_t StateId; /** This method returns a numerical state identifier. @@ -61,7 +61,7 @@ namespace slideshow clients can assume that the object's state has changed. - @return an abstract, numerical state ID. + @return an abstract, numerical state ID. */ virtual StateId getStateId() const = 0; }; diff --git a/slideshow/source/inc/stringanimation.hxx b/slideshow/source/inc/stringanimation.hxx index 09a04ad65d3d..bea6a0c5a142 100644 --- a/slideshow/source/inc/stringanimation.hxx +++ b/slideshow/source/inc/stringanimation.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/inc/subsettableshapemanager.hxx b/slideshow/source/inc/subsettableshapemanager.hxx index f80777adee80..00ce34b2c793 100644 --- a/slideshow/source/inc/subsettableshapemanager.hxx +++ b/slideshow/source/inc/subsettableshapemanager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ namespace slideshow @param rSubsetShape The subset to display in the generated shape. */ - virtual boost::shared_ptr<AttributableShape> getSubsetShape( + virtual boost::shared_ptr<AttributableShape> getSubsetShape( const boost::shared_ptr<AttributableShape>& rOrigShape, const DocTreeNode& rTreeNode ) = 0; @@ -87,7 +87,7 @@ namespace slideshow @param rSubsetShape The subset created from rOrigShape */ - virtual void revokeSubset( + virtual void revokeSubset( const boost::shared_ptr<AttributableShape>& rOrigShape, const boost::shared_ptr<AttributableShape>& rSubsetShape ) = 0; @@ -95,7 +95,7 @@ namespace slideshow /** Register an event handler that will be called when user paint parameters change. - + @param rHandler Handler to call when a shape listener changes */ @@ -103,7 +103,7 @@ namespace slideshow virtual void removeIntrinsicAnimationHandler( const IntrinsicAnimationEventHandlerSharedPtr& rHandler ) = 0; /** Notify that shape-intrinsic animations are now enabled. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) @@ -111,7 +111,7 @@ namespace slideshow virtual bool notifyIntrinsicAnimationsEnabled() = 0; /** Notify that shape-intrinsic animations are now disabled. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx index 6cbec95fb802..ff2f43f1ba0f 100644 --- a/slideshow/source/inc/tools.hxx +++ b/slideshow/source/inc/tools.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,9 +53,9 @@ namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } } } } -namespace basegfx -{ - class B2DRange; +namespace basegfx +{ + class B2DRange; class B2DVector; class B2IVector; class B2DHomMatrix; @@ -90,7 +90,7 @@ namespace slideshow reinterpret_cast< ::std::ptrdiff_t >(p) ); return d + (d >> 3); } - + // xxx todo: shift to namespace com::sun::star::uno when // 1.33 is available template <typename T> @@ -114,68 +114,68 @@ namespace slideshow /// loop, but play backwards from end to start CYCLE_PINGPONGLOOP }; - - + + // Value extraction from Any // ========================= /// extract unary double value from Any - bool extractValue( double& o_rValue, - const ::com::sun::star::uno::Any& rSourceAny, - const boost::shared_ptr<Shape>& rShape, - const basegfx::B2DVector& rSlideBounds ); + bool extractValue( double& o_rValue, + const ::com::sun::star::uno::Any& rSourceAny, + const boost::shared_ptr<Shape>& rShape, + const basegfx::B2DVector& rSlideBounds ); /// extract int from Any - bool extractValue( sal_Int32& o_rValue, - const ::com::sun::star::uno::Any& rSourceAny, - const boost::shared_ptr<Shape>& rShape, - const basegfx::B2DVector& rSlideBounds ); + bool extractValue( sal_Int32& o_rValue, + const ::com::sun::star::uno::Any& rSourceAny, + const boost::shared_ptr<Shape>& rShape, + const basegfx::B2DVector& rSlideBounds ); /// extract enum/constant group value from Any - bool extractValue( sal_Int16& o_rValue, - const ::com::sun::star::uno::Any& rSourceAny, - const boost::shared_ptr<Shape>& rShape, - const basegfx::B2DVector& rSlideBounds ); + bool extractValue( sal_Int16& o_rValue, + const ::com::sun::star::uno::Any& rSourceAny, + const boost::shared_ptr<Shape>& rShape, + const basegfx::B2DVector& rSlideBounds ); /// extract color value from Any - bool extractValue( RGBColor& o_rValue, - const ::com::sun::star::uno::Any& rSourceAny, - const boost::shared_ptr<Shape>& rShape, - const basegfx::B2DVector& rSlideBounds ); + bool extractValue( RGBColor& o_rValue, + const ::com::sun::star::uno::Any& rSourceAny, + const boost::shared_ptr<Shape>& rShape, + const basegfx::B2DVector& rSlideBounds ); /// extract color value from Any - bool extractValue( HSLColor& o_rValue, - const ::com::sun::star::uno::Any& rSourceAny, - const boost::shared_ptr<Shape>& rShape, - const basegfx::B2DVector& rSlideBounds ); + bool extractValue( HSLColor& o_rValue, + const ::com::sun::star::uno::Any& rSourceAny, + const boost::shared_ptr<Shape>& rShape, + const basegfx::B2DVector& rSlideBounds ); /// extract plain string from Any - bool extractValue( ::rtl::OUString& o_rValue, - const ::com::sun::star::uno::Any& rSourceAny, - const boost::shared_ptr<Shape>& rShape, - const basegfx::B2DVector& rSlideBounds ); + bool extractValue( ::rtl::OUString& o_rValue, + const ::com::sun::star::uno::Any& rSourceAny, + const boost::shared_ptr<Shape>& rShape, + const basegfx::B2DVector& rSlideBounds ); /// extract bool value from Any - bool extractValue( bool& o_rValue, - const ::com::sun::star::uno::Any& rSourceAny, - const boost::shared_ptr<Shape>& rShape, - const basegfx::B2DVector& rSlideBounds ); + bool extractValue( bool& o_rValue, + const ::com::sun::star::uno::Any& rSourceAny, + const boost::shared_ptr<Shape>& rShape, + const basegfx::B2DVector& rSlideBounds ); /// extract double 2-tuple from Any - bool extractValue( basegfx::B2DTuple& o_rPair, - const ::com::sun::star::uno::Any& rSourceAny, - const boost::shared_ptr<Shape>& rShape, - const basegfx::B2DVector& rSlideBounds ); + bool extractValue( basegfx::B2DTuple& o_rPair, + const ::com::sun::star::uno::Any& rSourceAny, + const boost::shared_ptr<Shape>& rShape, + const basegfx::B2DVector& rSlideBounds ); /** Search a sequence of NamedValues for a given element. @return true, if the sequence contains the specified element. */ - bool findNamedValue( ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::NamedValue > const& rSequence, - const ::com::sun::star::beans::NamedValue& rSearchKey ); - + bool findNamedValue( ::com::sun::star::uno::Sequence< + ::com::sun::star::beans::NamedValue > const& rSequence, + const ::com::sun::star::beans::NamedValue& rSearchKey ); + /** Search a sequence of NamedValues for an element with a given name. @param o_pRet @@ -185,10 +185,10 @@ namespace slideshow @return true, if the sequence contains the specified element. */ - bool findNamedValue( ::com::sun::star::beans::NamedValue* o_pRet, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::NamedValue >& rSequence, - const ::rtl::OUString& rSearchString ); + bool findNamedValue( ::com::sun::star::beans::NamedValue* o_pRet, + const ::com::sun::star::uno::Sequence< + ::com::sun::star::beans::NamedValue >& rSequence, + const ::rtl::OUString& rSearchString ); basegfx::B2DRange calcRelativeShapeBounds( const basegfx::B2DVector& rPageSize, const basegfx::B2DRange& rShapeBounds ); @@ -198,12 +198,12 @@ namespace slideshow @param rBounds Original shape bound rect (to substitute default attribute layer values) - + @param pAttr Attribute set. Might be NULL (then, rBounds is used to set a simple scale and translate of the unit rect to rBounds). */ - basegfx::B2DHomMatrix getShapeTransformation( + basegfx::B2DHomMatrix getShapeTransformation( const basegfx::B2DRange& rBounds, const boost::shared_ptr<ShapeAttributeLayer>& pAttr ); @@ -211,7 +211,7 @@ namespace slideshow @param rPixelSize Pixel size of the sprite - + @param rOrigSize Original shape size (i.e. the size of the actual sprite content, in the user coordinate system) @@ -222,7 +222,7 @@ namespace slideshow @return the transformation to be applied to the sprite. */ - basegfx::B2DHomMatrix getSpriteTransformation( + basegfx::B2DHomMatrix getSpriteTransformation( const basegfx::B2DVector& rPixelSize, const basegfx::B2DVector& rOrigSize, const boost::shared_ptr<ShapeAttributeLayer>& pAttr ); @@ -245,9 +245,9 @@ namespace slideshow @param pAttr Current shape attributes */ - basegfx::B2DRange getShapeUpdateArea( + basegfx::B2DRange getShapeUpdateArea( const basegfx::B2DRange& rUnitBounds, - const basegfx::B2DHomMatrix& rShapeTransform, + const basegfx::B2DHomMatrix& rShapeTransform, const boost::shared_ptr<ShapeAttributeLayer>& pAttr ); /** Calc update area for a shape. @@ -279,7 +279,7 @@ namespace slideshow it as if aBounds.getMinimum() is the output position and aBounds.getRange() the scaling of the shape. */ - basegfx::B2DRange getShapePosSize( + basegfx::B2DRange getShapePosSize( const basegfx::B2DRange& rOrigBounds, const boost::shared_ptr<ShapeAttributeLayer>& pAttr ); @@ -289,7 +289,7 @@ namespace slideshow /** Convert an IntSRGBA to plain UNO API 32 bit int */ sal_Int32 RGBAColor2UnoColor( cppcanvas::Color::IntSRGBA ); - + /** Fill a plain rectangle on the given canvas with the given color */ void fillRect( const boost::shared_ptr< cppcanvas::Canvas >& rCanvas, @@ -300,14 +300,14 @@ namespace slideshow */ void initSlideBackground( const boost::shared_ptr< cppcanvas::Canvas >& rCanvas, const basegfx::B2IVector& rSize ); - + /// Gets a random ordinal [0,n) inline ::std::size_t getRandomOrdinal( const ::std::size_t n ) { return static_cast< ::std::size_t >( double(n) * rand() / (RAND_MAX + 1.0) ); } - + /// To work around ternary operator in initializer lists /// (Solaris compiler problems) template <typename T> @@ -319,12 +319,12 @@ namespace slideshow else return arg2; } - + template <typename ValueType> inline bool getPropertyValue( - ValueType & rValue, + ValueType & rValue, com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> const & xPropSet, + com::sun::star::beans::XPropertySet> const & xPropSet, rtl::OUString const & propName ) { try { @@ -342,11 +342,11 @@ namespace slideshow #endif return bRet; } - catch (com::sun::star::uno::RuntimeException &) + catch (com::sun::star::uno::RuntimeException &) { throw; } - catch (com::sun::star::uno::Exception &) + catch (com::sun::star::uno::Exception &) { return false; } @@ -354,18 +354,18 @@ namespace slideshow template <typename ValueType> inline bool getPropertyValue( - com::sun::star::uno::Reference< ValueType >& rIfc, + com::sun::star::uno::Reference< ValueType >& rIfc, com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> const & xPropSet, + com::sun::star::beans::XPropertySet> const & xPropSet, rtl::OUString const & propName ) { - try + try { - const com::sun::star::uno::Any& a( + const com::sun::star::uno::Any& a( xPropSet->getPropertyValue( propName )); rIfc.set( a, com::sun::star::uno::UNO_QUERY ); - + bool const bRet = rIfc.is(); #if OSL_DEBUG_LEVEL > 0 if( !bRet ) @@ -378,22 +378,22 @@ namespace slideshow #endif return bRet; } - catch (com::sun::star::uno::RuntimeException &) + catch (com::sun::star::uno::RuntimeException &) { throw; } - catch (com::sun::star::uno::Exception &) + catch (com::sun::star::uno::Exception &) { return false; } } /// Get the content of the BoundRect shape property - basegfx::B2DRange getAPIShapeBounds( const ::com::sun::star::uno::Reference< + basegfx::B2DRange getAPIShapeBounds( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ); /// Get the content of the ZOrder shape property - double getAPIShapePrio( const ::com::sun::star::uno::Reference< + double getAPIShapePrio( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ); basegfx::B2IVector getSlideSizePixel( const basegfx::B2DVector& rSize, diff --git a/slideshow/source/inc/transitionfactory.hxx b/slideshow/source/inc/transitionfactory.hxx index d9a6683d31e6..51f0d403aaca 100644 --- a/slideshow/source/inc/transitionfactory.hxx +++ b/slideshow/source/inc/transitionfactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,11 +73,11 @@ namespace slideshow transition effect */ static AnimationActivitySharedPtr createShapeTransition( - const ActivitiesFactory::CommonParameters& rParms, - const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + const ActivitiesFactory::CommonParameters& rParms, + const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTransitionFilter > const& xTransition ); @@ -115,29 +115,29 @@ namespace slideshow ScreenUpdater& rScreenUpdater, EventMultiplexer& rEventMultiplexer, const com::sun::star::uno::Reference< - com::sun::star::presentation::XTransitionFactory>& + com::sun::star::presentation::XTransitionFactory>& xOptionalFactory, sal_Int16 nTransitionType, sal_Int16 nTransitionSubType, bool bTransitionDirection, const RGBColor& rTransitionFadeColor, const SoundPlayerSharedPtr& rSoundPlayer ); - + private: static const TransitionInfo* getTransitionInfo( sal_Int16 nTransitionType, sal_Int16 nTransitionSubType ); static const TransitionInfo* getRandomTransitionInfo(); static AnimationActivitySharedPtr createShapeTransition( - const ActivitiesFactory::CommonParameters& rParms, - const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + const ActivitiesFactory::CommonParameters& rParms, + const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTransitionFilter > const& xTransition, - sal_Int16 nTransitionType, - sal_Int16 nTransitionSubType ); - + sal_Int16 nTransitionType, + sal_Int16 nTransitionSubType ); + // static factory TransitionFactory(); ~TransitionFactory(); diff --git a/slideshow/source/inc/transitioninfo.hxx b/slideshow/source/inc/transitioninfo.hxx index bc0076c7aff1..95129db49c56 100644 --- a/slideshow/source/inc/transitioninfo.hxx +++ b/slideshow/source/inc/transitioninfo.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,47 +35,47 @@ namespace slideshow { namespace internal { struct TransitionInfo -{ +{ // the following two member serve as the search key // for an incoming XTransitionFilter node // // { - + sal_Int16 mnTransitionType; sal_Int16 mnTransitionSubType; - + // } // - + /** This enum classifies a transition type */ enum TransitionClass - { + { /// Invalid type TRANSITION_INVALID, - + /// Transition expressed by parametric clip polygon TRANSITION_CLIP_POLYPOLYGON, - + /// Transition expressed by hand-crafted function TRANSITION_SPECIAL }; - + /// class of effect handling TransitionClass meTransitionClass; - + /// Rotation angle of clip polygon double mnRotationAngle; - + /// X scaling of clip polygon (negative values mirror) double mnScaleX; - + /// Y scaling of clip polygon (negative values mirror) double mnScaleY; - + /** This enum determines the method how to reverse a parametric clip polygon transition. - + A reversed transition runs in the geometrically opposite direction. For a left-to-right bar wipe, the reversed transition is a right-to-left wipe, whereas @@ -89,39 +89,39 @@ struct TransitionInfo (if it has no sensible meaning for this transition) */ REVERSEMETHOD_IGNORE, - + /** Revert by changing the direction of the parameter sweep (from 1->0 instead of 0->1) */ REVERSEMETHOD_INVERT_SWEEP, - + /** Revert by subtracting the generated polygon from the target bound rect */ REVERSEMETHOD_SUBTRACT_POLYGON, - + /** Combination of REVERSEMETHOD_INVERT_SWEEP and REVERSEMETHOD_SUBTRACT_POLYGON. */ REVERSEMETHOD_SUBTRACT_AND_INVERT, - + /// Reverse by rotating polygon 180 degrees REVERSEMETHOD_ROTATE_180, - + /// Reverse by flipping polygon at the y (!) axis REVERSEMETHOD_FLIP_X, - + /// Reverse by flipping polygon at the x (!) axis REVERSEMETHOD_FLIP_Y }; - + /** Indicating the method to use when transition should be 'reversed'. - + @see ReverseMethod */ ReverseMethod meReverseMethod; - + /** When true, transition 'out' effects are realized by inverting the parameter sweep direction (1->0 instead of 0->1). Otherwise, 'out' effects are @@ -129,14 +129,14 @@ struct TransitionInfo the parametric poly-polygon. */ bool mbOutInvertsSweep; - + /** when true, scale clip polygon isotrophically to target size. when false, scale is anisotrophically. */ bool mbScaleIsotrophically; - - + + /// Compare against type and subtype class Comparator { diff --git a/slideshow/source/inc/unoview.hxx b/slideshow/source/inc/unoview.hxx index c9c02b712c4c..aac543e555d3 100644 --- a/slideshow/source/inc/unoview.hxx +++ b/slideshow/source/inc/unoview.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,9 +57,9 @@ namespace slideshow /** Retrieve the underlying UNO slide view. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowView > getUnoView() const = 0; - + /** Dispose view - + This needs to be different from Disposable interface, as the UNO XComponent also provides a dispose() (only with a different calling convention under Windows). @@ -77,8 +77,8 @@ namespace slideshow virtual void setIsSoundEnabled (const bool bValue) = 0; }; - typedef ::boost::shared_ptr< UnoView > UnoViewSharedPtr; - typedef ::std::vector< UnoViewSharedPtr > UnoViewVector; + typedef ::boost::shared_ptr< UnoView > UnoViewSharedPtr; + typedef ::std::vector< UnoViewSharedPtr > UnoViewVector; } } diff --git a/slideshow/source/inc/unoviewcontainer.hxx b/slideshow/source/inc/unoviewcontainer.hxx index a459b290b257..71ebc57345cf 100644 --- a/slideshow/source/inc/unoviewcontainer.hxx +++ b/slideshow/source/inc/unoviewcontainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ #include "unoview.hxx" -namespace com { namespace sun { namespace star { namespace presentation +namespace com { namespace sun { namespace star { namespace presentation { class XSlideShowView; } } } } @@ -77,7 +77,7 @@ namespace slideshow removed, and an empty shared_ptr otherwise (e.g. if this view wasn't added in the first place) */ - UnoViewSharedPtr removeView( const ::com::sun::star::uno::Reference< + UnoViewSharedPtr removeView( const ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowView >& xView ); /// Dispose all stored views. Implies clear(). @@ -91,15 +91,15 @@ namespace slideshow void clear() { maViews.clear(); } - - UnoViewVector::iterator begin() { return maViews.begin(); } - UnoViewVector::const_iterator begin() const { return maViews.begin(); } - UnoViewVector::iterator end() { return maViews.end(); } - UnoViewVector::const_iterator end() const { return maViews.end(); } + + UnoViewVector::iterator begin() { return maViews.begin(); } + UnoViewVector::const_iterator begin() const { return maViews.begin(); } + UnoViewVector::iterator end() { return maViews.end(); } + UnoViewVector::const_iterator end() const { return maViews.end(); } private: /// All added views - UnoViewVector maViews; + UnoViewVector maViews; }; typedef ::boost::shared_ptr< UnoViewContainer > UnoViewContainerSharedPtr; diff --git a/slideshow/source/inc/usereventqueue.hxx b/slideshow/source/inc/usereventqueue.hxx index 851afa64b423..63f7965b58a9 100644 --- a/slideshow/source/inc/usereventqueue.hxx +++ b/slideshow/source/inc/usereventqueue.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,14 +52,14 @@ class MouseEnterHandler; class MouseLeaveHandler; /** This class schedules user-activated events. - + This class registeres at the EventMultiplexer and fires events registered for certain user actions. Note that all events will not be fired immediately after the user action occured, but always added to the EventQueue (and fired the next time that queue is processed). Which is actually a feature. - + Conceptually, an event is an object that typically is fired only once. After that, the event is exhausted, and should be discarded. Therefore, all events registered on @@ -70,11 +70,11 @@ class UserEventQueue : private ::boost::noncopyable { public: /** Create a user event queue - + @param rEventMultiplexer The slideshow-global event source, where this class registeres its event handlers. - + @param rEventQueue Reference to the main event queue. Since we hold this object by plain reference, it must live longer than we @@ -91,22 +91,22 @@ public: EventQueue& rEventQueue, CursorManager& rCursorManager ); ~UserEventQueue(); - + /** Query whether there are any events still pending. */ bool isEmpty() const; - + /** Clear all registered events. - + This method clears all registered, but not-yet-executed events. This comes in handy when force-ending a slide, to avoid interference with the next slide's event registration. */ void clear(); - + /** Set advance on click behaviour. - + @param bAdvanceOnClick When true, a click somewhere on the slide will also generate next effect event. In this case, it is @@ -114,28 +114,28 @@ public: i.e. the shape need not be hit by the mouse. */ void setAdvanceOnClick( bool bAdvanceOnClick ); - + /** Register an event that will be fired when the slide is just shown. - + Note that <em>all</em> registered events will be fired when the slide start occurs. This is in contrast to the mouse events below. */ void registerSlideStartEvent( const EventSharedPtr& rEvent ); - + /** Register an event that will be fired when the slide is about to vanish. - + Note that <em>all</em> registered events will be fired when the slide end occurs. This is in contrast to the mouse events below. */ void registerSlideEndEvent( const EventSharedPtr& rEvent ); - + /** Register an event that will be fired when the given animation node starts. - + Note that <em>all</em> registered events will be fired when the animation start occurs. This is in contrast to the mouse events below. @@ -144,10 +144,10 @@ public: const EventSharedPtr& rEvent, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode>& xNode ); - + /** Register an event that will be fired when the given animation node ends its active duration. - + Note that <em>all</em> registered events will be fired when the animation end occurs. This is in contrast to the mouse events below. @@ -156,10 +156,10 @@ public: const EventSharedPtr& rEvent, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode>& xNode ); - + /** Register an event that will be fired when audio output stopped for the given animation node. - + Note that <em>all</em> registered events will be fired when the audio stopping occurs. This is in contrast to the mouse events below. @@ -168,9 +168,9 @@ public: const EventSharedPtr& rEvent, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode>& xNode ); - + /** Register an event that is fired when a shape is clicked - + For every mouse click, only one of the events registered here is fired. The order of fired events is the order of registration, i.e. the first event @@ -179,7 +179,7 @@ public: */ void registerShapeClickEvent( const EventSharedPtr& rEvent, const ShapeSharedPtr& rShape ); - + /** Registes an event that is fired when the current effects(s) are skipped, .e.g. when the left mouse button is pressed. Then, all registered events are fired and removed from this @@ -195,16 +195,16 @@ public: void registerSkipEffectEvent( EventSharedPtr const& pEvent, const bool bSkipTriggersNextEffect); - + /** Registes an event that is fired when the current effects(s) are rewound, .e.g. when the right mouse button is pressed. Then, all registered events are fired and removed from this queue. */ void registerRewindEffectEvent( EventSharedPtr const& rEvent ); - + /** Register an event that is fired to show the next event - + For every next effect event, only one of the events registered here is fired. The order of fired events is the order of registration, i.e. the first event @@ -217,10 +217,10 @@ public: not be hit by the mouse. */ void registerNextEffectEvent( const EventSharedPtr& rEvent ); - + /** Register an event that is fired on a double mouse click on a shape - + For every mouse double click, only one of the events registered here is fired. The order of fired events is the order of registration, i.e. the first event @@ -231,9 +231,9 @@ public: */ void registerShapeDoubleClickEvent( const EventSharedPtr& rEvent, const ShapeSharedPtr& rShape ); - + /** Register an event that is fired on a double mouse click - + For every mouse double click, only one of the events registered here is fired. The order of fired events is the order of registration, i.e. the first event @@ -243,10 +243,10 @@ public: the mouse. */ void registerDoubleClickEvent( const EventSharedPtr& rEvent ); - + /** Register an event that is fired when the mouse enters the area of the given shape - + For every enter, only one of the events registered here is fired. The order of fired events is the order of registration, i.e. the first event registered will @@ -255,10 +255,10 @@ public: */ void registerMouseEnterEvent( const EventSharedPtr& rEvent, const ShapeSharedPtr& rShape ); - + /** Register an event that is fired when the mouse leaves the area of the given shape - + For every leave, only one of the events registered here is fired. The order of fired events is the order of registration, i.e. the first event registered will @@ -276,29 +276,29 @@ public: private: /** Generically register an event on one of the handlers. - + If the handler is not yet created, do that and register it via the Functor */ - template< typename Handler, typename Functor > + template< typename Handler, typename Functor > void registerEvent( ::boost::shared_ptr< Handler >& rHandler, const EventSharedPtr& rEvent, const Functor& rRegistrationFunctor ); - + /** Generically register an event on one of the handlers. - + If the handler is not yet created, do that and register it via the Functor. This version of the registerEvent method takes an additional parameter rArg, which is passed as the second argument to rHandler's addEvent() method. */ - template< typename Handler, typename Arg, typename Functor > + template< typename Handler, typename Arg, typename Functor > void registerEvent( ::boost::shared_ptr< Handler >& rHandler, const EventSharedPtr& rEvent, const Arg& rArg, const Functor& rRegistrationFunctor ); - + EventMultiplexer& mrMultiplexer; EventQueue& mrEventQueue; CursorManager& mrCursorManager; @@ -316,7 +316,7 @@ private: ::boost::shared_ptr<ClickEventHandler> mpDoubleClickEventHandler; ::boost::shared_ptr<MouseEnterHandler> mpMouseEnterHandler; ::boost::shared_ptr<MouseLeaveHandler> mpMouseLeaveHandler; - + bool mbAdvanceOnClick; }; diff --git a/slideshow/source/inc/userpainteventhandler.hxx b/slideshow/source/inc/userpainteventhandler.hxx index 5a4c567f52cc..471c2b35c706 100644 --- a/slideshow/source/inc/userpainteventhandler.hxx +++ b/slideshow/source/inc/userpainteventhandler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ namespace slideshow namespace internal { class RGBColor; - + /** Interface for handling user paint state changes. Classes implementing this interface can be added to an diff --git a/slideshow/source/inc/view.hxx b/slideshow/source/inc/view.hxx index 6df52ee14114..60c514b7b7d2 100644 --- a/slideshow/source/inc/view.hxx +++ b/slideshow/source/inc/view.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ namespace slideshow { public: /** Create a new view layer for this view - + @param rLayerBounds Specifies the bound rect of the layer relative to the user view coordinate system. @@ -79,7 +79,7 @@ namespace slideshow virtual void setViewSize( const ::basegfx::B2DVector& ) = 0; /** Change the view's mouse cursor. - + @param nPointerShape One of the ::com::sun::star::awt::SystemPointer constant group members. @@ -87,8 +87,8 @@ namespace slideshow virtual void setCursorShape( sal_Int16 nPointerShape ) = 0; }; - typedef ::boost::shared_ptr< View > ViewSharedPtr; - typedef ::std::vector< ViewSharedPtr > ViewVector; + typedef ::boost::shared_ptr< View > ViewSharedPtr; + typedef ::std::vector< ViewSharedPtr > ViewVector; } } diff --git a/slideshow/source/inc/vieweventhandler.hxx b/slideshow/source/inc/vieweventhandler.hxx index 18f2e931e580..93ed651ad653 100644 --- a/slideshow/source/inc/vieweventhandler.hxx +++ b/slideshow/source/inc/vieweventhandler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/inc/viewlayer.hxx b/slideshow/source/inc/viewlayer.hxx index 54aa4c4eaa68..fd6adf88ab22 100644 --- a/slideshow/source/inc/viewlayer.hxx +++ b/slideshow/source/inc/viewlayer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,17 +31,17 @@ #include <sal/config.h> #include <boost/shared_ptr.hpp> -namespace basegfx -{ - class B1DRange; - class B2DRange; +namespace basegfx +{ + class B1DRange; + class B2DRange; class B2DVector; class B2DHomMatrix; class B2DPolyPolygon; } namespace cppcanvas -{ - class Canvas; +{ + class Canvas; class CustomSprite; } @@ -116,7 +116,7 @@ namespace slideshow layer, i.e. the z position in relation to other layers on the parent view. The higher the priority range, the further in front the layer resides. - + @param rRange Priority range, must be in the range [0,1] */ diff --git a/slideshow/source/inc/viewrepainthandler.hxx b/slideshow/source/inc/viewrepainthandler.hxx index f66ffd5819d5..6720a33b8f01 100644 --- a/slideshow/source/inc/viewrepainthandler.hxx +++ b/slideshow/source/inc/viewrepainthandler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/inc/viewupdate.hxx b/slideshow/source/inc/viewupdate.hxx index 52f048d99ae0..7656a311d1c0 100644 --- a/slideshow/source/inc/viewupdate.hxx +++ b/slideshow/source/inc/viewupdate.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/source/inc/wakeupevent.hxx b/slideshow/source/inc/wakeupevent.hxx index 58e818a91459..0ae0729a5cfb 100644 --- a/slideshow/source/inc/wakeupevent.hxx +++ b/slideshow/source/inc/wakeupevent.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ namespace internal { /** Little helper class, used to set Activities active again after some sleep period. - + Clients can use this class to schedule wakeup events at the EventQueue, to avoid busy-waiting for the next discrete time instant. @@ -52,17 +52,17 @@ public: WakeupEvent( ::boost::shared_ptr< ::canvas::tools::ElapsedTime > const& pTimeBase, ActivitiesQueue & rActivityQueue ); - + virtual void dispose(); virtual bool fire(); virtual bool isCharged() const; virtual double getActivationTime( double nCurrentTime ) const; - + /// Start the internal timer void start(); - + /** Set the next timeout this object should generate. - + @param nextTime Absolute time, measured from the last start() call, when this event should wakeup the Activity again. If @@ -70,14 +70,14 @@ public: every setNextTimeout() call. */ void setNextTimeout( double nextTime ); - + /** Set activity to wakeup. - + The activity given here will be reinserted into the ActivitiesQueue, once the timeout is reached. */ void setActivity( const ActivitySharedPtr& rActivity ); - + private: ::canvas::tools::ElapsedTime maTimer; double mnNextTime; diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx index 2fb84f1f9d83..ec1bef44fe74 100644 --- a/slideshow/test/demoshow.cxx +++ b/slideshow/test/demoshow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include <cppuhelper/bootstrap.hxx> #include <cppuhelper/servicefactory.hxx> -#include <cppuhelper/interfacecontainer.hxx> +#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/compbase1.hxx> #include <cppuhelper/compbase2.hxx> @@ -78,11 +78,11 @@ using namespace ::com::sun::star; namespace { typedef ::cppu::WeakComponentImplHelper1< presentation::XSlideShowView > ViewBase; -class View : public ::comphelper::OBaseMutex, +class View : public ::comphelper::OBaseMutex, public ViewBase { public: - explicit View( const uno::Reference< rendering::XSpriteCanvas >& rCanvas ) : + explicit View( const uno::Reference< rendering::XSpriteCanvas >& rCanvas ) : ViewBase( m_aMutex ), mxCanvas( rCanvas ), maPaintListeners( m_aMutex ), @@ -101,7 +101,7 @@ public: maTransform = basegfx::tools::createScaleTranslateB2DHomMatrix( nSize, nSize, (rNewSize.Width() - nSize) / 2, (rNewSize.Height() - nSize) / 2); - lang::EventObject aEvent( *this ); + lang::EventObject aEvent( *this ); maTransformationListeners.notifyEach( &util::XModifyListener::modified, aEvent ); } @@ -110,7 +110,7 @@ public: { awt::PaintEvent aEvent( *this, awt::Rectangle(), - 0 ); + 0 ); maPaintListeners.notifyEach( &awt::XPaintListener::windowPaint, aEvent ); } @@ -129,12 +129,12 @@ private: ::basegfx::B2DRectangle(0.0,0.0, maSize.Width(), maSize.Height() ))); - ::cppcanvas::SpriteCanvasSharedPtr pCanvas( + ::cppcanvas::SpriteCanvasSharedPtr pCanvas( ::cppcanvas::VCLFactory::getInstance().createSpriteCanvas( mxCanvas )); if( !pCanvas ) return; - ::cppcanvas::PolyPolygonSharedPtr pPolyPoly( + ::cppcanvas::PolyPolygonSharedPtr pPolyPoly( ::cppcanvas::BaseGfxFactory::getInstance().createPolyPolygon( pCanvas, aPoly ) ); if( !pPolyPoly ) @@ -150,7 +150,7 @@ private: virtual geometry::AffineMatrix2D SAL_CALL getTransformation( ) throw (uno::RuntimeException) { geometry::AffineMatrix2D aRes; - return basegfx::unotools::affineMatrixFromHomMatrix( aRes, + return basegfx::unotools::affineMatrixFromHomMatrix( aRes, maTransform ); } @@ -207,9 +207,9 @@ private: Size maSize; }; -typedef ::cppu::WeakComponentImplHelper2< drawing::XDrawPage, +typedef ::cppu::WeakComponentImplHelper2< drawing::XDrawPage, beans::XPropertySet > SlideBase; -class DummySlide : public ::comphelper::OBaseMutex, +class DummySlide : public ::comphelper::OBaseMutex, public SlideBase { public: @@ -251,7 +251,7 @@ private: return uno::Reference< beans::XPropertySetInfo >(); } - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& /*aPropertyName*/, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& /*aPropertyName*/, const uno::Any& /*aValue*/ ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { } @@ -275,29 +275,29 @@ private: sizeof(lcl_propertyMap)/sizeof(*lcl_propertyMap), true ); - sal_Int16 aRes; + sal_Int16 aRes; if( !aMap.lookup( PropertyName, aRes )) return uno::Any(); - + return uno::makeAny(aRes); } - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { } - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { } - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { } - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { } @@ -308,7 +308,7 @@ class DemoApp : public Application { public: virtual void Main(); - virtual USHORT Exception( USHORT nError ); + virtual USHORT Exception( USHORT nError ); }; class ChildWindow : public Window @@ -320,7 +320,7 @@ public: virtual void Resize(); void setShow( const uno::Reference< presentation::XSlideShow >& rShow ) { mxShow = rShow; init(); } - + private: void init(); @@ -351,7 +351,7 @@ void ChildWindow::init() { uno::Reference< rendering::XCanvas > xCanvas( GetCanvas(), uno::UNO_QUERY_THROW ); - uno::Reference< rendering::XSpriteCanvas > xSpriteCanvas( xCanvas, + uno::Reference< rendering::XSpriteCanvas > xSpriteCanvas( xCanvas, uno::UNO_QUERY_THROW ); mpView = new View( xSpriteCanvas ); mpView->resize( GetSizePixel() ); @@ -363,7 +363,7 @@ void ChildWindow::init() catch (const uno::Exception &e) { OSL_TRACE( "Exception '%s' thrown\n" , - (const sal_Char*)::rtl::OUStringToOString( e.Message, + (const sal_Char*)::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 )); } } @@ -378,7 +378,7 @@ void ChildWindow::Paint( const Rectangle& /*rRect*/ ) catch (const uno::Exception &e) { OSL_TRACE( "Exception '%s' thrown\n" , - (const sal_Char*)::rtl::OUStringToOString( e.Message, + (const sal_Char*)::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 )); } } @@ -395,20 +395,20 @@ public: DemoWindow(); virtual void Paint( const Rectangle& rRect ); virtual void Resize(); - + private: void init(); DECL_LINK( updateHdl, Timer* ); - ChildWindow maLeftChild; - ChildWindow maRightTopChild; - ChildWindow maRightBottomChild; + ChildWindow maLeftChild; + ChildWindow maRightTopChild; + ChildWindow maRightBottomChild; uno::Reference< presentation::XSlideShow > mxShow; AutoTimer maUpdateTimer; bool mbSlideDisplayed; }; -DemoWindow::DemoWindow() : +DemoWindow::DemoWindow() : Dialog((Window*)NULL), maLeftChild( this ), maRightTopChild( this ), @@ -437,14 +437,14 @@ void DemoWindow::init() { if( !mxShow.is() ) { - uno::Reference< lang::XMultiServiceFactory > xFactory( + uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); - uno::Reference< uno::XInterface > xInt( xFactory->createInstance( + uno::Reference< uno::XInterface > xInt( xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.SlideShow")) )); - mxShow.set( xInt, + mxShow.set( xInt, uno::UNO_QUERY_THROW ); maLeftChild.setShow( mxShow ); @@ -456,9 +456,9 @@ void DemoWindow::init() { uno::Reference< drawing::XDrawPage > xSlide( new DummySlide ); mxShow->displaySlide( xSlide, - uno::Reference< animations::XAnimationNode >(), + uno::Reference< animations::XAnimationNode >(), uno::Sequence< beans::PropertyValue >() ); - mxShow->setProperty( beans::PropertyValue( + mxShow->setProperty( beans::PropertyValue( rtl::OUString::createFromAscii("RehearseTimings"), 0, uno::makeAny( sal_True ), @@ -469,7 +469,7 @@ void DemoWindow::init() catch (const uno::Exception &e) { OSL_TRACE( "Exception '%s' thrown\n" , - (const sal_Char*)::rtl::OUStringToOString( e.Message, + (const sal_Char*)::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 )); } } @@ -530,7 +530,7 @@ void DemoApp::Main() try { uno::Reference< uno::XComponentContext > xCtx = ::cppu::defaultBootstrap_InitialComponentContext(); - xFactory = uno::Reference< lang::XMultiServiceFactory >( xCtx->getServiceManager(), + xFactory = uno::Reference< lang::XMultiServiceFactory >( xCtx->getServiceManager(), uno::UNO_QUERY ); if( xFactory.is() ) ::comphelper::setProcessServiceFactory( xFactory ); diff --git a/slideshow/test/export.map b/slideshow/test/export.map index 7321bbca16ad..f313c44bd7ad 100644 --- a/slideshow/test/export.map +++ b/slideshow/test/export.map @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/test/slidetest.cxx b/slideshow/test/slidetest.cxx index fdd8b3bebe1e..9f0ab2c82f32 100644 --- a/slideshow/test/slidetest.cxx +++ b/slideshow/test/slidetest.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -195,34 +195,34 @@ public: mpLayerManager->isUpdatePending() ); CPPUNIT_ASSERT_MESSAGE( "Update failed on LayerManager #2", mpLayerManager->update() ); - CPPUNIT_ASSERT_MESSAGE( "Shape 1 must be on background layer", + CPPUNIT_ASSERT_MESSAGE( "Shape 1 must be on background layer", mpTestShape->getViewLayers().at(0).first == mpTestView ); - CPPUNIT_ASSERT_MESSAGE( "Shape 2 must be on background layer", + CPPUNIT_ASSERT_MESSAGE( "Shape 2 must be on background layer", pShape2->getViewLayers().at(0).first == mpTestView ); - CPPUNIT_ASSERT_MESSAGE( "Shape 3 must have one layer", + CPPUNIT_ASSERT_MESSAGE( "Shape 3 must have one layer", pShape3->getViewLayers().size() == 1 ); - CPPUNIT_ASSERT_MESSAGE( "Shape 3 must be on background layer", + CPPUNIT_ASSERT_MESSAGE( "Shape 3 must be on background layer", pShape3->getViewLayers().at(0).first == mpTestView ); - CPPUNIT_ASSERT_MESSAGE( "Shape 4 must be on background layer", + CPPUNIT_ASSERT_MESSAGE( "Shape 4 must be on background layer", pShape4->getViewLayers().at(0).first == mpTestView ); // checking deactivation (all layers except background layer // must vanish) mpLayerManager->enterAnimationMode(pShape3); - CPPUNIT_ASSERT_MESSAGE( "No update pending on LayerManager", + CPPUNIT_ASSERT_MESSAGE( "No update pending on LayerManager", mpLayerManager->isUpdatePending() ); - CPPUNIT_ASSERT_MESSAGE( "Update failed on LayerManager", + CPPUNIT_ASSERT_MESSAGE( "Update failed on LayerManager", mpLayerManager->update() ); - CPPUNIT_ASSERT_MESSAGE( "Shape 4 must not be on background layer", + CPPUNIT_ASSERT_MESSAGE( "Shape 4 must not be on background layer", pShape4->getViewLayers().at(0).first != mpTestView ); mpLayerManager->leaveAnimationMode(pShape3); - CPPUNIT_ASSERT_MESSAGE( "Update failed on LayerManager", + CPPUNIT_ASSERT_MESSAGE( "Update failed on LayerManager", mpLayerManager->update() ); - CPPUNIT_ASSERT_MESSAGE( "Shape 4 must be on background layer", + CPPUNIT_ASSERT_MESSAGE( "Shape 4 must be on background layer", pShape4->getViewLayers().at(0).first == mpTestView ); mpLayerManager->deactivate(); - CPPUNIT_ASSERT_MESSAGE( "Update pending on deactivated LayerManager", + CPPUNIT_ASSERT_MESSAGE( "Update pending on deactivated LayerManager", !mpLayerManager->isUpdatePending() ); } @@ -251,45 +251,45 @@ public: mpLayerManager->activate( false ); mpLayerManager->update(); - CPPUNIT_ASSERT_MESSAGE( "First shape not rendered", + CPPUNIT_ASSERT_MESSAGE( "First shape not rendered", mpTestShape->getNumRenders() == 1 ); - CPPUNIT_ASSERT_MESSAGE( "Second shape not rendered", + CPPUNIT_ASSERT_MESSAGE( "Second shape not rendered", pShape2->getNumRenders() == 1 ); - CPPUNIT_ASSERT_MESSAGE( "Third shape not rendered", + CPPUNIT_ASSERT_MESSAGE( "Third shape not rendered", pShape3->getNumRenders() == 1 ); - CPPUNIT_ASSERT_MESSAGE( "Fourth shape not rendered", + CPPUNIT_ASSERT_MESSAGE( "Fourth shape not rendered", pShape4->getNumRenders() == 1 ); - CPPUNIT_ASSERT_MESSAGE( "Fifth shape not rendered", + CPPUNIT_ASSERT_MESSAGE( "Fifth shape not rendered", pShape5->getNumRenders() == 1 ); - + mpLayerManager->enterAnimationMode(pShape4); mpLayerManager->update(); - CPPUNIT_ASSERT_MESSAGE( "First shape not rendered", + CPPUNIT_ASSERT_MESSAGE( "First shape not rendered", mpTestShape->getNumRenders() == 1 ); - CPPUNIT_ASSERT_MESSAGE( "Second shape not rendered", + CPPUNIT_ASSERT_MESSAGE( "Second shape not rendered", pShape2->getNumRenders() == 1 ); - CPPUNIT_ASSERT_MESSAGE( "Third shape not rendered", + CPPUNIT_ASSERT_MESSAGE( "Third shape not rendered", pShape3->getNumRenders() == 2 ); - CPPUNIT_ASSERT_MESSAGE( "Fourth shape not rendered", + CPPUNIT_ASSERT_MESSAGE( "Fourth shape not rendered", pShape4->getNumRenders() == 2 ); - CPPUNIT_ASSERT_MESSAGE( "Fifth shape not rendered", + CPPUNIT_ASSERT_MESSAGE( "Fifth shape not rendered", pShape5->getNumRenders() == 2 ); mpLayerManager->leaveAnimationMode(pShape2); mpLayerManager->leaveAnimationMode(pShape4); mpLayerManager->update(); - CPPUNIT_ASSERT_MESSAGE( "First shape not rendered #2", + CPPUNIT_ASSERT_MESSAGE( "First shape not rendered #2", mpTestShape->getNumRenders() == 2 ); - CPPUNIT_ASSERT_MESSAGE( "Second shape not rendered #2", + CPPUNIT_ASSERT_MESSAGE( "Second shape not rendered #2", pShape2->getNumRenders() == 2 ); - CPPUNIT_ASSERT_MESSAGE( "Third shape not rendered #2", + CPPUNIT_ASSERT_MESSAGE( "Third shape not rendered #2", pShape3->getNumRenders() == 3 ); - CPPUNIT_ASSERT_MESSAGE( "Fourth shape not rendered #2", - pShape4->getNumRenders() == 3 ); - CPPUNIT_ASSERT_MESSAGE( "Fifth shape not rendered #2", - pShape5->getNumRenders() == 3 ); + CPPUNIT_ASSERT_MESSAGE( "Fourth shape not rendered #2", + pShape4->getNumRenders() == 3 ); + CPPUNIT_ASSERT_MESSAGE( "Fifth shape not rendered #2", + pShape5->getNumRenders() == 3 ); } void testRefCounting() @@ -314,13 +314,13 @@ public: mpLayerManager->removeShape(pShape3); mpLayerManager->removeShape(pShape4); - CPPUNIT_ASSERT_MESSAGE( "Shape 1 must have refcount of 1", + CPPUNIT_ASSERT_MESSAGE( "Shape 1 must have refcount of 1", mpTestShape.use_count() == 1 ); - CPPUNIT_ASSERT_MESSAGE( "Shape 2 must have refcount of ", + CPPUNIT_ASSERT_MESSAGE( "Shape 2 must have refcount of ", pShape2.use_count() == 1 ); - CPPUNIT_ASSERT_MESSAGE( "Shape 3 must have refcount of 1", + CPPUNIT_ASSERT_MESSAGE( "Shape 3 must have refcount of 1", pShape3.use_count() == 1 ); - CPPUNIT_ASSERT_MESSAGE( "Shape 4 must have refcount of", + CPPUNIT_ASSERT_MESSAGE( "Shape 4 must have refcount of", pShape4.use_count() == 1 ); @@ -337,18 +337,18 @@ public: mpLayerManager->removeShape(pShape3); mpLayerManager->removeShape(pShape4); - CPPUNIT_ASSERT_MESSAGE( "Shape 1 must have refcount of 1", + CPPUNIT_ASSERT_MESSAGE( "Shape 1 must have refcount of 1", mpTestShape.use_count() == 1 ); - CPPUNIT_ASSERT_MESSAGE( "Shape 2 must have refcount of ", + CPPUNIT_ASSERT_MESSAGE( "Shape 2 must have refcount of ", pShape2.use_count() == 1 ); - CPPUNIT_ASSERT_MESSAGE( "Shape 3 must have refcount of 1", + CPPUNIT_ASSERT_MESSAGE( "Shape 3 must have refcount of 1", pShape3.use_count() == 1 ); - CPPUNIT_ASSERT_MESSAGE( "Shape 4 must have refcount of 1", + CPPUNIT_ASSERT_MESSAGE( "Shape 4 must have refcount of 1", pShape4.use_count() == 1 ); maViews.removeView(mpTestView); mpLayerManager->viewRemoved(mpTestView); - CPPUNIT_ASSERT_MESSAGE( "View must have refcount of 1", + CPPUNIT_ASSERT_MESSAGE( "View must have refcount of 1", mpTestView.use_count() == 1 ); } diff --git a/slideshow/test/tests.hxx b/slideshow/test/tests.hxx index f8fa3cc6afb8..8272b663816e 100644 --- a/slideshow/test/tests.hxx +++ b/slideshow/test/tests.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/slideshow/test/testshape.cxx b/slideshow/test/testshape.cxx index ae5a9439a397..86864c7e241b 100644 --- a/slideshow/test/testshape.cxx +++ b/slideshow/test/testshape.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -215,7 +215,7 @@ private: TestShapeSharedPtr createTestShape(const basegfx::B2DRange& rRect, double nPrio) { - return TestShapeSharedPtr( + return TestShapeSharedPtr( comphelper::make_shared_from_UNO( new ImplTestShape(rRect,nPrio)) ); } diff --git a/slideshow/test/testview.cxx b/slideshow/test/testview.cxx index bc446633ce18..8f029a9f3dcd 100644 --- a/slideshow/test/testview.cxx +++ b/slideshow/test/testview.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -280,7 +280,7 @@ public: TestViewSharedPtr createTestView() { - return TestViewSharedPtr( + return TestViewSharedPtr( comphelper::make_shared_from_UNO( new ImplTestView()) ); } diff --git a/slideshow/test/views.cxx b/slideshow/test/views.cxx index 23984b9eeca6..4a7a427f4ed2 100644 --- a/slideshow/test/views.cxx +++ b/slideshow/test/views.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |