CWS-TOOLING: integrate CWS mba30fixes02

18 files changed, 20 insertions, 650 deletions

diff --git a/framework/inc/classes/colorlistener.hxx b/framework/inc/classes/colorlistener.hxx
index c55a9710ada3..e69de29bb2d1 100644
--- a/framework/inc/classes/colorlistener.hxx
+++ b/framework/inc/classes/colorlistener.hxx
@@ -1,123 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * $RCSfile: colorlistener.hxx,v $
- * $Revision: 1.6 $
- *
- * 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 __FRAMEWORK_CLASSES_COLORLISTENER_HXX_
-#define __FRAMEWORK_CLASSES_COLORLISTENER_HXX_
-
-//__________________________________________
-// own includes
-
-#include <threadhelp/threadhelpbase.hxx>
-#include <macros/xinterface.hxx>
-#include <general.h>
-
-//__________________________________________
-// interface includes
-#include <com/sun/star/awt/XWindow.hpp>
-
-//__________________________________________
-// other includes
-#include <cppuhelper/weak.hxx>
-#include <svtools/colorcfg.hxx>
-#include <tools/link.hxx>
-
-//__________________________________________
-// definition
-
-namespace framework
-{
-
-//__________________________________________
-
-/** listen for color changes inside configuration.
-
-    This listener looks for color changes provided at the config item
-    "ColorConfig". All interested colors will be applied directly to a
-    given window set window member. Curren implementation support setting
-    of the background only.
-
-    @see    ::svtools::ColorConfig
- */
-
-class ColorListener : public  css::lang::XEventListener
-                    , private ThreadHelpBase // attention! Must be the first base class to guarentee right initialize lock ...
-                    , public  SfxListener
-                    , public  ::cppu::OWeakObject
-
-{
-    //______________________________________
-    // member
-
-    private:
-
-        /** points to the single config item, which provides the color-change notification. */
-        ::svtools::ColorConfig* m_pConfig;
-
-        /** reference to the window, on which we must set the changed color. */
-        css::uno::Reference< css::awt::XWindow > m_xWindow;
-
-        /** we must know, if we already registered as listener or not. */
-        sal_Bool m_bListen;
-
-        long m_nColor;
-
-    //______________________________________
-    // interface
-
-    public:
-
-        FWK_DECLARE_XINTERFACE
-
-         ColorListener( const css::uno::Reference< css::awt::XWindow >& xWindow );
-        ~ColorListener(                                                         );
-
-        // XEventListener
-        virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException);
-
-        // SfxListener
-        virtual void Notify( SfxBroadcaster& rBroadCaster, const SfxHint& rHint );
-
-        DECL_LINK( impl_SettingsChanged, void* );
-
-    //______________________________________
-    // helper
-
-    private:
-
-        void impl_applyColor    ( sal_Bool bInvalidate );
-        void impl_startListening();
-        void impl_stopListening ();
-        void impl_die           ();
-
-}; // class ColorListener
-
-} // namespace framework
-
-#endif // __FRAMEWORK_CLASSES_COLORLISTENER_HXX_
diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx
index 49f8e8fb82b1..fc4cca28f621 100644
--- a/framework/inc/classes/framecontainer.hxx
+++ b/framework/inc/classes/framecontainer.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: framecontainer.hxx,v $
- * $Revision: 1.18 $
+ * $Revision: 1.18.82.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -46,7 +46,6 @@
 #ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_
 #include <threadhelp/transactionbase.hxx>
 #endif
-#include <classes/targetfinder.hxx>
 #include <macros/debug.hxx>
 #include <general.h>
 
@@ -135,7 +134,6 @@ class FrameContainer : private ThreadHelpBase
 
         /// checks and free memory
         sal_Bool exist      ( const css::uno::Reference< css::frame::XFrame >& xFrame ) const;
-        sal_Bool hasElements(                                                         ) const;
         void     clear      (                                                         );
 
         /// deprecated IndexAccess!
@@ -144,12 +142,7 @@ class FrameContainer : private ThreadHelpBase
 
         /// replacement for deprectaed index access
         css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > getAllElements() const;
-        /// for special feature "async quit timer" of desktop only!
-        void enableQuitTimer ( const css::uno::Reference< css::frame::XDesktop >& xDesktop );
-        void disableQuitTimer();
-/*DEPRECATEME
-        DECL_LINK( implts_asyncQuit, void* );
-*/
+
         /// special helper for Frame::findFrame()
         css::uno::Reference< css::frame::XFrame > searchOnAllChildrens   ( const ::rtl::OUString& sName ) const;
         css::uno::Reference< css::frame::XFrame > searchOnDirectChildrens( const ::rtl::OUString& sName ) const;
diff --git a/framework/inc/classes/targetfinder.hxx b/framework/inc/classes/targetfinder.hxx
index 2bdaca9faf17..e69de29bb2d1 100644
--- a/framework/inc/classes/targetfinder.hxx
+++ b/framework/inc/classes/targetfinder.hxx
@@ -1,239 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * $RCSfile: targetfinder.hxx,v $
- * $Revision: 1.10 $
- *
- * 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 __FRAMEWORK_CLASSES_TARGETFINDER_HXX_
-#define __FRAMEWORK_CLASSES_TARGETFINDER_HXX_
-
-//_________________________________________________________________________________________________________________
-//  my own includes
-//_________________________________________________________________________________________________________________
-
-#include <macros/debug.hxx>
-#include <macros/generic.hxx>
-#include <targets.h>
-#include <general.h>
-
-//_________________________________________________________________________________________________________________
-//  interface includes
-//_________________________________________________________________________________________________________________
-#include <com/sun/star/frame/XFrame.hpp>
-
-//_________________________________________________________________________________________________________________
-//  other includes
-//_________________________________________________________________________________________________________________
-#include <rtl/ustring.hxx>
-
-//_________________________________________________________________________________________________________________
-//  const
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-//  namespace
-//_________________________________________________________________________________________________________________
-
-namespace framework{
-
-//_________________________________________________________________________________________________________________
-//  declarations
-//_________________________________________________________________________________________________________________
-
-/*-************************************************************************************************************//**
-    @short          We need some informations about our caller, With these enum he can specify his frame type ...
-                    (Frame/Desktop ...)
-*//*-*************************************************************************************************************/
-enum EFrameType
-{
-    E_UNKNOWNFRAME  ,
-    E_DESKTOP       ,
-    E_TASK          ,
-    E_FRAME
-};
-
-/*-************************************************************************************************************//**
-    @short          valid result values to classify targeting
-*//*-*************************************************************************************************************/
-enum ETargetClass
-{
-    //-------------------------------------------------------------------------------------------------------------
-    // useable by classifyFindFrame() and classifyQueryDispatch()
-    //-------------------------------------------------------------------------------------------------------------
-
-    E_UNKNOWN       ,   /// occure if you call us without valid flag combinations!
-    E_DEFAULT       ,   /// default handling for opening new documents
-    E_CREATETASK    ,   /// create new task (supported by desktop only!)
-    E_SELF          ,   /// you are the target himself
-    E_PARENT        ,   /// your parent is the target
-    E_BEAMER        ,   /// an existing beamer is the target (create new one if it not already exist!)
-    E_TASKS         ,   /// special (but exclusiv) search for tasks only (supported at desktop only - but can combined with CREATE!)
-    E_FORWARD_UP    ,   /// forward call to your parent
-    E_DEEP_DOWN     ,   /// search at your children (search children of direct children before another direcht children!)
-    E_FLAT_DOWN     ,   /// search at your children (search at all direct children first;  children of direcht children then!)
-    E_DEEP_BOTH     ,   /// combination of E_DEEP_DOWN and E_FORWARD_UP ( search down first!)
-    E_FLAT_BOTH     ,   /// combination of E_FLAT_DOWN and E_FORWARD_UP ( search down first!)
-
-    //-------------------------------------------------------------------------------------------------------------
-    // useable by classifyQueryDispatch() only
-    //-------------------------------------------------------------------------------------------------------------
-
-    E_MENUBAR       ,   /// a menu bar is supported by a task only and should be forwarded to her internal dispatch helper! (valid for classifyQueryDispatch() only!)
-    E_HELPAGENT         /// same like menu bar!
-};
-
-/*-************************************************************************************************************//**
-    @short          hold information about environment of frame, which use TargetFinder::classify...()
-    @descr          Follow TargetFinder::classify...() methods need some informations about the environment of
-                    a frame to specify search direction. Use methods of this TargetInfo to collect this informations
-                    and use it on classify...().
-
-    @implements     -
-    @base           -
-
-    @devstatus      ready to use
-    @threadsafe     not neccessary
-*//*-*************************************************************************************************************/
-struct TargetInfo
-{
-    //-------------------------------------------------------------------------------------------------------------
-    //  public methods
-    //-------------------------------------------------------------------------------------------------------------
-    public:
-                   TargetInfo  ( const css::uno::Reference< css::frame::XFrame >& xFrame     ,
-                                 const ::rtl::OUString&                           sTarget    ,
-                                       sal_Int32                                  nFlags     );
-
-                   TargetInfo  ( const ::rtl::OUString&                           sTarget    ,
-                                       sal_Int32                                  nFlags     ,
-                                       EFrameType                                 eType      ,
-                                       sal_Bool                                   bChildrens ,
-                                       sal_Bool                                   bParent    ,
-                                 const ::rtl::OUString&                           sFrame     ,
-                                 const ::rtl::OUString&                           sParent    );
-
-        static EFrameType getFrameType( const css::uno::Reference< css::frame::XFrame >& xFrame     );
-
-    //-------------------------------------------------------------------------------------------------------------
-    //  private methods
-    //-------------------------------------------------------------------------------------------------------------
-    private:
-        sal_Bool impl_getCreateFlag( sal_Int32 nSearchFlags );
-
-    //-------------------------------------------------------------------------------------------------------------
-    //  debug and test methods
-    //-------------------------------------------------------------------------------------------------------------
-    #ifdef ENABLE_ASSERTIONS
-    private:
-        static sal_Bool implcp_ctor        ( const css::uno::Reference< css::frame::XFrame >& xFrame     ,
-                                             const ::rtl::OUString&                           sTarget    ,
-                                                   sal_Int32                                  nFlags     );
-
-        static sal_Bool implcp_ctor        ( const ::rtl::OUString&                           sTarget    ,
-                                                   sal_Int32                                  nFlags     ,
-                                                   EFrameType                                 eType      ,
-                                                   sal_Bool                                   bChildrens ,
-                                                   sal_Bool                                   bParent    ,
-                                             const ::rtl::OUString&                           sFrame     ,
-                                             const ::rtl::OUString&                           sParent    );
-
-        static sal_Bool implcp_getFrameType( const css::uno::Reference< css::frame::XFrame >& xFrame     );
-    #endif
-
-    //-------------------------------------------------------------------------------------------------------------
-    //  public variables!
-    //  faster access for TargetFinder::classify...()
-    //-------------------------------------------------------------------------------------------------------------
-    public:
-        EFrameType         eFrameType        ;  /// your node type (desktop, task ,frame) Its neccessary to select right search algorithm.
-        ::rtl::OUString    sTargetName       ;  /// is the search parameter to find right frame by name or special value!
-        sal_Int32          nSearchFlags      ;  /// is an optional parameter to regulate search direction if no special target name was given.
-        sal_Bool           bChildrenExist    ;  /// Say us - if some children exist. Otherwise down search is ignored!
-        ::rtl::OUString    sFrameName        ;  /// If SELF flag is set we can break search earlier if this name is the target!
-        sal_Bool           bParentExist      ;  /// Say us - if a parent exist. Otherwise upper search is ignored!
-        ::rtl::OUString    sParentName       ;  /// If PARENT flag is set we can break search earlier if this name is the target!
-        sal_Bool           bCreationAllowed  ;  /// we set it TRUE if flag CREATE is set. You must search for given target, but could create a new tree node if search will fail!
-
-};  // struct TargetInfo
-
-/*-************************************************************************************************************//**
-    @short          implement helper to implement code for targeting only one time!
-    @descr          We need checking of a target name in combination with given search flags at differnt places.
-                    These helper analyze the parameter and recommend the direction for searching.
-                    We can use a method to classify search direction and another one to change our search parameter
-                    to make it right. You can use these - but you don't must do it!
-
-    @implements     -
-    @base           -
-
-    @devstatus      ready to use
-    @threadsafe     not neccessary
-*//*-*************************************************************************************************************/
-class TargetFinder
-{
-    //-------------------------------------------------------------------------------------------------------------
-    //  public methods
-    //-------------------------------------------------------------------------------------------------------------
-    public:
-        static ETargetClass classifyFindFrame    ( TargetInfo& aInfo );
-        static ETargetClass classifyQueryDispatch( TargetInfo& aInfo );
-
-    //-------------------------------------------------------------------------------------------------------------
-    //  private methods
-    //-------------------------------------------------------------------------------------------------------------
-    private:
-        static ETargetClass impl_classifyForDesktop_findFrame         (         sal_Bool            bParentExist        ,
-                                                                        const   ::rtl::OUString&    sTargetName         ,
-                                                                                sal_Int32           nSearchFlags        );
-
-        static ETargetClass impl_classifyForTask_findFrame            (         sal_Bool            bParentExist        ,
-                                                                                sal_Bool            bChildrenExist      ,
-                                                                        const   ::rtl::OUString&    sFrameName          ,
-                                                                        const   ::rtl::OUString&    sTargetName         ,
-                                                                                sal_Int32           nSearchFlags        );
-
-        static ETargetClass impl_classifyForFrame_findFrame           (         sal_Bool            bParentExist        ,
-                                                                                sal_Bool            bChildrenExist      ,
-                                                                        const   ::rtl::OUString&    sFrameName          ,
-                                                                        const   ::rtl::OUString&    sParentName         ,
-                                                                        const   ::rtl::OUString&    sTargetName         ,
-                                                                                sal_Int32           nSearchFlags        );
-
-    //-------------------------------------------------------------------------------------------------------------
-    //  debug and test methods
-    //-------------------------------------------------------------------------------------------------------------
-    #ifdef ENABLE_ASSERTIONS
-    private:
-        static sal_Bool implcp_classifyFindFrame    ( const TargetInfo& aInfo );
-        static sal_Bool implcp_classifyQueryDispatch( const TargetInfo& aInfo );
-    #endif
-
-};      //  class TargetFinder
-
-}       //  namespace framework
-
-#endif  //  #ifndef __FRAMEWORK_CLASSES_TARGETFINDER_HXX_
diff --git a/framework/inc/commands.h b/framework/inc/commands.h
index 4d8ea7b0a52a..662f1717aec4 100644
--- a/framework/inc/commands.h
+++ b/framework/inc/commands.h
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: commands.h,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.82.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -54,34 +54,6 @@ namespace framework{
 #define COMMAND_HEADLESS  DECLARE_ASCII("-headless"   ) /// office runs in headless mode for scripting
 #define COMMAND_INVISIBLE DECLARE_ASCII("-invisible"  ) /// office runs in invisible mode which supress splash screen and first empry document
 #define COMMAND_SERVER    DECLARE_ASCII("-server"     ) /// office runs as server
-
-/*-************************************************************************************************************//**
-    @short          This method parse command line of office and search for any argument.
-                    We return true/false for existing/non existing values.
-*//*-*************************************************************************************************************/
-
-sal_Bool c_existCommand( const ::rtl::OUString& sSearchCommand )
-{
-    // Set default return value if search failed or unknown commands are searched.
-    sal_Bool            bState          = sal_False                         ;
-    ::vos::OStartupInfo aCommandLine                                        ;
-    sal_uInt32          nCount          = aCommandLine.getCommandArgCount() ;
-    ::rtl::OUString     sCommand                                            ;
-    for( sal_uInt32 nCommand=0; nCommand<nCount; ++nCommand )
-    {
-        if( aCommandLine.getCommandArg( nCommand, sCommand ) == ::vos::OStartupInfo::E_None )
-        {
-            if( sCommand == sSearchCommand )
-            {
-                bState = sal_True;
-                break;
-            }
-        }
-    }
-
-    return bState;
-}
-
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_TARGETS_H_
diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx
index c4ecdea3a9f7..3f52e952c825 100644
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: menudispatcher.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.82.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -271,23 +271,6 @@ class MenuDispatcher   :   // interfaces
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        void impl_sendStatusEvent(  const   css::uno::Reference< XFRAME >&  xEventSource    ,
-                                    const   ::rtl::OUString&        sURL            ,
-                                            sal_Bool                bLoadState      );
-
-
-        /*-****************************************************************************************************//**
-            @short      -
-            @descr      -
-
-            @seealso    -
-
-            @param      -
-            @return     -
-
-            @onerror    -
-        *//*-*****************************************************************************************************/
-
         sal_Bool impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromResource = sal_False );
 
         /*-****************************************************************************************************//**
diff --git a/framework/inc/helper/timerhelper.hxx b/framework/inc/helper/timerhelper.hxx
index 4ca047e1f2d3..7681c352f288 100644
--- a/framework/inc/helper/timerhelper.hxx
+++ b/framework/inc/helper/timerhelper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: timerhelper.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.82.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -48,29 +48,6 @@ namespace framework
     public:
         virtual void    timerExpired() = 0;
     };
-
-    //====================================================================
-    //= OTimerHelper
-    //====================================================================
-    /** implements a timer
-    */
-    class OTimerHelper : private ThreadHelpBase
-                       , public ::vos::OTimer
-    {
-    protected:
-        ITimerListener* m_pListener;
-
-    public:
-        OTimerHelper( const ::vos::TTimeValue& _rExpireTime );
-
-        // the link set here will be called with m_rMutex acquired
-        void            setListener( ITimerListener* _pListener )       { m_pListener = _pListener; }
-        ITimerListener* getListener(                            ) const { return m_pListener;       }
-
-    protected:
-        virtual void SAL_CALL onShot();
-    };
-
 //........................................................................
 }   // namespace framework
 //........................................................................
diff --git a/framework/inc/interaction/restricteduiinteraction.hxx b/framework/inc/interaction/restricteduiinteraction.hxx
index 8f37ee8c22f1..e69de29bb2d1 100644
--- a/framework/inc/interaction/restricteduiinteraction.hxx
+++ b/framework/inc/interaction/restricteduiinteraction.hxx
@@ -1,180 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * $RCSfile: restricteduiinteraction.hxx,v $
- * $Revision: 1.4 $
- *
- * 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 __FRAMEWORK_INTERACTION_RESTRICTEDUIINTERACTION_HXX_
-#define __FRAMEWORK_INTERACTION_RESTRICTEDUIINTERACTION_HXX_
-
-//_________________________________________________________________________________________________________________
-//  my own includes
-//_________________________________________________________________________________________________________________
-
-#include <threadhelp/threadhelpbase.hxx>
-#include <macros/xinterface.hxx>
-#include <macros/xtypeprovider.hxx>
-#include <general.h>
-#include <loadstate.h>
-
-//_________________________________________________________________________________________________________________
-//  interface includes
-//_________________________________________________________________________________________________________________
-#include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/task/XInteractionRequest.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
-//_________________________________________________________________________________________________________________
-//  other includes
-//_________________________________________________________________________________________________________________
-#include <cppuhelper/weak.hxx>
-
-//_________________________________________________________________________________________________________________
-//  namespace
-//_________________________________________________________________________________________________________________
-
-namespace framework{
-
-//_________________________________________________________________________________________________________________
-//  exported const
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-//  exported definitions
-//_________________________________________________________________________________________________________________
-
-/**
-    @short      handle interactions visible ... but ignore some of them
-    @descr      Sometimes it's neccessary to use a visible interaction handler,
-                which ignore some of all possible ones. So for example requests for
-                missing password or ambigous filter must be solved by the real UI user.
-                So we have to show dialogs. But some interactions are showing of message
-                boxes only. They doesn't help to solve a problem. They inform the user only.
-                But such things can be done by the code, which uses this interaction handler too.
-                So we collect this informations only and break the outside process.
-
-    @modified   12.08.2002 08:11
-    @by         Andreas Schl�ns
- */
-class RestrictedUIInteraction : public  css::lang::XTypeProvider
-                              , public  css::task::XInteractionHandler
-                              , private ThreadHelpBase
-                              , public  ::cppu::OWeakObject
-{
-    //_____________________________________
-    // member
-    private:
-
-        /// in case an unknown interaction was aborted - we save it for our external user!
-        css::uno::Any m_aRequest;
-        /// some interaction has to be forwarded to a generic UI interaction handler implementation
-        css::uno::Reference< css::task::XInteractionHandler > m_xGenericUIHandler;
-        /// for some interactions which supports a non visible retry, we must kn ow, how often they was handled before
-        sal_Int32 m_nIORetry;
-        sal_Int32 m_nNetworkRetry;
-        sal_Int32 m_nChaosRetry;
-        sal_Int32 m_nWrongMediumRetry;
-        sal_Int32 m_nWrongJavaVersionRetry;
-        sal_Int32 m_nBadPartnershipRetry;
-        /// for retries we must know, when we have to stop it
-        sal_Int32 m_nMaxRetry;
-
-    //_____________________________________
-    // uno interface
-    public:
-
-        // XInterface, XTypeProvider
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
-
-        //_________________________________
-        /**
-            @interface  XInteractionHandler
-            @short      called from outside to handle a problem
-            @descr      We filter the incoming interactions. some of them
-                        will be forwarded to the generic UI interaction handler.
-                        So we must not implement it twice. Some other ones
-                        will be aborted only.
-
-            @threadsafe yes
-        */
-        virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) throw( css::uno::RuntimeException );
-
-    //_____________________________________
-    // c++ interface
-    public:
-
-        //_________________________________
-        /**
-            @short      ctor to guarantee right initialized instances of this class
-            @descr      It uses the given uno service manager to create the global
-                        generic UI interaction handler for later internal using.
-
-            @param      xSMGR
-                            uno service manager for creating services internaly
-
-            @threadsafe not neccessary
-        */
-        RestrictedUIInteraction( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR        ,
-                                       sal_Int32                                               nMaxRetry = 2);
-
-        //_________________________________
-        /**
-            @short      return the handled interaction request
-            @descr      We save the last getted interaction request internaly.
-                        May the outside user of this class is interessted
-                        on that. Especialy we gotted an unknown interaction
-                        and aborted it hard.
-
-                        We save only the last one - because only this interaction can
-                        have breaked the operation. All possible ones before was solved.
-
-            @return     [com.sun.star.uno.Any]
-                            the packed interaction request
-                            Can be empty if no interaction was used!
-
-            @threadsafe yes
-        */
-        css::uno::Any getRequest() const;
-
-        //_________________________________
-        /**
-            @short      returns information if interaction was used
-            @descr      It can be usefully to know the reason for a failed operation.
-
-            @return     [boolean]
-                            <TRUE/> for used interaction
-                            <FALSE/> otherwhise
-
-            @threadsafe yes
-        */
-        sal_Bool wasUsed() const;
-};
-
-} // namespace framework
-
-#endif // #ifndef __FRAMEWORK_INTERACTION_RESTRICTEDUIINTERACTION_HXX_
diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx
index 46be30efbe74..1a640a3fe840 100644
--- a/framework/inc/jobs/job.hxx
+++ b/framework/inc/jobs/job.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: job.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.82.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -208,8 +208,6 @@ class Job : public  css::lang::XTypeProvider
         void     setDispatchResultFake( const css::uno::Reference< css::frame::XDispatchResultListener >& xListener    ,
                                         const css::uno::Reference< css::uno::XInterface >&                xSourceFake  );
         void     setJobData           ( const JobData&                                                    aData        );
-        JobData  getJobData           (                                                                                );
-        JobData& getJobDataRef        (                                                                                );
         void     execute              ( const css::uno::Sequence< css::beans::NamedValue >&               lDynamicArgs );
         void     die                  (                                                                                );
 
diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx
index 13188f08920a..e4bb10cd758d 100644
--- a/framework/inc/jobs/jobdata.hxx
+++ b/framework/inc/jobs/jobdata.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: jobdata.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.82.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -252,12 +252,10 @@ class JobData : private ThreadHelpBase
         EMode                                        getMode                 () const;
         EEnvironment                                 getEnvironment          () const;
         ::rtl::OUString                              getEnvironmentDescriptor() const;
-        ::rtl::OUString                              getAlias                () const;
         ::rtl::OUString                              getService              () const;
         ::rtl::OUString                              getEvent                () const;
         css::uno::Sequence< css::beans::NamedValue > getConfig               () const;
         css::uno::Sequence< css::beans::NamedValue > getJobConfig            () const;
-        JobResult                                    getResult               () const;
 
         sal_Bool                                     hasConfig               () const;
 
diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx
index e5a74b1c5a4a..da0a97e3f465 100644
--- a/framework/inc/jobs/jobresult.hxx
+++ b/framework/inc/jobs/jobresult.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: jobresult.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.82.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -142,7 +142,6 @@ class JobResult : private ThreadHelpBase
 
         sal_Bool                                     existPart        ( sal_uInt32 eParts ) const;
         css::uno::Sequence< css::beans::NamedValue > getArguments     (                   ) const;
-        sal_Bool                                     getDeactivate    (                   ) const;
         css::frame::DispatchResultEvent              getDispatchResult(                   ) const;
 };
 
diff --git a/framework/inc/jobs/joburl.hxx b/framework/inc/jobs/joburl.hxx
index dc2e567f7858..e6bea5fe5e51 100644
--- a/framework/inc/jobs/joburl.hxx
+++ b/framework/inc/jobs/joburl.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: joburl.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.82.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -137,9 +137,6 @@ class JobURL : private ThreadHelpBase
         sal_Bool getEvent      (       ::rtl::OUString& sEvent       ) const;
         sal_Bool getAlias      (       ::rtl::OUString& sAlias       ) const;
         sal_Bool getService    (       ::rtl::OUString& sService     ) const;
-        sal_Bool getEventArgs  (       ::rtl::OUString& sEventArgs   ) const;
-        sal_Bool getAliasArgs  (       ::rtl::OUString& sAliasArgs   ) const;
-        sal_Bool getServiceArgs(       ::rtl::OUString& sServiceArgs ) const;
 
     //___________________________________
     // private helper
@@ -171,6 +168,10 @@ class JobURL : private ThreadHelpBase
                                       const sal_Char*  pExpectedServiceArgs );
         ::rtl::OUString impldbg_toString() const;
 
+        sal_Bool getServiceArgs(       ::rtl::OUString& sServiceArgs ) const;
+        sal_Bool getEventArgs  (       ::rtl::OUString& sEventArgs   ) const;
+        sal_Bool getAliasArgs  (       ::rtl::OUString& sAliasArgs   ) const;
+
     #endif // ENABLE_COMPONENT_SELF_CHECK
 };
 
diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx
index 93c6d4656035..7c48e44693eb 100644
--- a/framework/inc/services/frame.hxx
+++ b/framework/inc/services/frame.hxx
@@ -8,7 +8,7 @@
  *
  * $RCSfile: frame.hxx,v $
  *
- * $Revision: 1.41 $
+ * $Revision: 1.41.82.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -355,8 +355,6 @@ class Frame :   // interfaces
         // threadsafe
         void                                                    implts_sendFrameActionEvent     ( const css::frame::FrameAction&                        aAction          );
         void                                                    implts_resizeComponentWindow    (                                                                        );
-        void                                                    implts_setTitleOnWindow         ( const ::rtl::OUString&                                sTitle           );
-        const ::rtl::OUString                                   implts_getTitleFromWindow       (                                                                        ) const;
         void                                                    implts_setIconOnWindow          (                                                                        );
         void                                                    implts_startWindowListening     (                                                                        );
         void                                                    implts_stopWindowListening      (                                                                        );
diff --git a/framework/inc/uiconfiguration/graphicnameaccess.hxx b/framework/inc/uiconfiguration/graphicnameaccess.hxx
index 39fd2420321b..c90022bd9fab 100644
--- a/framework/inc/uiconfiguration/graphicnameaccess.hxx
+++ b/framework/inc/uiconfiguration/graphicnameaccess.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: graphicnameaccess.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.82.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -51,7 +51,6 @@ namespace framework
             virtual ~GraphicNameAccess();
 
             void addElement( const rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rElement );
-            sal_uInt32 size() const;
 
             // XNameAccess
             virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName )
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx
index 215a1f470358..e2a23a343455 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: imagemanager.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.82.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -125,7 +125,6 @@ namespace framework
 
             // Non-UNO methods
             void setStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage ) throw (::com::sun::star::uno::RuntimeException);
-            sal_Bool hasStorage() throw (::com::sun::star::uno::RuntimeException);
 
         private:
             typedef std::hash_map< rtl::OUString,
diff --git a/framework/inc/uielement/logoimagestatusbarcontroller.hxx b/framework/inc/uielement/logoimagestatusbarcontroller.hxx
index 146323b7ff2f..33b9b724c779 100644
--- a/framework/inc/uielement/logoimagestatusbarcontroller.hxx
+++ b/framework/inc/uielement/logoimagestatusbarcontroller.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: logoimagestatusbarcontroller.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.82.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -45,7 +45,6 @@ namespace framework
 class LogoImageStatusbarController : public svt::StatusbarController
 {
     public:
-        LogoImageStatusbarController();
         LogoImageStatusbarController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
         virtual ~LogoImageStatusbarController();
 
diff --git a/framework/inc/uielement/logotextstatusbarcontroller.hxx b/framework/inc/uielement/logotextstatusbarcontroller.hxx
index 5b9021ce39c7..41f5cf56140d 100644
--- a/framework/inc/uielement/logotextstatusbarcontroller.hxx
+++ b/framework/inc/uielement/logotextstatusbarcontroller.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: logotextstatusbarcontroller.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.82.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -45,7 +45,6 @@ namespace framework
 class LogoTextStatusbarController : public svt::StatusbarController
 {
     public:
-        LogoTextStatusbarController();
         LogoTextStatusbarController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
         virtual ~LogoTextStatusbarController();
 
diff --git a/framework/inc/uielement/simpletextstatusbarcontroller.hxx b/framework/inc/uielement/simpletextstatusbarcontroller.hxx
index a27eda3e568f..8dc3453a4b9a 100644
--- a/framework/inc/uielement/simpletextstatusbarcontroller.hxx
+++ b/framework/inc/uielement/simpletextstatusbarcontroller.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: simpletextstatusbarcontroller.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.82.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -47,7 +47,6 @@ namespace framework
 class SimpleTextStatusbarController : public svt::StatusbarController
 {
     public:
-        SimpleTextStatusbarController();
         SimpleTextStatusbarController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
         virtual ~SimpleTextStatusbarController();
 
diff --git a/framework/inc/uielement/statusbarwrapper.hxx b/framework/inc/uielement/statusbarwrapper.hxx
index 8ae85c9fa978..a5baabee9f6e 100644
--- a/framework/inc/uielement/statusbarwrapper.hxx
+++ b/framework/inc/uielement/statusbarwrapper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: statusbarwrapper.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.82.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -59,8 +59,6 @@ class StatusBarWrapper : public UIConfigElementWrapperBase
             const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
         virtual ~StatusBarWrapper();
 
-        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory();
-
         // XComponent
         virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException);