dba34b: outsourced the Throbber_Impl from toolkit to VCL, promoted to a 'real' control

3 files changed, 3 insertions, 95 deletions

diff --git a/toolkit/inc/toolkit/awt/xsimpleanimation.hxx b/toolkit/inc/toolkit/awt/xsimpleanimation.hxx
index 673c7eaddf61..9e6043b7d9ef 100644
--- a/toolkit/inc/toolkit/awt/xsimpleanimation.hxx
+++ b/toolkit/inc/toolkit/awt/xsimpleanimation.hxx
@@ -38,7 +38,6 @@
 //........................................................................
 namespace toolkit
 {
-    class Throbber_Impl;
 //........................................................................
 
     //====================================================================
@@ -50,9 +49,6 @@ namespace toolkit
 
     class XSimpleAnimation : public XSimpleAnimation_Base
     {
-    private:
-        ::boost::scoped_ptr< Throbber_Impl >    mpThrobber;
-
     public:
         XSimpleAnimation();
 
diff --git a/toolkit/inc/toolkit/awt/xthrobber.hxx b/toolkit/inc/toolkit/awt/xthrobber.hxx
index fa0df0047180..67015e049a48 100644
--- a/toolkit/inc/toolkit/awt/xthrobber.hxx
+++ b/toolkit/inc/toolkit/awt/xthrobber.hxx
@@ -40,7 +40,6 @@
 namespace toolkit
 {
 //........................................................................
-    class Throbber_Impl;
 
     //====================================================================
     //= XThrobber
@@ -53,7 +52,6 @@ namespace toolkit
                     ,public ::boost::noncopyable
     {
     private:
-        Throbber_Impl   *mpThrobber;
         void SAL_CALL InitImageList() throw(::com::sun::star::uno::RuntimeException);
 
     public:
@@ -66,6 +64,9 @@ namespace toolkit
         virtual void SAL_CALL start() throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL stop() throw (::com::sun::star::uno::RuntimeException);
 
+        // VCLXWindow
+        virtual void    SetWindow( Window* pWindow );
+
     private:
         XThrobber( const XThrobber& );            // never implemented
         XThrobber& operator=( const XThrobber& ); // never implemented
diff --git a/toolkit/inc/toolkit/helper/throbberimpl.hxx b/toolkit/inc/toolkit/helper/throbberimpl.hxx
deleted file mode 100644
index 92fb177fd89d..000000000000
--- a/toolkit/inc/toolkit/helper/throbberimpl.hxx
+++ /dev/null
@@ -1,89 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _TOOLKIT_HELPER_THROBBERIMPL_HXX_
-#define _TOOLKIT_HELPER_THROBBERIMPL_HXX_
-
-#include <toolkit/awt/vclxwindow.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-
-#include <com/sun/star/graphic/XGraphic.hpp>
-#include <vcl/timer.hxx>
-#include <vos/mutex.hxx>
-
-//........................................................................
-namespace toolkit
-//........................................................................
-{
-
-    class Throbber_Impl
-    {
-    private:
-        vos::IMutex&    mrMutex;    // Reference to SolarMutex
-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > maImageList;
-        VCLXWindow&     mrParent;
-
-        sal_Bool    mbRepeat;
-        sal_Int32   mnStepTime;
-        sal_Int32   mnCurStep;
-        sal_Int32   mnStepCount;
-        AutoTimer   maWaitTimer;
-
-        DECL_LINK( TimeOutHdl, Throbber_Impl* );
-
-        vos::IMutex&    GetMutex() { return mrMutex; }
-
-    public:
-             Throbber_Impl( VCLXWindow& i_rParent );
-            ~Throbber_Impl();
-
-        // Properties
-        void            setStepTime( sal_Int32 nStepTime )  { mnStepTime = nStepTime; }
-        sal_Int32       getStepTime() const                 { return mnStepTime; }
-
-        void            setRepeat( sal_Bool bRepeat )       { mbRepeat = bRepeat; }
-        sal_Bool        getRepeat() const                   { return mbRepeat; }
-
-        Window const*   getWindow() const { return mrParent.GetWindow(); }
-              Window*   getWindow()       { return mrParent.GetWindow(); }
-
-        // XSimpleAnimation
-        void start();
-        void stop();
-        bool isRunning() const;
-        void setImageList( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& ImageList );
-
-        // Helpers
-        sal_Bool isHCMode();
-    };
-
-//........................................................................
-} // namespacetoolkit
-//........................................................................
-
-#endif //_TOOLKIT_HELPER_THROBBERIMPL_HXX_
-