diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-10-11 07:38:20 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-10-11 07:38:20 +0000 |
| commit | 4450c701a89e4f0cf734d523f1722adcc729d36c (patch) | |
| tree | 685d51b9126d63bdbdc2d359376b01c5a1a7fa91 | |
| parent | 66ed759508415c9c916e56206f66b015e1ccc33d (diff) | |
INTEGRATION: CWS presfixes08 (1.5.16); FILE MERGED
2005/08/02 08:24:44 dbo 1.5.16.2: #i37786# cleanup, minor corrections
Issue number:
Submitted by:
Reviewed by:
2005/07/15 13:19:16 dbo 1.5.16.1: #i37786# drawing layer animations, cleanup, misc
Issue number:
Submitted by:
Reviewed by:
| -rw-r--r-- | slideshow/source/engine/waitsymbol.hxx | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/slideshow/source/engine/waitsymbol.hxx b/slideshow/source/engine/waitsymbol.hxx index 904f2a524540..e36fa3aea2b9 100644 --- a/slideshow/source/engine/waitsymbol.hxx +++ b/slideshow/source/engine/waitsymbol.hxx @@ -4,9 +4,9 @@ * * $RCSfile: waitsymbol.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2005-09-07 20:33:31 $ + * last change: $Author: obo $ $Date: 2005-10-11 08:38:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -42,23 +42,20 @@ #include "disposable.hxx" #include "eventmultiplexer.hxx" #include "unoview.hxx" - -#include <boost/shared_ptr.hpp> -#include <boost/bind.hpp> -#include <boost/utility.hpp> // for noncopyable - +#include "boost/shared_ptr.hpp" +#include "boost/bind.hpp" +#include "boost/utility.hpp" // for noncopyable #include <vector> - namespace presentation { namespace internal { -class WaitSymbol : public Disposable, private boost::noncopyable +class WaitSymbol : public Disposable, private ::boost::noncopyable { public: - WaitSymbol( const com::sun::star::uno::Reference< - com::sun::star::rendering::XBitmap>& xBitmap, - EventMultiplexer& rEventMultiplexer ); + WaitSymbol( const ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XBitmap>& xBitmap, + EventMultiplexer& rEventMultiplexer ); /** Shows the wait symbol. */ @@ -80,14 +77,14 @@ public: virtual void dispose(); private: - com::sun::star::uno::Reference< - com::sun::star::rendering::XBitmap> m_xBitmap; + ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XBitmap> m_xBitmap; - basegfx::B2DPoint calcSpritePos( UnoViewSharedPtr const & rView ) const; + ::basegfx::B2DPoint calcSpritePos( UnoViewSharedPtr const & rView ) const; - typedef std::vector< - std::pair<UnoViewSharedPtr, - cppcanvas::CustomSpriteSharedPtr> > ViewsVecT; + typedef ::std::vector< + ::std::pair<UnoViewSharedPtr, + cppcanvas::CustomSpriteSharedPtr> > ViewsVecT; ViewsVecT m_views; EventMultiplexer& mrEventMultiplexer; |