diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-10-14 05:23:43 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-10-14 05:23:43 +0000 |
| commit | 7bf29c44efa5985f59c160ba5a75dc212f955d42 (patch) | |
| tree | 8cd9404e8ac9ba3268061278dc1ef215f631b4c9 | |
| parent | a3458db24dc4688fcca14242917ec3bd62a6adcb (diff) | |
CWS-TOOLING: integrate CWS mba30fixes02
81 files changed, 176 insertions, 4227 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 00f0e91d4875..df875df23ad6 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: app.hxx,v $ - * $Revision: 1.37 $ + * $Revision: 1.37.14.1 $ * * This file is part of OpenOffice.org. * @@ -60,7 +60,6 @@ namespace desktop /*-------------------------------------------------------------------- Description: Application-class --------------------------------------------------------------------*/ -class IntroWindow_Impl; class CommandLineArgs; class Lockfile; class AcceptorMap : public std::map< OUString, Reference<XInitialization> > {}; diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index cb2a32ee0d4c..a27a7d67b92c 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: app.cxx,v $ - * $Revision: 1.224 $ + * $Revision: 1.224.14.1 $ * * This file is part of OpenOffice.org. * @@ -36,7 +36,6 @@ #include "app.hxx" #include "desktop.hrc" #include "appinit.hxx" -#include "intro.hxx" #include "officeipcthread.hxx" #include "cmdlineargs.hxx" #include "desktopresid.hxx" diff --git a/desktop/source/app/intro.cxx b/desktop/source/app/intro.cxx index 9b52f1101c42..e69de29bb2d1 100644 --- a/desktop/source/app/intro.cxx +++ b/desktop/source/app/intro.cxx @@ -1,119 +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: intro.cxx,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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_desktop.hxx" - - -#include "intro.hxx" - -#include <tools/stream.hxx> -#include <tools/urlobj.hxx> -#include <vos/process.hxx> -#include <rtl/logfile.hxx> -#include <vcl/svapp.hxx> - -namespace desktop -{ - -// ----------------------------------------------------------------------- - -void IntroWindow_Impl::Init() -{ - RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::IntroWindow_Impl::Init" ); - - Size aSize = m_aIntroBmp.GetSizePixel(); - SetOutputSizePixel( aSize ); - - if ( GetColorCount() >= 16 ) - { - Show(); - Update(); - } -} - -// ----------------------------------------------------------------------- - -IMPL_LINK( IntroWindow_Impl, AppEventListenerHdl, VclWindowEvent *, inEvent ) -{ - if ( inEvent != 0 ) - { - switch ( inEvent->GetId() ) - { - case VCLEVENT_WINDOW_HIDE: - Paint( Rectangle() ); - break; - - default: - break; - } - } - return 0; -} - -// ----------------------------------------------------------------------- - -IntroWindow_Impl::IntroWindow_Impl( const Bitmap& aIntroBitmap ) : - IntroWindow(), - m_aIntroBmp( aIntroBitmap ) -{ - RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::IntroWindow_Impl::IntroWindowImpl" ); - - Hide(); - - Init(); - Application::AddEventListener( - LINK( this, IntroWindow_Impl, AppEventListenerHdl ) ); -} - -// ----------------------------------------------------------------------- - -IntroWindow_Impl::~IntroWindow_Impl() -{ - Application::RemoveEventListener( - LINK( this, IntroWindow_Impl, AppEventListenerHdl ) ); - Hide(); -} - -// ----------------------------------------------------------------------- - -void IntroWindow_Impl::Paint( const Rectangle& ) -{ - DrawBitmap( Point(), m_aIntroBmp ); - Flush(); -} - -// ----------------------------------------------------------------------- - -void IntroWindow_Impl::Slide() -{ -} - -} diff --git a/desktop/source/app/intro.hxx b/desktop/source/app/intro.hxx index 793c85c983b1..e69de29bb2d1 100644 --- a/desktop/source/app/intro.hxx +++ b/desktop/source/app/intro.hxx @@ -1,63 +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: intro.hxx,v $ - * $Revision: 1.7 $ - * - * 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 _DESKTOP_INTRO_HXX -#define _DESKTOP_INTRO_HXX - -// include --------------------------------------------------------------- - -#ifndef _SV_WRKWIN_HXX -#include <vcl/introwin.hxx> -#endif -#include <vcl/bitmap.hxx> - -// class IntroWindow_Impl ------------------------------------------------ -namespace desktop -{ - -class IntroWindow_Impl : public IntroWindow -{ -private: - Bitmap m_aIntroBmp; - - void Init(); - DECL_LINK( AppEventListenerHdl, VclWindowEvent * ); - -public: - IntroWindow_Impl( const Bitmap& aInfoBitmap ); - ~IntroWindow_Impl(); - - virtual void Paint( const Rectangle& ); - - void Slide(); -}; - -} - -#endif // #ifndef _DESKTOP_INTRO_HXX diff --git a/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk index d9923dff0a8f..7ae735148e5c 100644 --- a/desktop/source/app/makefile.mk +++ b/desktop/source/app/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.42 $ +# $Revision: 1.42.40.1 $ # # This file is part of OpenOffice.org. # @@ -54,14 +54,11 @@ SHL1OBJS = \ $(SLO)$/desktopcontext.obj \ $(SLO)$/desktopresid.obj \ $(SLO)$/dispatchwatcher.obj \ - $(SLO)$/intro.obj \ $(SLO)$/langselect.obj \ $(SLO)$/lockfile.obj \ $(SLO)$/lockfile2.obj \ $(SLO)$/migration.obj \ $(SLO)$/officeipcthread.obj \ - $(SLO)$/oinstanceprovider.obj \ - $(SLO)$/opluginframefactory.obj \ $(SLO)$/pages.obj \ $(SLO)$/sofficemain.obj \ $(SLO)$/userinstall.obj \ diff --git a/desktop/source/app/oinstanceprovider.cxx b/desktop/source/app/oinstanceprovider.cxx index 96c72bb62a40..e69de29bb2d1 100644 --- a/desktop/source/app/oinstanceprovider.cxx +++ b/desktop/source/app/oinstanceprovider.cxx @@ -1,200 +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: oinstanceprovider.cxx,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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_desktop.hxx" - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - -#include "oinstanceprovider.hxx" -#include "opluginframefactory.hxx" - -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ -#include <comphelper/processfactory.hxx> - -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ -#include <osl/diagnose.h> - -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - -using namespace ::osl ; -using namespace ::rtl ; -using namespace ::cppu ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::bridge ; -using namespace ::com::sun::star::container ; - -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ -#define INSTANCENAME_PLUGINFACTORY OUString(RTL_CONSTASCII_USTRINGPARAM("PluginFactory")) -#define INSTANCENAME_PLUGINFACTORY_SERVICEMANAGER OUString(RTL_CONSTASCII_USTRINGPARAM("ServiceManager")) - -//_________________________________________________________________________________________________________________ -// non exported definitions -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - -//***************************************************************************************************************** -// constructor -//***************************************************************************************************************** -OInstanceProvider::OInstanceProvider( const Reference< XMultiServiceFactory >& xFactory ) - // Init baseclasses first - // Attention: - // Don't change order of initialization! - // OMutexMember is a struct with a mutex as member. We can't use a mutex as member directly, while - // we must garant right initialization and a valid value of this! First initialize - // baseclasses and then members. And we need the mutex for other baseclasses !!! - : OMutexMember( ) - , OWeakObject ( ) - // Init member - , m_xFactory ( xFactory ) -{ -} - -//***************************************************************************************************************** -// destructor (protected!) -//***************************************************************************************************************** -OInstanceProvider::~OInstanceProvider() -{ -} - -//***************************************************************************************************************** -// XInterface -//***************************************************************************************************************** - -void SAL_CALL OInstanceProvider::acquire() throw() -{ OWeakObject::acquire(); } - -void SAL_CALL OInstanceProvider::release() throw() -{ OWeakObject::release(); } - -Any SAL_CALL OInstanceProvider::queryInterface( const Type& aType ) throw( RuntimeException ) -{ - Any aReturn ( ::cppu::queryInterface( aType, static_cast< XInstanceProvider* >( this ) ) ); - if ( aReturn.hasValue() == sal_False ) - { - aReturn = OWeakObject::queryInterface( aType ); - } - return aReturn; -} - -//***************************************************************************************************************** -// XInstanceProvider -//***************************************************************************************************************** -Reference< XInterface > SAL_CALL OInstanceProvider::getInstance( const OUString& sInstanceName ) throw( NoSuchElementException , - RuntimeException ) -{ - // Ready for multithreading - MutexGuard aGuard( m_aMutex ); - - // Safe impossible cases - // This method is not defined for all incoming parameter. - OSL_ENSURE( impldbg_checkParameter_getInstance( sInstanceName ), "OInstanceProvider::getInstance()\nInvalid parameter detected.\n" ); - - // Set default return value - Reference< XInterface > xReturn; - - // Attention: The created factories are helper services and not registered in registry! - // We cant' instanciate it as service; we must do it dynamicly. - - // If a correct name for factory was given ... - if ( sInstanceName == INSTANCENAME_PLUGINFACTORY ) - { - // ... create this searched factory and set it for return. - OPlugInFrameFactory* pPlugInFactory = new OPlugInFrameFactory( m_xFactory ); - xReturn = Reference< XInterface >( (OWeakObject*)pPlugInFactory, UNO_QUERY ); - // Safe impossible cases! - // This operation can't failed. - OSL_ENSURE( !(xReturn.is()==sal_False), "OInstanceProvider::getInstance()\nCreation of PlugInFactory failed!\n" ); - } - else if (sInstanceName == INSTANCENAME_PLUGINFACTORY_SERVICEMANAGER) - { - xReturn = Reference< XInterface >( ::comphelper::getProcessServiceFactory(), UNO_QUERY ); - } - else - { - // If an unknown name was given, we throw an exception! - NoSuchElementException aTmpException; - throw( aTmpException ); - } - - // Return result of this operation. - return xReturn; -} - -//_________________________________________________________________________________________________________________ -// debug methods -//_________________________________________________________________________________________________________________ - -/*----------------------------------------------------------------------------------------------------------------- - The follow methods checks the parameter for other functions. If a parameter or his value is non valid, - we return "sal_False". (else sal_True) This mechanism is used to throw an ASSERT! - - ATTENTION - - If you miss a test for one of this parameters, contact the autor or add it himself !(?) - But ... look for right testing! See using of this methods! ------------------------------------------------------------------------------------------------------------------*/ - -#if OSL_DEBUG_LEVEL > 0 - -//***************************************************************************************************************** -sal_Bool OInstanceProvider::impldbg_checkParameter_getInstance( const OUString& sInstanceName ) -{ - // Set default return value. - sal_Bool bOK = sal_True; - // Check parameter. - if ( - ( &sInstanceName == NULL ) || - ( - ( sInstanceName != INSTANCENAME_PLUGINFACTORY && sInstanceName != INSTANCENAME_PLUGINFACTORY_SERVICEMANAGER ) - ) - ) - { - bOK = sal_False ; - } - // Return result of check. - return bOK ; -} - -#endif // #ifdef OSL_DEBUG_LEVEL diff --git a/desktop/source/app/oinstanceprovider.hxx b/desktop/source/app/oinstanceprovider.hxx index 4d2358f5ef18..e69de29bb2d1 100644 --- a/desktop/source/app/oinstanceprovider.hxx +++ b/desktop/source/app/oinstanceprovider.hxx @@ -1,212 +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: oinstanceprovider.hxx,v $ - * $Revision: 1.5 $ - * - * 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 __SFX_OINSTANCEPROVIDER_HXX_ -#define __SFX_OINSTANCEPROVIDER_HXX_ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - -#include "omutexmember.hxx" - -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ -#include <com/sun/star/bridge/XInstanceProvider.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/container/NoSuchElementException.hpp> - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ -#include <cppuhelper/weak.hxx> - -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - -#define XINSTANCEPROVIDER ::com::sun::star::bridge::XInstanceProvider -#define OWEAKOBJECT ::cppu::OWeakObject -#define NOSUCHELEMENTEXCEPTION ::com::sun::star::container::NoSuchElementException -#define XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory -#define REFERENCE ::com::sun::star::uno::Reference -#define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException -#define ANY ::com::sun::star::uno::Any -#define UNOTYPE ::com::sun::star::uno::Type -#define XINTERFACE ::com::sun::star::uno::XInterface -#define OUSTRING ::rtl::OUString - -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - -/*-************************************************************************************************************//** - @short create factories corresponding to special name - @descr If you need a factory for creation of other factories (zB. neccessary for bridges) you can use - these implementation. You will give us a factory name and we will give you these factory (if it exist). - - @implements XInterface - XInstanceProvider - [ XDebugging if ENABLE_SERVICEDEBUG is defined! ] - @base OMutexMember - OWeakObject - - @devstatus deprecated -*//*-*************************************************************************************************************/ - -class OInstanceProvider : public XINSTANCEPROVIDER , - public OMutexMember , // Order of baseclasses is important for right initialization! - public OWEAKOBJECT -{ - //------------------------------------------------------------------------------------------------------------- - // public methods - //------------------------------------------------------------------------------------------------------------- - - public: - - //--------------------------------------------------------------------------------------------------------- - // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - - /*-****************************************************************************************************//** - @short standard ctor - @descr These initialize a new instance of ths class with needed informations for work. - - @seealso using at owner - - @param - - @return - - - @onerror - - *//*-*****************************************************************************************************/ - - OInstanceProvider( const REFERENCE< XMULTISERVICEFACTORY >& xFactory ); - - //--------------------------------------------------------------------------------------------------------- - // XInterface - //--------------------------------------------------------------------------------------------------------- - - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); - virtual ANY SAL_CALL queryInterface( const UNOTYPE& aType ) throw( RUNTIMEEXCEPTION ); - - //--------------------------------------------------------------------------------------------------------- - // XInstanceProvider - //--------------------------------------------------------------------------------------------------------- - - /*-****************************************************************************************************//** - @short return reference to a factory for specified instance - @descr These object is a selector for different factories. You will give me a factory name - - and I will give you a reference to the right factory object (if any exist!). - - @seealso - - - @param "sInstanceName", name of searched factory. - @return A reference to corresponding factory. - - @onerror A null reference is returned. - *//*-*****************************************************************************************************/ - - virtual REFERENCE< XINTERFACE > SAL_CALL getInstance( const OUSTRING& sInstanceName ) throw( NOSUCHELEMENTEXCEPTION , - RUNTIMEEXCEPTION ); - - //------------------------------------------------------------------------------------------------------------- - // protected methods - //------------------------------------------------------------------------------------------------------------- - - protected: - - /*-****************************************************************************************************//** - @short standard destructor - @descr This method destruct an instance of this class and clear some member. - This method is protected, because its not allowed to use an instance of this class as a member! - You MUST use a pointer. - - @seealso - - - @param - - @return - - - @onerror - - *//*-*****************************************************************************************************/ - - virtual ~OInstanceProvider(); - - //------------------------------------------------------------------------------------------------------------- - // private methods - //------------------------------------------------------------------------------------------------------------- - - private: - - //------------------------------------------------------------------------------------------------------------- - // debug methods - // (should be private everyway!) - //------------------------------------------------------------------------------------------------------------- - - /*-****************************************************************************************************//** - @short debug-method to check incoming parameter of some other mehods of this class - @descr The following methods are used to check parameters for other methods - of this class. The return value is used directly for an ASSERT(...). - - @seealso ASSERTs in implementation! - - @param references to checking variables - @return sal_False on invalid parameter<BR> - sal_True otherway - - @onerror - - *//*-*****************************************************************************************************/ - - #if OSL_DEBUG_LEVEL > 0 - - private: - - sal_Bool impldbg_checkParameter_getInstance( const OUSTRING& sInstanceName ); - - #endif // #ifdef OSL_DEBUG_LEVEL - - //------------------------------------------------------------------------------------------------------------- - // variables - // (should be private everyway!) - //------------------------------------------------------------------------------------------------------------- - - private: - - REFERENCE< XMULTISERVICEFACTORY > m_xFactory ; - -}; // class OInstanceProvider - -#endif // #ifndef __SFX_OINSTANCEPROVIDER_HXX_ diff --git a/desktop/source/app/opluginframefactory.cxx b/desktop/source/app/opluginframefactory.cxx index 49c2382e2e08..e69de29bb2d1 100644 --- a/desktop/source/app/opluginframefactory.cxx +++ b/desktop/source/app/opluginframefactory.cxx @@ -1,203 +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: opluginframefactory.cxx,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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_desktop.hxx" - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - -#include "opluginframefactory.hxx" - -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ -#include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/frame/XFrame.hpp> - -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ -#include <osl/diagnose.h> - -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - -using namespace ::osl ; -using namespace ::rtl ; -using namespace ::cppu ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::frame ; - -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ -#define SERVICENAME_DESKTOP OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop" )) -#define SERVICENAME_PLUGINFRAME OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.Plugin" )) - -//_________________________________________________________________________________________________________________ -// non exported definitions -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - -//***************************************************************************************************************** -// constructor -//***************************************************************************************************************** -OPlugInFrameFactory::OPlugInFrameFactory( const Reference< XMultiServiceFactory >& xFactory ) - // Init baseclasses first - // Attention: - // Don't change order of initialization! - // OMutexMember is a struct with a mutex as member. We can't use a mutex as member directly, while - // we must garant right initialization and a valid value of this! First initialize - // baseclasses and then members. And we need the mutex for other baseclasses !!! - : OMutexMember( ) - , OWeakObject ( ) - // Init member - , m_xFactory ( xFactory ) -{ -} - -//***************************************************************************************************************** -// destructor (protected!) -//***************************************************************************************************************** -OPlugInFrameFactory::~OPlugInFrameFactory() -{ -} - -//***************************************************************************************************************** -// XInterface -//***************************************************************************************************************** - -void SAL_CALL OPlugInFrameFactory::acquire() throw() -{ OWeakObject::acquire(); } - -void SAL_CALL OPlugInFrameFactory::release() throw() -{ OWeakObject::release(); } - -Any SAL_CALL OPlugInFrameFactory::queryInterface( const Type& aType ) throw( RuntimeException ) -{ - Any aReturn ( ::cppu::queryInterface( aType, static_cast< XSingleServiceFactory* >( this ) ) ); - if ( aReturn.hasValue() == sal_False ) - { - aReturn = OWeakObject::queryInterface( aType ); - } - return aReturn; -} -//***************************************************************************************************************** -// XSingleServiceFactory -//***************************************************************************************************************** -Reference< XInterface > SAL_CALL OPlugInFrameFactory::createInstance() throw( Exception , - RuntimeException) -{ - // Ready for multithreading - MutexGuard aGuard( m_aMutex ); - - // Create new plugin. - Reference< XInterface > xPlugIn( m_xFactory->createInstance( SERVICENAME_PLUGINFRAME ), UNO_QUERY ); - // Safe impossible cases - OSL_ENSURE( !(xPlugIn.is()==sal_False), "OPlugInFrameFactory::createInstance()\nServicename of PlugIn is unknown!\n" ); - - // Ouer plugin need information about his parent! - // If someone dispatch anything to this plugin instance, he will create a new window and load the content. - // Then he must append himself to ouer frame tree !!! => Thats why he need a valid reference to the desktop - // as parent to do this. - // Return result. - return xPlugIn; -} - -//***************************************************************************************************************** -// XSingleServiceFactory -//***************************************************************************************************************** -Reference< XInterface > SAL_CALL OPlugInFrameFactory::createInstanceWithArguments( const Sequence< Any >& seqArguments ) throw( Exception , - RuntimeException) -{ - // Ready for multithreading - MutexGuard aGuard( m_aMutex ); - - // Safe impossible cases - // This method is not defined for all incoming parameter. - OSL_ENSURE( impldbg_checkParameter_createInstanceWithArguments( seqArguments ), "OPlugInFrameFactory::createInstanceWithArguments()\nInvalid parameter detected.\n" ); - - // Create new PlugIn. - Reference< XInterface > xPlugIn = createInstance(); - // Initialize it with given arguments. - if ( xPlugIn.is()==sal_True ) - { - // Before we must cast to right interface. - Reference< XInitialization > xInit( xPlugIn, UNO_QUERY ); - // Safe impossible cases - OSL_ENSURE( !(xInit.is()==sal_False), "OPlugInFrameFactory::createInstanceWithArguments()\nPlugIn don't support XInitialization ?!...\n" ); - xInit->initialize( seqArguments ); - } - - // Return result. - return xPlugIn; -} - -//_________________________________________________________________________________________________________________ -// debug methods -//_________________________________________________________________________________________________________________ - -/*----------------------------------------------------------------------------------------------------------------- - The follow methods checks the parameter for other functions. If a parameter or his value is non valid, - we return "sal_False". (else sal_True) This mechanism is used to throw an ASSERT! - - ATTENTION - - If you miss a test for one of this parameters, contact the autor or add it himself !(?) - But ... look for right testing! See using of this methods! ------------------------------------------------------------------------------------------------------------------*/ - -#if OSL_DEBUG_LEVEL > 0 - -//***************************************************************************************************************** -sal_Bool OPlugInFrameFactory::impldbg_checkParameter_createInstanceWithArguments( const Sequence< Any >& seqArguments ) -{ - // Set default return value. - sal_Bool bOK = sal_True; - // Check parameter. - if ( - ( &seqArguments == NULL ) || - ( seqArguments.getLength() < 1 ) - ) - { - bOK = sal_False ; - } - // Return result of check. - return bOK ; -} - -#endif // #ifdef OSL_DEBUG_LEVEL diff --git a/desktop/source/app/opluginframefactory.hxx b/desktop/source/app/opluginframefactory.hxx index 39c6361bed84..e69de29bb2d1 100644 --- a/desktop/source/app/opluginframefactory.hxx +++ b/desktop/source/app/opluginframefactory.hxx @@ -1,229 +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: opluginframefactory.hxx,v $ - * $Revision: 1.5 $ - * - * 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 __SFX_OPLUGINFRAMEFACTORY_HXX_ -#define __SFX_OPLUGINFRAMEFACTORY_HXX_ - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - -#include "omutexmember.hxx" - -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ -#include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ -#include <cppuhelper/weak.hxx> - -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - -#define XSINGLESERVICEFACTORY ::com::sun::star::lang::XSingleServiceFactory -#define OWEAKOBJECT ::cppu::OWeakObject -#define EXCEPTION ::com::sun::star::uno::Exception -#define SEQUENCE ::com::sun::star::uno::Sequence -#define XCONNECTION ::com::sun::star::connection::XConnection -#define IOEXCEPTION ::com::sun::star::io::IOException -#define XINSTANCEPROVIDER ::com::sun::star::bridge::XInstanceProvider -#define NOSUCHELEMENTEXCEPTION ::com::sun::star::container::NoSuchElementException -#define XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory -#define REFERENCE ::com::sun::star::uno::Reference -#define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException -#define ANY ::com::sun::star::uno::Any -#define UNOTYPE ::com::sun::star::uno::Type -#define XINTERFACE ::com::sun::star::uno::XInterface -#define OUSTRING ::rtl::OUString -#define MUTEX ::osl::Mutex - -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - -/*-************************************************************************************************************//** - @short - - @descr - - - @implements XInterface - XSingleServiceFactory - [ XDebugging if ENABLE_SERVICEDEBUG is defined! ] - @base OMutexMember - OWeakObject - - @devstatus deprecated -*//*-*************************************************************************************************************/ - -class OPlugInFrameFactory : public XSINGLESERVICEFACTORY , - public OMutexMember , // Order of baseclasses is important for right initialization! - public OWEAKOBJECT -{ - //------------------------------------------------------------------------------------------------------------- - // public methods - //------------------------------------------------------------------------------------------------------------- - - public: - - //--------------------------------------------------------------------------------------------------------- - // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - - /*-****************************************************************************************************//** - @short standard ctor - @descr These initialize a new instance of ths class with needed informations for work. - - @seealso using at owner - - @param - - @return - - - @onerror - - *//*-*****************************************************************************************************/ - - OPlugInFrameFactory( const REFERENCE< XMULTISERVICEFACTORY >& xFactory ); - - //--------------------------------------------------------------------------------------------------------- - // XInterface - //--------------------------------------------------------------------------------------------------------- - - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); - virtual ANY SAL_CALL queryInterface( const UNOTYPE& aType ) throw( RUNTIMEEXCEPTION ); - - //--------------------------------------------------------------------------------------------------------- - // XSingleServiceFactory - //--------------------------------------------------------------------------------------------------------- - - /*-****************************************************************************************************//** - @short - - @descr - - - @seealso - - - @param - - @return - - - @onerror - - *//*-*****************************************************************************************************/ - - virtual REFERENCE< XINTERFACE > SAL_CALL createInstance() throw( EXCEPTION , - RUNTIMEEXCEPTION ); - - /*-****************************************************************************************************//** - @short - - @descr - - - @seealso - - - @param - - @return - - - @onerror - - *//*-*****************************************************************************************************/ - - virtual REFERENCE< XINTERFACE > SAL_CALL createInstanceWithArguments( const SEQUENCE< ANY >& seqArguments ) throw( EXCEPTION , - RUNTIMEEXCEPTION ); - - //------------------------------------------------------------------------------------------------------------- - // protected methods - //------------------------------------------------------------------------------------------------------------- - - protected: - - /*-****************************************************************************************************//** - @short standard destructor - @descr This method destruct an instance of this class and clear some member. - This method is protected, because its not allowed to use an instance of this class as a member! - You MUST use a pointer. - - @seealso - - - @param - - @return - - - @onerror - - *//*-*****************************************************************************************************/ - - virtual ~OPlugInFrameFactory(); - - //------------------------------------------------------------------------------------------------------------- - // private methods - //------------------------------------------------------------------------------------------------------------- - - private: - - //------------------------------------------------------------------------------------------------------------- - // debug methods - // (should be private everyway!) - //------------------------------------------------------------------------------------------------------------- - - /*-****************************************************************************************************//** - @short debug-method to check incoming parameter of some other mehods of this class - @descr The following methods are used to check parameters for other methods - of this class. The return value is used directly for an ASSERT(...). - - @seealso ASSERTs in implementation! - - @param references to checking variables - @return sal_False on invalid parameter<BR> - sal_True otherway - - @onerror - - *//*-*****************************************************************************************************/ - - #if OSL_DEBUG_LEVEL > 0 - - private: - - sal_Bool impldbg_checkParameter_createInstanceWithArguments( const SEQUENCE< ANY >& seqArguments ); - - #endif // #ifdef OSL_DEBUG_LEVEL - - //------------------------------------------------------------------------------------------------------------- - // variables - // (should be private everyway!) - //------------------------------------------------------------------------------------------------------------- - - private: - - REFERENCE< XMULTISERVICEFACTORY > m_xFactory ; - -}; // class OPlugInFrameFactory - -#endif // #ifndef __FRAMEWORK_OPLUGINFRAMEFACTORY_HXX_ 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); diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index 1fdb1e488460..1c5984184f0f 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: presethandler.cxx,v $ - * $Revision: 1.17 $ + * $Revision: 1.17.82.1 $ * * This file is part of OpenOffice.org. * @@ -286,7 +286,6 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag // Attention: This is temp. workaround ... We create a temp. storage file // based of a sytem directory. This must be used so, till the storage implementation // can work on directories too. - css::uno::Reference< css::embed::XStorage > xStorage = StorageHolder::createTempStorageBasedOnFolder(sShareLayer, xSMGR, sal_False); // false => writeable */ css::uno::Sequence< css::uno::Any > lArgs(2); lArgs[0] <<= sShareLayer; @@ -614,33 +613,6 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType } //----------------------------------------------- -css::uno::Sequence< ::rtl::OUString > PresetHandler::getAllPresetNames() const -{ - // SAFE -> ---------------------------------- - ReadGuard aReadLock(m_aLock); - return m_lPresets.getAsConstList(); - // <- SAFE ---------------------------------- -} - -//----------------------------------------------- -css::uno::Sequence< ::rtl::OUString > PresetHandler::getAllTargetNames() const -{ - // SAFE -> ---------------------------------- - ReadGuard aReadLock(m_aLock); - return m_lTargets.getAsConstList(); - // <- SAFE ---------------------------------- -} - -//----------------------------------------------- -sal_Bool PresetHandler::existsPreset(const ::rtl::OUString& sPreset) const -{ - // SAFE -> ---------------------------------- - ReadGuard aReadLock(m_aLock); - return (m_lPresets.findConst(sPreset) != m_lPresets.end()); - // <- SAFE ---------------------------------- -} - -//----------------------------------------------- sal_Bool PresetHandler::existsTarget(const ::rtl::OUString& sTarget) const { // SAFE -> ---------------------------------- @@ -756,26 +728,6 @@ css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const ::rtl::O } //----------------------------------------------- -void PresetHandler::removeTarget(const ::rtl::OUString& sTarget) -{ - // SAFE -> ---------------------------------- - ReadGuard aReadLock(m_aLock); - css::uno::Reference< css::embed::XStorage > xFolder = m_xWorkingStorageUser; - aReadLock.unlock(); - // <- SAFE ---------------------------------- - - // e.g. module without any config data ?! - if (!xFolder.is()) - return; - - ::rtl::OUString sFile(sTarget); - sFile += FILE_EXTENSION; - - xFolder->removeElement(sFile); - commitUserChanges(); -} - -//----------------------------------------------- void PresetHandler::commitUserChanges() { // SAFE -> ---------------------------------- diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index af153772706a..7855dbd2f63a 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: storageholder.cxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.82.1 $ * * This file is part of OpenOffice.org. * @@ -520,40 +520,6 @@ void StorageHolder::operator=(const StorageHolder& rCopy) } //----------------------------------------------- -css::uno::Reference< css::embed::XStorage > StorageHolder::createTempStorageBasedOnFolder(const ::rtl::OUString& sFolder , - const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , - sal_Bool bReadOnly) -{ - // error during opening the temp file isnt realy a runtime error -> handle it gracefully - css::uno::Reference< css::io::XOutputStream > xTempFile(xSMGR->createInstance(SERVICENAME_TEMPFILE), css::uno::UNO_QUERY); - if (!xTempFile.is()) - return css::uno::Reference< css::embed::XStorage >(); - - // creation of needed resources is mandatory -> error = runtime error - css::uno::Reference< css::embed::XPackageStructureCreator > xPackageCreator(xSMGR->createInstance(SERVICENAME_PACKAGESTRUCTURECREATOR), css::uno::UNO_QUERY_THROW); - css::uno::Reference< css::lang::XSingleServiceFactory > xStorageFactory(xSMGR->createInstance(SERVICENAME_STORAGEFACTORY) , css::uno::UNO_QUERY_THROW); - - // create zip package - xPackageCreator->convertToPackage(sFolder, xTempFile); - - // seek it back - so it can be used in a defined way. - css::uno::Reference< css::io::XSeekable > xSeekable(xTempFile, css::uno::UNO_QUERY_THROW); - xSeekable->seek(0); - - // open the temp. zip package - using the right open mode - sal_Int32 nOpenMode = css::embed::ElementModes::READWRITE; - if (bReadOnly) - nOpenMode = css::embed::ElementModes::READ; - - css::uno::Sequence< css::uno::Any > lArgs(2); - lArgs[0] <<= xTempFile; - lArgs[1] <<= nOpenMode; - - css::uno::Reference< css::embed::XStorage > xStorage(xStorageFactory->createInstanceWithArguments(lArgs), css::uno::UNO_QUERY_THROW); - return xStorage; -} - -//----------------------------------------------- css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage , const ::rtl::OUString& sSubStorage , sal_Int32 eOpenMode , diff --git a/framework/source/classes/colorlistener.cxx b/framework/source/classes/colorlistener.cxx index 2319d85478e2..e69de29bb2d1 100644 --- a/framework/source/classes/colorlistener.cxx +++ b/framework/source/classes/colorlistener.cxx @@ -1,308 +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.cxx,v $ - * $Revision: 1.8 $ - * - * 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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_framework.hxx" - -#include "classes/colorlistener.hxx" - -//__________________________________________ -// own includes -#include <threadhelp/readguard.hxx> -#include <threadhelp/writeguard.hxx> - -//__________________________________________ -// interface includes -#include <com/sun/star/awt/XWindowPeer.hpp> -#include <com/sun/star/awt/InvalidateStyle.hpp> - -//__________________________________________ -// other includes -#include <rtl/ustring.h> -#include <rtl/ustrbuf.hxx> -#include <toolkit/helper/vclunohelper.hxx> -#include <svtools/smplhint.hxx> -#include <vcl/svapp.hxx> -#include <vcl/window.hxx> - -//__________________________________________ -// definition - -namespace framework -{ - -DEFINE_XINTERFACE_1( ColorListener , - OWeakObject , - DIRECT_INTERFACE(css::lang::XEventListener)) - -//__________________________________________ - -/** initialize new instance of this class. - - It set the window, on which we must apply our detecte color changes. - We start listening for changes and(!) window disposing here too. - - @attention Some ressources will be created on demand! - - @param xWindow - reference to the window - */ - -ColorListener::ColorListener( const css::uno::Reference< css::awt::XWindow >& xWindow ) - : ThreadHelpBase(&Application::GetSolarMutex()) - , SfxListener ( ) - , m_pConfig (NULL ) - , m_xWindow (xWindow ) - , m_bListen (sal_False ) -{ - impl_startListening(); - impl_applyColor(sal_True); -} - -//__________________________________________ - -/** deinitialize new instance of this class. - - Because it's done at different places ... we use an impl method! - - see impl_die() - */ - -ColorListener::~ColorListener() -{ - impl_die(); -} - -//__________________________________________ -/** callback if color config was changed. - - @param rBroadcaster - should be our referenced config item (or any helper of it!) - - @param rHint - transport an ID, which identify the broadcasted message - */ -void ColorListener::Notify(SfxBroadcaster&, const SfxHint& rHint) -{ - if (((SfxSimpleHint&)rHint).GetId()==SFX_HINT_COLORS_CHANGED) - impl_applyColor(sal_True); -} - -//__________________________________________ -/** callback if window color was changed by any other! - We own this window .. and we are the only ones, which - define the background color of this window. - */ -IMPL_LINK(ColorListener, impl_SettingsChanged, void*, pVoid) -{ - // ignore uninteressting notifications - VclWindowEvent* pEvent = (VclWindowEvent*)pVoid; - if (pEvent->GetId() != VCLEVENT_WINDOW_DATACHANGED) - return 0L; - - // SAFE -> - ReadGuard aReadLock(m_aLock); - css::uno::Reference< css::awt::XWindow > xWindow = m_xWindow; - long nCurrentColor = m_nColor ; - aReadLock.unlock(); - // <- SAFE - - if (!xWindow.is()) - return 0L; - - Window* pWindow = VCLUnoHelper::GetWindow(xWindow); - if (!pWindow) - return 0L; - - OutputDevice* pDevice = (OutputDevice*)pWindow; - long nNewColor = (long)(pDevice->GetBackground().GetColor().GetColor()); - - // Was window background changed? - // NO -> do nothing - // YES -> apply our color! - if (nCurrentColor != nNewColor) - impl_applyColor(sal_False); - - return 0L; -} - -//__________________________________________ -/** set a new background color (retrieved from the configuration) - on the window. - - @param bInvalidate - If it's setto TRUE it forces a synchronous update - of the window background. - */ -void ColorListener::impl_applyColor(sal_Bool bInvalidate) -{ - // SAFE -> - WriteGuard aWriteLock(m_aLock); - - if (!m_pConfig) - return; - ::svtools::ColorConfigValue aBackgroundColor = m_pConfig->GetColorValue(::svtools::APPBACKGROUND); - m_nColor = aBackgroundColor.nColor; - - css::uno::Reference< css::awt::XWindowPeer > xPeer(m_xWindow, css::uno::UNO_QUERY); - - aWriteLock.unlock(); - // <- SAFE - - if (!xPeer.is()) - return; - - xPeer->setBackground(aBackgroundColor.nColor); - if (bInvalidate) - { - xPeer->invalidate( - css::awt::InvalidateStyle::UPDATE | - css::awt::InvalidateStyle::CHILDREN | - css::awt::InvalidateStyle::NOTRANSPARENT ); - } -} - -//__________________________________________ - -/** callback for window destroy. - - We must react here automaticly and forget our window reference. - We can die immediatly too. Because there is nothing to do any longer. - - @param aEvent - must referr to our window. - - @throw ::com::sun::star::uno::RuntimeException - if event source doesn't points to our internal saved window. - */ -void SAL_CALL ColorListener::disposing( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException) -{ - /* SAFE { */ - ReadGuard aReadLock(m_aLock); - - if (aEvent.Source!=m_xWindow) - throw css::uno::RuntimeException( - DECLARE_ASCII(""), - css::uno::Reference< css::uno::XInterface >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY) ); - - impl_die(); - - aReadLock.unlock(); - /* } SAFE */ -} - -//__________________________________________ - -/** starts listening for color changes and window destroy. - - We create the needed config singleton on demand here. - */ - -void ColorListener::impl_startListening() -{ - /* SAFE { */ - WriteGuard aWriteLock(m_aLock); - - if (!m_bListen) - { - Window* pWindow = VCLUnoHelper::GetWindow(m_xWindow); - if (pWindow) - pWindow->AddEventListener(LINK(this, ColorListener, impl_SettingsChanged)); - - if (!m_pConfig) - m_pConfig = new ::svtools::ColorConfig(); - - StartListening(*(SfxBroadcaster*)m_pConfig); - - css::uno::Reference< css::lang::XComponent > xDispose(m_xWindow, css::uno::UNO_QUERY); - if (xDispose.is()) - xDispose->addEventListener( css::uno::Reference< css::lang::XEventListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY) ); - - m_bListen = sal_True; - } - - aWriteLock.unlock(); - /* } SAFE */ -} - -//__________________________________________ - -/** stops listening for color changes and window destroy. - */ -void ColorListener::impl_stopListening() -{ - /* SAFE { */ - WriteGuard aWriteLock(m_aLock); - - if (m_bListen) - { - Window* pWindow = VCLUnoHelper::GetWindow(m_xWindow); - if (pWindow) - pWindow->RemoveEventListener( LINK( this, ColorListener, impl_SettingsChanged ) ); - - EndListeningAll(); - - delete m_pConfig; - m_pConfig = NULL; - - css::uno::Reference< css::lang::XComponent > xDispose(m_xWindow, css::uno::UNO_QUERY); - if (xDispose.is()) - xDispose->removeEventListener( css::uno::Reference< css::lang::XEventListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY) ); - - m_bListen = sal_False; - } - - aWriteLock.unlock(); - /* } SAFE */ -} - -//__________________________________________ - -/** release all used references. - - Free all used memory and release any used references. - Of course cancel all existing listener connections, to be - shure never be called again. - */ -void ColorListener::impl_die() -{ - /* SAFE { */ - ReadGuard aReadLock(m_aLock); - - // Attention: Deleting of our broadcaster will may force a Notify() call. - // To supress that, we have to disable our listener connection first. - impl_stopListening(); - m_xWindow = css::uno::Reference< css::awt::XWindow >(); - - aReadLock.unlock(); - /* } SAFE */ -} - -} // namespace framework diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx index a9470f6d22d4..c28ab392accb 100644 --- a/framework/source/classes/framecontainer.cxx +++ b/framework/source/classes/framecontainer.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: framecontainer.cxx,v $ - * $Revision: 1.24 $ + * $Revision: 1.24.82.1 $ * * This file is part of OpenOffice.org. * @@ -307,23 +307,6 @@ css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > FrameContainer:: } /**-*************************************************************************************************************** - @short return state information, if container is empty or not - @descr - - - @return <TRUE/> if container is filled or <FALSE/> if he is empty. - - @threadsafe yes - @modified 01.07.2002 15:09,as96863 - *****************************************************************************************************************/ -sal_Bool FrameContainer::hasElements() const -{ - /* SAFE { */ - ReadGuard aReadLock( m_aLock ); - return( m_aContainer.size()>0 ); - /* } SAFE */ -} - -/**-*************************************************************************************************************** @short set the given frame as the new active one inside this container @descr We accept this frame only, if it's already a part of this container. @@ -366,88 +349,6 @@ css::uno::Reference< css::frame::XFrame > FrameContainer::getActive() const } /**-*************************************************************************************************************** - @short enables the async quit mode, which terminates the office if last task will be closed - @descr If the last visible task will gone, nobody show any UI then. But without any UI the user - has no chance to quit the application realy. So we must shutdown by ourself. - We do that by an async quit call. - - But note: It's not neccessary to use this mechanism, if using the office doesn't require it. - e.g. the command line parameters "-invisible", -headless" starts the office in a server mode. - In this case the outside user controls the lifetime of it and must terminate it manually. - - @param xDesktop - only the child frame container of the desktop instance can use this special quit mode. - Because only top level frames are used for checking. - - @threadsafe yes - @modified 30.01.2003 11:26,as96863 - *****************************************************************************************************************/ -void FrameContainer::enableQuitTimer( const css::uno::Reference< css::frame::XDesktop >& ) -{ -/*DEPRECATEME - // SAFE { - WriteGuard aWriteLock( m_aLock ); - m_xDesktop = xDesktop; - m_bAsyncQuit = xDesktop.is(); - aWriteLock.unlock(); - // } SAFE -*/ -} - -/**-*************************************************************************************************************** - @short disable the async quit mechanism again - @descr Set the right state internaly and forget the desktop reference. - It's not neccessary to save this information any longer. - If user wish to establish this mode again he must do it with "enableQuitTimer()". - - @threadsafe yes - @modified 30.01.2003 11:23,as96863 - *****************************************************************************************************************/ -void FrameContainer::disableQuitTimer() -{ -/*DEPRECATEME - // SAFE { - WriteGuard aWriteLock( m_aLock ); - m_bAsyncQuit = sal_False; - m_xDesktop = css::uno::WeakReference< css::frame::XDesktop >(); - aWriteLock.unlock(); - // } SAFE -*/ -} - -/**-*************************************************************************************************************** - @short asyncronous callback for our special quit feature - @descr In case the last frame was removed from this container and our owner is the desktop itself, - we have to terminate the whole application. - But we have to check, between starting this mechanism and now no new frame was opened. - - @threadsafe yes - @modified 30.01.2003 11:24,as96863 - *****************************************************************************************************************/ -/*DEPRECATEME -IMPL_LINK( FrameContainer, implts_asyncQuit, void*, pVoid ) -{ - // SAFE { - ReadGuard aReadLock(m_aLock); - css::uno::Reference< css::frame::XDesktop > xDesktop ( m_xDesktop.get(), css::uno::UNO_QUERY ); - aReadLock.unlock(); - // } SAFE - - css::uno::Reference< css::frame::XFramesSupplier > xSupplier( xDesktop, css::uno::UNO_QUERY ); - if (xSupplier.is()) - { - css::uno::Reference< css::container::XElementAccess > xFrames( xSupplier->getFrames(), css::uno::UNO_QUERY ); - if (!xFrames.is() || !xFrames->hasElements() ) - { - LOG_WARNING("FrameContainer::implts_asyncQuit()", "force terminate ...\nPlease check if it's realy neccessary!") - xDesktop->terminate(); - } - } - - return 0; -} -*/ -/**-*************************************************************************************************************** @short implements a simple search based on current container items @descr It can be used for findFrame() and implements a deep down search. diff --git a/framework/source/classes/makefile.mk b/framework/source/classes/makefile.mk index 74fb488f8883..512945888829 100644 --- a/framework/source/classes/makefile.mk +++ b/framework/source/classes/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.36 $ +# $Revision: 1.36.82.1 $ # # This file is part of OpenOffice.org. # @@ -44,7 +44,6 @@ SLOFILES= \ $(SLO)$/propertysethelper.obj \ $(SLO)$/framecontainer.obj \ $(SLO)$/taskcreator.obj \ - $(SLO)$/targetfinder.obj \ $(SLO)$/menumanager.obj \ $(SLO)$/bmkmenu.obj \ $(SLO)$/droptargetlistener.obj \ @@ -58,7 +57,6 @@ SLOFILES= \ $(SLO)$/addonmenu.obj \ $(SLO)$/addonsoptions.obj \ $(SLO)$/fwkresid.obj \ - $(SLO)$/colorlistener.obj \ $(SLO)$/framelistanalyzer.obj \ $(SLO)$/sfxhelperfunctions.obj \ $(SLO)$/menuextensionsupplier.obj diff --git a/framework/source/classes/targetfinder.cxx b/framework/source/classes/targetfinder.cxx index 9a35757a8344..e69de29bb2d1 100644 --- a/framework/source/classes/targetfinder.cxx +++ b/framework/source/classes/targetfinder.cxx @@ -1,954 +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.cxx,v $ - * $Revision: 1.13 $ - * - * 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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_framework.hxx" - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ -#include <classes/targetfinder.hxx> - -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ -#include <com/sun/star/frame/FrameSearchFlag.hpp> -#include <com/sun/star/frame/XDesktop.hpp> -#include <com/sun/star/frame/XFrame.hpp> - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - -namespace framework{ - -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// non exported declarations -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// definitions -//_________________________________________________________________________________________________________________ - -/*-************************************************************************************************************//** - @short create new target info with valid values - @descr If you wish to call TargetFinder::classify...() methods you must give him - a lot of informations about currently set environment of a frame. - But ... sometimes you have all informations ... and sometimes you need a helper - to get it. These ctor implementations do both things for you. - You should call it with ALL or with NOTHING. - He use your values (at ALL) or try to get this informations by himself (at NOTHING). - After that you can use this filled target info to call you classify...(). - - @seealso method TargetFinder::classify...() - - @param "xFrame" , reference to frame which should be detected [MUST ] - @param "sTarget" , name of searched target [MUST ] - @param "nFlags" , search flags [MUST ] - @param "eType" , type of frame [OPTIONAL] - @param "bChildrens", Is children search possible? [OPTIONAL] - @param "bParent" , Is parent search possible? [OPTIONAL] - @param "sFrame" , name of frame for self-search [OPTIONAL] - @param "sParent" , parent name for parent-search [OPTIONAL] - @return - - - @onerror No error should occure ... if incoming parameters are correct :-) - @threadsafe No -*//*-*************************************************************************************************************/ -TargetInfo::TargetInfo( const ::rtl::OUString& sTarget , - sal_Int32 nFlags , - EFrameType eType , - sal_Bool bChildrens , - sal_Bool bParent , - const ::rtl::OUString& sFrame , - const ::rtl::OUString& sParent ) -{ - // Check incoming parameter. - LOG_ASSERT2( implcp_ctor( sTarget, nFlags, eType, bChildrens, bParent, sFrame, sParent ), "TargetInfo::TargetInfo( 2 )", "Invalid parameter detected!" ) - - // Set given values on internal member. - sTargetName = sTarget ; - nSearchFlags = nFlags ; - eFrameType = eType ; - bChildrenExist = bChildrens ; - bParentExist = bParent ; - sFrameName = sFrame ; - sParentName = sParent ; - bCreationAllowed = impl_getCreateFlag( nSearchFlags ) ; -} - -//***************************************************************************************************************** -TargetInfo::TargetInfo( const css::uno::Reference< css::frame::XFrame >& xFrame , - const ::rtl::OUString& sTarget , - sal_Int32 nFlags ) -{ - // Check incoming parameter. - LOG_ASSERT2( implcp_ctor( xFrame, sTarget, nFlags ), "TargetInfo::TargetInfo( 1 )", "Invalid parameter detected!" ) - - // Set default values! - // So we must reset it to valid values only. - bChildrenExist = sal_False ; - bParentExist = sal_False ; - sFrameName = ::rtl::OUString(); - sParentName = ::rtl::OUString(); - - // Take given values into internal variables. - sTargetName = sTarget; - nSearchFlags = nFlags ; - - // Try to analyze environment of given frame to set all other member! - eFrameType = getFrameType( xFrame ); - switch( eFrameType ) - { - case E_DESKTOP : break; // Nothing to do .. because: Desktop has no parent, no name ... Use default values! - // But - values for children info is set later ... - case E_TASK : { - css::uno::Reference< css::frame::XFrame > xParent( xFrame->getCreator(), css::uno::UNO_QUERY ); - bParentExist = xParent.is(); - // Desktop has no name! Don't ask parent! - sFrameName = xFrame->getName(); - } - break; - case E_FRAME : { - css::uno::Reference< css::frame::XFrame > xParent( xFrame->getCreator(), css::uno::UNO_QUERY ); - bParentExist = xParent.is(); - if( xParent.is() == sal_True ) - { - sParentName = xParent->getName(); - } - sFrameName = xFrame->getName(); - } - break; - case E_UNKNOWNFRAME : break; - default : break; - } - - css::uno::Reference< css::frame::XFramesSupplier > xSupplier ( xFrame, css::uno::UNO_QUERY ); - css::uno::Reference< css::frame::XFrames > xChildrens ; - if( xSupplier.is() == sal_True ) - { - xChildrens = xSupplier->getFrames(); - if( xChildrens.is() == sal_True ) - { - bChildrenExist = xChildrens->hasElements(); - } - } - - bCreationAllowed = impl_getCreateFlag( nSearchFlags ); -} - -/*-************************************************************************************************************//** - @short get an enum, which represent type of given frame - @descr This value can be used by calling following classify...() methods. - It regulate searching of targets. - Why we don't detect this type internal? - Mostly this helper is called from a frame or task implmentation directly and detection will be superflous. - But sometimes this information isn't available ... so we should support a generaly implementation - of this search algorithm :-) - - @seealso method classify...() - - @param "xFrame", reference to frame which should be detected - @return An enum value to classify the frame type. - - @onerror No error should occure ... if incoming parameters are correct :-) - @threadsafe No -*//*-*************************************************************************************************************/ -EFrameType TargetInfo::getFrameType( const css::uno::Reference< css::frame::XFrame >& xFrame ) -{ - // Check incoming parameter. - LOG_ASSERT2( implcp_getFrameType( xFrame ), "TargetFinder::getFrameType()", "Invalid parameter detected!" ) - - // Try to cast it to right interfaces to get informations about right frame type. - css::uno::Reference< css::frame::XDesktop > xDesktopCheck( xFrame, css::uno::UNO_QUERY ); - css::uno::Reference< css::frame::XFrame > xFrameCheck ( xFrame, css::uno::UNO_QUERY ); - - EFrameType eType = E_UNKNOWNFRAME; - - if (xDesktopCheck.is()) - eType=E_DESKTOP; - else - if (xFrameCheck.is()) - { - eType=E_FRAME; - // But may it's a special task frame. - // Such frames have the desktop as direct parent! - css::uno::Reference< ::com::sun::star::frame::XDesktop > xDesktopParentCheck( xFrame->getCreator(), css::uno::UNO_QUERY ); - if (xDesktopParentCheck.is()) - eType=E_TASK; - } - - LOG_ASSERT2( eType==E_UNKNOWNFRAME, "TargetFinder::getFrameType()", "Unknown frame implementation detected!" ) - - return eType; -} - -/*-************************************************************************************************************//** - @short get state of create flag - @descr These flag allow user to create a new frame if no one could be found! - - @attention Ignore it, if it is the only setted flag. - Why? Otherwise creation of frames by using same name without search for already existing frames - will be possible! This case produce more then one frame by using same name ... and it's not clear, which frame would be found - at further searches! It's better to ignore this case and disable creation. - - @seealso ctor - - @param "nSearchFlags", collection of setted flags - @return true , for setted flag - false, if CREATE flag the only one or isn't set - - @onerror We return false. -*//*-*************************************************************************************************************/ -sal_Bool TargetInfo::impl_getCreateFlag( sal_Int32 aSearchFlags ) -{ - bCreationAllowed = sal_False; - if( aSearchFlags != css::frame::FrameSearchFlag::CREATE ) - { - bCreationAllowed = (( aSearchFlags & css::frame::FrameSearchFlag::CREATE ) == css::frame::FrameSearchFlag::CREATE ); - } - return bCreationAllowed; -} - -/*-************************************************************************************************************//** - @short get a recommendation for searching right target - @descr Our caller search for a target which match with given parameter. - Give him a direction to find the right one. - These method never create or return a tree node! Thats your job! - We say: go up, go down or give you the permission to create new frame if search will fail! - - @attention XFrame::findFrame() and XDispatchProvider::queryDispatch() should understand - target names and searchflags ... but not in the same way. findFrame() can create - a new frame, if it is missing - queryDispatch() couldn't do that! Only the combination with a successfuly - dispatch() call should do that! - Another reason - there exist some "virtual" targets ... like "_helpagent", "_menubar". - These targets couldn't be handled by findFrame(); but by a queryDispatch(). - Thats why we implement different classify methods for different mechanism! - - @seealso method XFrame::findFrame() - @seealso method XDispatcher::queryDispatch() - @seealso struct TargetInfo - - @param "aInfo", information about search environment - @return An enum value to classify the direction for searching. - - @onerror E_UNKNOWN is returned. -*//*-*************************************************************************************************************/ -ETargetClass TargetFinder::classifyFindFrame( TargetInfo& aInfo ) -{ - // Check incoming parameter - LOG_ASSERT2( implcp_classifyFindFrame( aInfo ), "TargetFinder::classifyFindFrame()", "Invalid parameter detected!" ) - - ETargetClass eResult = E_UNKNOWN; - - // Use some helper methods for different classes of tree nodes to get the result. - switch( aInfo.eFrameType ) - { - case E_DESKTOP : eResult = impl_classifyForDesktop_findFrame( aInfo.bChildrenExist, aInfo.sTargetName, aInfo.nSearchFlags ); - break; - case E_TASK : eResult = impl_classifyForTask_findFrame( aInfo.bParentExist, aInfo.bChildrenExist, aInfo.sFrameName, aInfo.sTargetName, aInfo.nSearchFlags ); - break; - case E_FRAME : eResult = impl_classifyForFrame_findFrame( aInfo.bParentExist, aInfo.bChildrenExist, aInfo.sFrameName, aInfo.sParentName, aInfo.sTargetName, aInfo.nSearchFlags ); - break; - default : break; - } - - // It doesnt matter if CREATE flag is set or not ... - // If follow results are returned by our helper methods - the result will be clear! - // In these cases we dont can allow (or must!) creation of new frames/tasks... - LOG_ASSERT2( eResult==E_MENUBAR || eResult==E_HELPAGENT, "TargetFinder::classifyFindFrame()", "Invalid search result found!") - if ( - ( eResult == E_CREATETASK ) || - ( eResult == E_SELF ) || - ( eResult == E_PARENT ) || - ( eResult == E_BEAMER ) - ) - { - aInfo.bCreationAllowed = sal_False; - } - - return eResult; -} - -//***************************************************************************************************************** -ETargetClass TargetFinder::classifyQueryDispatch( TargetInfo& aInfo ) -{ - // Check incoming parameter - LOG_ASSERT2( implcp_classifyQueryDispatch( aInfo ), "TargetFinder::classifyQueryDispatch()", "Invalid parameter detected!" ) - - ETargetClass eResult = E_UNKNOWN; - - //************************************************************************************************************* - // I ) handle "_menubar" - // II) handle "_helpagent" - // DESKTOP => Could not be handled by our desktop ... - // because: Its a supported property of a task ... but which one should be used, if call comes from the top?! - // TASK => Supported! return SELF - // FRAME => Not supported ... but search for tasks ... if flags allow this search. - //************************************************************************************************************* - if( aInfo.sTargetName == SPECIALTARGET_MENUBAR ) - { - switch( aInfo.eFrameType ) - { - case E_TASK : eResult = E_MENUBAR; - break; - case E_FRAME : if( aInfo.bParentExist == sal_True ) - { - eResult = E_FORWARD_UP; - } - break; - default : break; - } - } - else - if( aInfo.sTargetName == SPECIALTARGET_HELPAGENT ) - { - switch( aInfo.eFrameType ) - { - case E_TASK : eResult = E_HELPAGENT; - break; - case E_FRAME : if( aInfo.bParentExist == sal_True ) - { - eResult = E_FORWARD_UP; - } - break; - default : break; - } - } - //************************************************************************************************************* - // III ) handle "_blank" - // DESKTOP => Only the desktop can create new tasks ... he has a special dispatch helper to do that! - // return CREATETASK - // TASK - // FRAME => They couldn't create any new task => They must forward it to the desktop dispatch helper! - // return FORWARD_UP - //************************************************************************************************************* - else - if( aInfo.sTargetName == SPECIALTARGET_BLANK ) - { - switch( aInfo.eFrameType ) - { - case E_DESKTOP : eResult = E_CREATETASK; - break; - case E_TASK : - case E_FRAME : if( aInfo.bParentExist == sal_True ) - { - eResult = E_FORWARD_UP; - } - break; - default : break; - } - } - else - if( aInfo.sTargetName == SPECIALTARGET_DEFAULT ) - { - switch( aInfo.eFrameType ) - { - case E_DESKTOP : eResult = E_DEFAULT; - break; - case E_TASK : - case E_FRAME : if( aInfo.bParentExist == sal_True ) - { - eResult = E_FORWARD_UP; - } - break; - default : break; - } - } - //************************************************************************************************************* - // IV) handle "", "_self" - // These case is clear. It's queals to "_self". Search flags could be ignored - other special target names - // couldn't occure - a real name couldn't be resolved realy! Frames with empty names exist more then ones ... - // Return E_SELF for desktop too!! Some URLs could be dispatched on desktop too ... e.g. slot, uno, macro URLs. - // Desktop must check other URLs - to prevent himself against wrong laoding of documents in it ... e.g. file...! - //************************************************************************************************************* - else - if( - ( aInfo.sTargetName.getLength() < 1 ) || - ( aInfo.sTargetName == SPECIALTARGET_SELF ) - ) - { - eResult = E_SELF; - } - //************************************************************************************************************* - // V) There exist no other special targets or flag combinations ... - // I think we can use helper for normal findFrame() classify here! - //************************************************************************************************************* - else - { - switch( aInfo.eFrameType ) - { - case E_DESKTOP : eResult = impl_classifyForDesktop_findFrame( aInfo.bChildrenExist, aInfo.sTargetName, aInfo.nSearchFlags ); - break; - case E_TASK : eResult = impl_classifyForTask_findFrame( aInfo.bParentExist, aInfo.bChildrenExist, aInfo.sFrameName, aInfo.sTargetName, aInfo.nSearchFlags ); - break; - case E_FRAME : eResult = impl_classifyForFrame_findFrame( aInfo.bParentExist, aInfo.bChildrenExist, aInfo.sFrameName, aInfo.sParentName, aInfo.sTargetName, aInfo.nSearchFlags ); - break; - default : break; - } - } - - // It doesnt matter if CREATE flag is set or not ... - // If follow results are returned by our helper methods - the result will be clear! - // In these cases we dont can allow (or must!) creation of new frames/tasks... - if ( - ( eResult == E_CREATETASK ) || - ( eResult == E_DEFAULT ) || - ( eResult == E_SELF ) || - ( eResult == E_PARENT ) || - ( eResult == E_BEAMER ) || - ( eResult == E_MENUBAR ) || - ( eResult == E_HELPAGENT ) - ) - { - aInfo.bCreationAllowed = sal_False; - } - - return eResult; -} - -/*-************************************************************************************************************//** - @short helper methods for classify...() - @descr Every tree node (desktop, frame, task ...) has another preference shares to search a target. - With these helper methods we differ between these search algorithm! - - @seealso method classify...() - - @param "bParentExist" set if a parent exist for caller tree node - @param "bChildrenExist" set if some children exist for caller tree node - @param "sFrameName" name of current tree node (used for SELF flag to break search earlier!) - @param "sParentName" name of current tree node (used for PARENT flag to break search earlier!) - @param "sTargetName" name of searched target tree node - @param "nSearchFlags" flags to regulate search in tree - @param "bTopFrame" used to break upper searches at a top frame if search outside current task isnt allowed! - @return A decision about valid search direction. - - @onerror E_UNKNOWN is returned. -*//*-*************************************************************************************************************/ -ETargetClass TargetFinder::impl_classifyForDesktop_findFrame( sal_Bool bChildrenExist , - const ::rtl::OUString& sTargetName , - sal_Int32 nSearchFlags ) -{ - ETargetClass eResult = E_UNKNOWN; - - //************************************************************************************************************* - // I) Handle special target names. - // Make an exclusiv search: if() else if() ... - // - // I.I) Look for "_blank" - // Only the desktop can create new tasks. - //************************************************************************************************************* - if( sTargetName == SPECIALTARGET_BLANK ) - { - eResult = E_CREATETASK; - } - else - { - //********************************************************************************************************* - // II) Special target names was handled ... - // Now look for right flags. - // Combine search results: if(); if() ... - // - // II.I) Special and exclusiv mode for search at our desktop! - // Normaly TASKS flag is used to restrict upper searches inside current task tree! - // All searches stop at a top frame if these flag isnt set. - // For down search it doesnt matter ... - // but I think we can use it to search at all direct(!) childrens of our desktop. - // These can be useful to create new tasks by name if it not already exist. - // => These flag cant combinde with CHILDREN or SIBLINGS or somethings else. - // We ignore such constructs. If you combine it with the CREATE flag - a new task will created - // if no existing one can be found. - //********************************************************************************************************* - if ( - ( nSearchFlags & css::frame::FrameSearchFlag::TASKS ) && - ( - !( nSearchFlags & css::frame::FrameSearchFlag::CHILDREN ) && - !( nSearchFlags & css::frame::FrameSearchFlag::SIBLINGS ) && - !( nSearchFlags & css::frame::FrameSearchFlag::PARENT ) && - !( nSearchFlags & css::frame::FrameSearchFlag::SELF ) - ) - ) - { - eResult = E_TASKS; - } - else - { - //***************************************************************************************************** - // II.I) Look for CHILDREN. - // Ignore flag if no childrens exist! - //***************************************************************************************************** - if ( - ( nSearchFlags & css::frame::FrameSearchFlag::CHILDREN ) && - ( bChildrenExist == sal_True ) - ) - { - eResult = E_DEEP_DOWN; - } - - //***************************************************************************************************** - // II.II) Look for SIBLINGS. - // These change a deep to a flat search! - // Otherwise ... flag can be ignored - because the desktop has no siblings! - //***************************************************************************************************** - if( nSearchFlags & css::frame::FrameSearchFlag::SIBLINGS ) - { - switch( eResult ) - { - case E_DEEP_DOWN : eResult = E_FLAT_DOWN; - break; - default : break; - } - } - } - } - - //************************************************************************************************************* - // possible results: - // E_UNKNOWN - // E_CREATETASK - // E_TASKS - // E_DEEP_DOWN - // E_FLAT_DOWN - //************************************************************************************************************* - return eResult; -} - -//***************************************************************************************************************** -ETargetClass TargetFinder::impl_classifyForTask_findFrame( sal_Bool bParentExist , - sal_Bool bChildrenExist , - const ::rtl::OUString& sFrameName , - const ::rtl::OUString& sTargetName , - sal_Int32 nSearchFlags ) -{ - ETargetClass eResult = E_UNKNOWN ; - sal_Bool bLeaveTask = (( nSearchFlags & css::frame::FrameSearchFlag::TASKS ) == css::frame::FrameSearchFlag::TASKS ); // we must know if we can search outside current task - - //************************************************************************************************************* - // I) Handle special target names. - // Make an exclusiv search: if() else if() ... - // - // I.I) Look for "_blank" - // Only the desktop can create new tasks. Forward search to parent! - //************************************************************************************************************* - if( sTargetName == SPECIALTARGET_BLANK ) - { - if( bParentExist == sal_True ) - { - eResult = E_FORWARD_UP; - } - } - else - - //************************************************************************************************************* - // I.II) Look for "_self" - // Handle "" in the same way! - //************************************************************************************************************* - if ( - ( sTargetName == SPECIALTARGET_SELF ) || - ( sTargetName.getLength() < 1 ) - ) - { - eResult = E_SELF; - } - else - - //************************************************************************************************************* - // I.III) Look for "_top" - // A task is top everytime! - //************************************************************************************************************* - if( sTargetName == SPECIALTARGET_TOP ) - { - eResult = E_SELF; - } - else - - //************************************************************************************************************* - // I.IV) Look for "_beamer" - //************************************************************************************************************* - if( sTargetName == SPECIALTARGET_BEAMER ) - { - eResult = E_BEAMER; - } - else - - { - //********************************************************************************************************* - // II) Special target names was handled ... - // Now look for right flags. - // Combine search results: if(); if() ... - // - // II.I) Look for SELF. - // Use given frame name to do that. It couldn't be empty(!) - because this was handled in step I.II). - //********************************************************************************************************* - if ( - ( nSearchFlags & css::frame::FrameSearchFlag::SELF ) && - ( sTargetName == sFrameName ) - ) - { - eResult = E_SELF; - } - - //********************************************************************************************************* - // II.III) Look for PARENT. - // Is allowed on tasks if outside search of it is allowed! - // Don't check name of parent here - otherwise we return the desktop as result ... - //********************************************************************************************************* - if ( - ( eResult != E_SELF ) && - ( nSearchFlags & css::frame::FrameSearchFlag::PARENT ) && - ( bParentExist == sal_True ) && - ( bLeaveTask == sal_True ) - ) - { - eResult = E_FORWARD_UP; - } - - //********************************************************************************************************* - // II.II) Look for CHILDREN. - // Ignore flag if no childrens exist! - //********************************************************************************************************* - if ( - ( eResult != E_SELF ) && - ( nSearchFlags & css::frame::FrameSearchFlag::CHILDREN ) && - ( bChildrenExist == sal_True ) - ) - { - switch( eResult ) - { - case E_UNKNOWN : eResult = E_DEEP_DOWN; - break; - case E_FORWARD_UP : eResult = E_DEEP_BOTH; - break; - default: break; - } - } - - //********************************************************************************************************* - // II.III) Look for SIBLINGS. - // These change a deep to a flat search! - //********************************************************************************************************* - if ( - ( eResult != E_SELF ) && - ( nSearchFlags & css::frame::FrameSearchFlag::SIBLINGS ) - ) - { - switch( eResult ) - { - case E_DEEP_DOWN : eResult = E_FLAT_DOWN; - break; - case E_DEEP_BOTH : eResult = E_FLAT_BOTH; - break; - default: break; - } - } - } - - //************************************************************************************************************* - // possible results: - // E_UNKNOWN - // E_SELF - // E_BEAMER - // E_FORWARD_UP - // E_DEEP_DOWN - // E_DEEP_BOTH - // E_FLAT_DOWN - // E_FLAT_BOTH - //************************************************************************************************************* - return eResult; -} - -//***************************************************************************************************************** -ETargetClass TargetFinder::impl_classifyForFrame_findFrame( sal_Bool bParentExist , - sal_Bool bChildrenExist , - const ::rtl::OUString& sFrameName , - const ::rtl::OUString& sParentName , - const ::rtl::OUString& sTargetName , - sal_Int32 nSearchFlags ) -{ - ETargetClass eResult = E_UNKNOWN; - - //************************************************************************************************************* - // I) Handle special target names. - // Make an exclusiv search: if() else if() ... - // - // I.I) Look for "_blank" - // Only the desktop can create new tasks. Forward search to parent! - //************************************************************************************************************* - if( sTargetName == SPECIALTARGET_BLANK ) - { - if( bParentExist == sal_True ) - { - eResult = E_FORWARD_UP; - } - } - else - - //************************************************************************************************************* - // I.II) Look for "_self" - // Handle "" in the same way! - //************************************************************************************************************* - if ( - ( sTargetName == SPECIALTARGET_SELF ) || - ( sTargetName.getLength() < 1 ) - ) - { - eResult = E_SELF; - } - else - - //************************************************************************************************************* - // I.III) Look for "_top" - // A frame without a parent is top - otherwhise it's one of his parents! - //************************************************************************************************************* - if( sTargetName == SPECIALTARGET_TOP ) - { - if( bParentExist == sal_False ) - { - eResult = E_SELF; - } - else - { - eResult = E_FORWARD_UP; - } - } - else - - //************************************************************************************************************* - // I.IV) Look for "_parent" - // Ignore it if no parent exist! - //************************************************************************************************************* - if( sTargetName == SPECIALTARGET_PARENT ) - { - if( bParentExist == sal_True ) - { - eResult = E_PARENT; - } - } - else - - //************************************************************************************************************* - // I.V) Look for "_beamer" - // Only a task can handle or create the beamer! - //************************************************************************************************************* - if ( - ( sTargetName == SPECIALTARGET_BEAMER ) && - ( bParentExist == sal_True ) - ) - { - eResult = E_FORWARD_UP; - } - else - - { - //********************************************************************************************************* - // II) Special target names was handled ... - // Now look for right flags. - // Combine search results: if(); if() ... - // - // II.I) Look for SELF. - // Use given frame name to do that. It couldn't be empty(!) - because this was handled in step I.II). - //********************************************************************************************************* - if ( - ( nSearchFlags & css::frame::FrameSearchFlag::SELF ) && - ( sTargetName == sFrameName ) - ) - { - eResult = E_SELF; - } - - //********************************************************************************************************* - // II.II) Look for PARENT. - // Ignore flag if no parent exist! Check his name here to break search erlier! - // Ignore flag if we are a top frame and search outside current task isnt allowed. - //********************************************************************************************************* - if ( - ( eResult != E_SELF ) && - ( nSearchFlags & css::frame::FrameSearchFlag::PARENT ) && - ( bParentExist == sal_True ) - ) - { - if( sParentName == sTargetName ) - { - eResult = E_PARENT; - } - else - { - eResult = E_FORWARD_UP; - } - } - - //********************************************************************************************************* - // II.III) Look for CHILDREN. - // Ignore flag if no childrens exist! Combine it with already set decisions! - //********************************************************************************************************* - if ( - ( eResult != E_SELF ) && - ( eResult != E_PARENT ) && - ( nSearchFlags & css::frame::FrameSearchFlag::CHILDREN ) && - ( bChildrenExist == sal_True ) - ) - { - switch( eResult ) - { - case E_UNKNOWN : eResult = E_DEEP_DOWN; - break; - case E_FORWARD_UP : eResult = E_DEEP_BOTH; - break; - default : break; - } - } - - //********************************************************************************************************* - // II.IV) Look for SIBLINGS. - // These change a deep to a flat search! - //********************************************************************************************************* - if ( - ( eResult != E_SELF ) && - ( eResult != E_PARENT ) && - ( nSearchFlags & css::frame::FrameSearchFlag::SIBLINGS ) - ) - { - switch( eResult ) - { - case E_DEEP_DOWN : eResult = E_FLAT_DOWN; - break; - case E_DEEP_BOTH : eResult = E_FLAT_BOTH; - break; - default : break; - } - } - } - - //************************************************************************************************************* - // possible results: - // E_UNKNOWN - // E_SELF - // E_PARENT - // E_FORWARD_UP - // E_DEEP_DOWN - // E_DEEP_BOTH - // E_FLAT_DOWN - // E_FLAT_BOTH - //************************************************************************************************************* - return eResult; -} - -/*-****************************************************************************************************//** - @short debug-methods to check incoming parameter of some other mehods of this class - @descr The follow methods are used to check parameters for other methods - of this class. The return value is used directly for an ASSERT(...). - This mechanism is active in debug version only! - - @seealso FRAMEWORK_ASSERT in implementation! - - @param references to checking variables - @return sal_False on invalid parameter - @return sal_True otherwise - - @onerror - -*//*-*****************************************************************************************************/ - -#ifdef ENABLE_ASSERTIONS - -//***************************************************************************************************************** -sal_Bool TargetInfo::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 ) -{ - return( - ( &sTarget == NULL ) || - ( eType == E_UNKNOWNFRAME ) || - ( - ( bChildrens != sal_True ) && - ( bChildrens != sal_False ) - ) || - ( - ( bParent != sal_True ) && - ( bParent != sal_False ) - ) || - ( &sFrame == NULL ) || - ( &sParent == NULL ) - ); -} - -//***************************************************************************************************************** -// Attention: - empty "sTarget" is allowed! => equal to "_self" -// - there exist no test for flags! -sal_Bool TargetInfo::implcp_ctor( const css::uno::Reference< css::frame::XFrame >& xFrame , - const ::rtl::OUString& sTarget , - sal_Int32 /*nFlags*/ ) -{ - return( - ( &xFrame == NULL ) || - ( xFrame.is() == sal_False ) || - ( &sTarget == NULL ) - ); -} - -//***************************************************************************************************************** -sal_Bool TargetInfo::implcp_getFrameType( const css::uno::Reference< css::frame::XFrame >& xFrame ) -{ - return( - ( &xFrame == NULL ) || - ( xFrame.is() == sal_False ) - ); -} - -//***************************************************************************************************************** -sal_Bool TargetFinder::implcp_classifyFindFrame( const TargetInfo& aInfo ) -{ - return( &aInfo == NULL ); -} - -//***************************************************************************************************************** -sal_Bool TargetFinder::implcp_classifyQueryDispatch( const TargetInfo& aInfo ) -{ - return( &aInfo == NULL ); -} - -#endif // #ifdef ENABLE_ASSERTIONS - -} // namespace framework diff --git a/framework/source/constant/filter.cxx b/framework/source/constant/filter.cxx index f70423710d62..1ec7ba62d276 100644 --- a/framework/source/constant/filter.cxx +++ b/framework/source/constant/filter.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: filter.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.82.1 $ * * This file is part of OpenOffice.org. * @@ -118,29 +118,5 @@ const sal_Int32 Filter::FLAGVALUE_SILENTEXPORT = 0x002 const sal_Int32 Filter::FLAGVALUE_BROWSERPREFERED = 0x00400000L; // 4194304 const sal_Int32 Filter::FLAGVALUE_PREFERED = 0x10000000L; // 268435456 -/*----------------------------------------------- - 06.08.2003 09:47 ------------------------------------------------*/ -sal_Bool Filter::areFlagsSet(sal_Int32 nField, sal_Int32 nMask) -{ - return ((nField & nMask) == nMask); -} - -/*----------------------------------------------- - 06.08.2003 09:48 ------------------------------------------------*/ -void Filter::addFlags(sal_Int32& nField, sal_Int32 nFlags) -{ - nField |= nFlags; -} - -/*----------------------------------------------- - 06.08.2003 09:48 ------------------------------------------------*/ -void Filter::removeFlags(sal_Int32& nField, sal_Int32 nFlags) -{ - nField &= ~nFlags; -} - } // namespace constant } // namespace framework diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index c8d63d1741b4..731273d11fd4 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dispatchprovider.cxx,v $ - * $Revision: 1.37 $ + * $Revision: 1.37.82.1 $ * * This file is part of OpenOffice.org. * @@ -42,7 +42,6 @@ #include <dispatch/closedispatcher.hxx> #include <dispatch/menudispatcher.hxx> #include <dispatch/helpagentdispatcher.hxx> -#include <classes/targetfinder.hxx> #include <pattern/window.hxx> #include <threadhelp/transactionguard.hxx> @@ -50,6 +49,7 @@ #include <threadhelp/writeguard.hxx> #include <protocols.h> #include <services.h> +#include <targets.h> #include <general.h> //_________________________________________________________________________________________________________________ diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index 75d894928882..78b10a271e30 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: menudispatcher.cxx,v $ - * $Revision: 1.23 $ + * $Revision: 1.23.82.1 $ * * This file is part of OpenOffice.org. * @@ -161,219 +161,6 @@ DEFINE_XTYPEPROVIDER_4 ( MenuDispatcher , void SAL_CALL MenuDispatcher::dispatch( const URL& /*aURL*/ , const Sequence< PropertyValue >& /*seqProperties*/ ) throw( RuntimeException ) { - // PL: according to CD this is dead code - #if 0 - const char RESOURCE_URL[] = "private:resource/"; - const char ACCEL_PARAM[] = "?accel="; - - // Ready for multithreading - ResetableGuard aGuard( m_aLock ); - // Safe impossible cases - // Method not defined for all incoming parameter - LOG_ASSERT( impldbg_checkParameter_dispatch( aURL, seqProperties ), "MenuDispatcher::dispatch()\nInvalid parameter detected.\n" ) - - Reference< XFrame > xFrame( m_xOwnerWeak.get(), UNO_QUERY ); - LOG_ASSERT( !(xFrame.is()==sal_False), "MenuDispatcher::dispatch()\nDispatch failed ... can't get reference to owner!\n" ) - if( xFrame.is() == sal_True ) - { - OUString aResourceURLCommand( RTL_CONSTASCII_USTRINGPARAM( RESOURCE_URL )); - - if ( aURL.Complete.compareTo( aResourceURLCommand, aResourceURLCommand.getLength() ) == 0 ) - { - // check for the right url syntax - OUString aResourceString = aURL.Complete.copy( aResourceURLCommand.getLength() ); - - int nResIdIndex = aResourceString.indexOf( '/' ); - int nResAccIndex = aResourceString.indexOf( OUString( RTL_CONSTASCII_USTRINGPARAM( ACCEL_PARAM ))); - int nResId = 0; - MenuBar* pMenuBar = NULL; - ResMgr* pResManager = NULL; - ResMgr* pAccResManager= NULL; - ResMgr* pGlobalResMgr = NULL; - Accelerator* pAccel = NULL; - - aGuard.unlock(); - OGuard aSolarGuard( Application::GetSolarMutex() ); - { - // execute not thread safe VCL code - if ( nResIdIndex >= 0 ) - { - OUString aResourceFileName( aResourceString.copy( 0, nResIdIndex ) ); - pResManager = new ResMgr( aResourceFileName ); - } - - nResId = aResourceString.copy( nResIdIndex+1 ).toInt32(); - ResId aMenuBarResId( nResId, pResManager ); - aMenuBarResId.SetRT( RSC_MENU ); - - sal_Bool bAvailable = sal_False; - if (pResManager) - bAvailable = pResManager->IsAvailable(aMenuBarResId ); - else - { - pGlobalResMgr = Resource::GetResManager(); - if (!pGlobalResMgr) - { - LOG_WARNING("MenuDispatcher::dispatch()", "global res manager not set. break operation.") - return; - } - bAvailable = pGlobalResMgr->IsAvailable(aMenuBarResId ); - } - - if (bAvailable) - { - ResId* pAccResId = NULL; - - if (( nResAccIndex > 0 ) && (( nResAccIndex + sizeof( ACCEL_PARAM )) < aResourceString.getLength() )) - { - int index = nResAccIndex + sizeof( ACCEL_PARAM )-1; - OUString aAccResString = aResourceString.copy( index, aResourceString.getLength()-index ); - int nResIdIndex = aAccResString.indexOf( '/' )+1; - int nAccResId = 0; - - if ( nResIdIndex < aAccResString.getLength() ) - { - nAccResId = aAccResString.copy( nResIdIndex ).toInt32(); - aAccResString = aAccResString.copy( 0, nResIdIndex-1 ); - } - - if ( nAccResId > 0 && aAccResString.getLength() > 0 ) - { - pAccResManager = new ResMgr( aAccResString ); - if ( pAccResManager ) - { - pAccResId = new ResId( nAccResId, pAccResManager ); - pAccResId->SetRT( RSC_ACCEL ); - if ( !pAccResManager->IsAvailable( *pAccResId )) - { - delete pAccResId; - pAccResId = NULL; - } - } - } - } - - pMenuBar = new MenuBar( aMenuBarResId ); - pMenuBar->SetCloserHdl( LINK( this, MenuDispatcher, Close_Impl ) ); - - if ( pAccResId ) - { - pAccel = new Accelerator( *pAccResId ); - delete pAccResId; - } - } - - if (pResManager) - { - delete pResManager; - pResManager = NULL; - } - if (pAccResManager) - { - delete pAccResManager; - pAccResManager = NULL; - } - pGlobalResMgr = NULL; - } - - if ( pMenuBar ) - { - // set new menu bar if there is an old one delete it before! - if ( !impl_setMenuBar( pMenuBar, sal_True )) - { - delete pMenuBar; - } - else if ( pAccel ) - { - // set accelerators from resource - impl_setAccelerators( (Menu *)pMenuBar, *pAccel ); - delete pAccel; - } - } - } - else if ( aURL.Complete.compareToAscii( ".uno:load" ) == 0 ) - { -/* - aGuard.unlock(); - - // load menu from xml stream - Reference< ::com::sun::star::io::XInputStream > xInputStream; - int nPropertyCount = seqProperties.getLength(); - - for( int nProperty = 0; nProperty < nPropertyCount; ++nProperty ) - { - if( seqProperties[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream")) ) - seqProperties[nProperty].Value >>= xInputStream; - } - - MenuBar* pNewMenuBar = NULL; - - if ( xInputStream.is() ) - { - MenuConfiguration aMenuConfiguration( m_xFactory ); - - try - { - OGuard aSolarGuard( Application::GetSolarMutex() ); - { - pNewMenuBar = aMenuConfiguration.CreateMenuBarFromConfiguration( xInputStream ); - } - - if ( pNewMenuBar ) - impl_setMenuBar( pNewMenuBar ); - } - catch ( WrappedTargetException& ) - { - } - } - - impl_sendStatusEvent( xFrame, aURL.Complete, ( pNewMenuBar != 0 )); -*/ - } - else if ( aURL.Complete.compareToAscii( ".uno:save" ) == 0 ) - { -/* - // save menu to xml stream - int nPropertyCount = seqProperties.getLength(); - sal_Bool bStoreSuccessfull = sal_False; - Reference< ::com::sun::star::io::XOutputStream > xOutputStream; - - for( int nProperty = 0; nProperty < nPropertyCount; ++nProperty ) - { - if( seqProperties[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("OutputStream")) ) - seqProperties[nProperty].Value >>= xOutputStream; - } - - MenuConfiguration aMenuConfiguration( m_xFactory ); - MenuBar* pMenuBar = (MenuBar *)m_pMenuManager->GetMenu(); - aGuard.unlock(); - - if ( xOutputStream.is() && m_pMenuManager ) - { - OGuard aSolarGuard( Application::GetSolarMutex() ); - { - try - { - aMenuConfiguration.StoreMenuBar( pMenuBar, xOutputStream ); - bStoreSuccessfull = sal_True; - xOutputStream->flush(); - } - catch ( WrappedTargetException& ) - { - } - } - } - impl_sendStatusEvent( xFrame, aURL.Complete, bStoreSuccessfull ); -*/ - } - else if ( aURL.Complete.compareToAscii( ".uno:close" ) == 0 ) - { - // close menu - impl_setMenuBar( NULL ); - aGuard.unlock(); - } - } - #endif } //***************************************************************************************************************** @@ -486,43 +273,6 @@ void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeExce //***************************************************************************************************************** // private method -//***************************************************************************************************************** -void MenuDispatcher::impl_sendStatusEvent( const uno::Reference< XFrame >& xEventSource , - const OUString& sURL , - sal_Bool bLoadState ) -{ - // Get listener for given URL! - OInterfaceContainerHelper* pListenerForURL = m_aListenerContainer.getContainer( sURL ); - // Send messages to all listener. - // Do nothing, if there no listener or "getContainer()" works not correct! - if( pListenerForURL != NULL ) - { - // Build event for send to listener. - FeatureStateEvent aEvent; - aEvent.FeatureURL.Complete = sURL ; - aEvent.FeatureDescriptor = FEATUREDESCRIPTOR_LOADSTATE ; - aEvent.IsEnabled = bLoadState ; - aEvent.Requery = sal_False ; - aEvent.State <<= xEventSource ; - - // Send message to all listener on this URL. - OInterfaceIteratorHelper aIterator(*pListenerForURL); - while( aIterator.hasMoreElements() ) - { - try - { - ((XStatusListener*)aIterator.next())->statusChanged( aEvent ); - } - catch( RuntimeException& ) - { - aIterator.remove(); - } - } - } -} - -//***************************************************************************************************************** -// private method // // //***************************************************************************************************************** diff --git a/framework/source/helper/makefile.mk b/framework/source/helper/makefile.mk index 71e0a3d5ace5..29db41747e83 100644 --- a/framework/source/helper/makefile.mk +++ b/framework/source/helper/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.34 $ +# $Revision: 1.34.82.1 $ # # This file is part of OpenOffice.org. # @@ -45,8 +45,7 @@ CDEFS+=-DCOMPMOD_NAMESPACE=framework # --- Generate ----------------------------------------------------- -SLOFILES= $(SLO)$/timerhelper.obj \ - $(SLO)$/ocomponentaccess.obj \ +SLOFILES= $(SLO)$/ocomponentaccess.obj \ $(SLO)$/ocomponentenumeration.obj \ $(SLO)$/oframes.obj \ $(SLO)$/statusindicatorfactory.obj \ diff --git a/framework/source/helper/popupmenucontrollerbase.cxx b/framework/source/helper/popupmenucontrollerbase.cxx index f3552cfe79f1..0145de64d1b7 100644 --- a/framework/source/helper/popupmenucontrollerbase.cxx +++ b/framework/source/helper/popupmenucontrollerbase.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: popupmenucontrollerbase.cxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.82.1 $ * * This file is part of OpenOffice.org. * @@ -166,12 +166,6 @@ throw (::com::sun::star::uno::RuntimeException) m_aListenerContainer.removeInterface( ::getCppuType( (const css::uno::Reference< css::lang::XEventListener >*)NULL ), xListener ); } -// XStatusListener -void SAL_CALL PopupMenuControllerBase::statusChanged( const FeatureStateEvent& ) throw ( RuntimeException ) -{ - // must be implemented by sub class -} - // XEventListener void SAL_CALL PopupMenuControllerBase::disposing( const EventObject& ) throw ( RuntimeException ) { @@ -244,18 +238,6 @@ void SAL_CALL PopupMenuControllerBase::deactivate( const css::awt::MenuEvent& ) throw DisposedException(); } -// XPopupMenuController -void SAL_CALL PopupMenuControllerBase::setPopupMenu( const Reference< css::awt::XPopupMenu >& PopupMenu ) throw (RuntimeException) -{ - ResetableGuard aLock( m_aLock ); - - if ( m_bDisposed ) - throw DisposedException(); - - if ( m_xFrame.is() && !m_xPopupMenu.is() ) - m_xPopupMenu = PopupMenu; -} - void SAL_CALL PopupMenuControllerBase::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException ) { ResetableGuard aLock( m_aLock ); diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index d0a45bc5fbe8..a7c266db52b6 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: presethandler.hxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.82.1 $ * * This file is part of OpenOffice.org. * @@ -356,46 +356,6 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas const css::uno::Reference< css::embed::XStorage >& xDocumentRoot , const ::comphelper::Locale& aLocale = ::comphelper::Locale(::comphelper::Locale::X_NOTRANSLATE())); - //--------------------------------------- - /** @short return a list of all presets, which are available - in the share layer of the current configuration set. - - @descr Note: The returned strings are ALIAS names of the presets. - Because there is no special configuration, which map - ALIAS to real PRESET names, we strip the extension - of every file. Further all PRESET and ALIAS names - are used case insensitive! - - @return A list of all current available presets. - */ - css::uno::Sequence< ::rtl::OUString > getAllPresetNames() const; - - //--------------------------------------- - /** @short return a list of all targets, which are available - in the user layer of the current configuration set. - - @descr Note: The returned strings are ALIAS names of the targets. - Because there is no special configuration, which map - ALIAS to real TARGET names, we strip the extension - of every file. Further all TARGET and ALIAS names - are used case insensitive! - - @return A list of all current available targets. - */ - css::uno::Sequence< ::rtl::OUString > getAllTargetNames() const; - - //--------------------------------------- - /** @short can be used to know, if a required item exists. - - @descr Of course this operation can work only, if connectToResource() - was called before. - - @param sPreset/sTarget - specify the searched item. (ALIAS name!) - - @return TRUE if the requested item exists. - */ - sal_Bool existsPreset(const ::rtl::OUString& sPreset) const; sal_Bool existsTarget(const ::rtl::OUString& sTarget) const; //--------------------------------------- @@ -463,10 +423,6 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas sal_Bool bCreateIfMissing); //--------------------------------------- - /** TODO */ - void removeTarget(const ::rtl::OUString& sTarget); - - //--------------------------------------- /** @short do anything which is neccessary to flush all changes back to disk. diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx index 285665bbd28e..d8faf0e7eaf0 100644 --- a/framework/source/inc/accelerators/storageholder.hxx +++ b/framework/source/inc/accelerators/storageholder.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: storageholder.hxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.82.1 $ * * This file is part of OpenOffice.org. * @@ -209,13 +209,6 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas virtual void operator=(const StorageHolder& rCopy); //--------------------------------------- - /** @short TODO - */ - static css::uno::Reference< css::embed::XStorage > createTempStorageBasedOnFolder(const ::rtl::OUString& sFolder , - const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , - sal_Bool bReadOnly); - - //--------------------------------------- /** @short opens a sub element of the specified base storage. @descr First this method try to open the requested sub element diff --git a/framework/source/inc/constant/filter.hxx b/framework/source/inc/constant/filter.hxx index fe1678e86289..6a8ddeef3e42 100644 --- a/framework/source/inc/constant/filter.hxx +++ b/framework/source/inc/constant/filter.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: filter.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.82.1 $ * * This file is part of OpenOffice.org. * @@ -121,43 +121,6 @@ struct Filter //FREE! ... 0x00800000L static const sal_Int32 FLAGVALUE_PREFERED; - //_______________________________________________ - - /** @short checks if the given flag mask is set. - - @param nField - the flag field, which should be checked. - - @param nMask - these flags should be checked against the field. - - @return <TRUE/> if mask match to the given flag field. - */ - sal_Bool areFlagsSet(sal_Int32 nField, sal_Int32 nMask); - - //_______________________________________________ - - /** @short set the specified flags on the given field. - - @param nField - the flag field, which should be changed. - - @param nMask - this flags field should be set on the field. - */ - void addFlags(sal_Int32& nField, sal_Int32 nFlags); - - //_______________________________________________ - - /** @short remove the specified flags from the given field. - - @param nField - the flag field, which should be changed. - - @param nMask - this flags field should be removed from the field. - */ - void removeFlags(sal_Int32& nField, sal_Int32 nFlags); }; } // namespace constant diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx index 5fac3b4de35e..4b05a6a14378 100644 --- a/framework/source/inc/loadenv/targethelper.hxx +++ b/framework/source/inc/loadenv/targethelper.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: targethelper.hxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.82.1 $ * * This file is part of OpenOffice.org. * @@ -81,21 +81,6 @@ class TargetHelper //___________________________________________ - /** @short it checks, if the given target name is a well known special - one anyway and return a suitable enum value. - - @note An empty target is similar to "_self"! - - @param sTarget - the unknown target name, which should be checked. - - @return Returns a suitable enum value, which classify the - given target name. - */ - static ESpecialTarget classifyTarget(const ::rtl::OUString& sTarget); - - //___________________________________________ - /** @short it checks the given unknown target name, if it's the expected special one. diff --git a/framework/source/interaction/makefile.mk b/framework/source/interaction/makefile.mk index 48b5009ee2a5..1399335b6ca8 100644 --- a/framework/source/interaction/makefile.mk +++ b/framework/source/interaction/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.5.82.1 $ # # This file is part of OpenOffice.org. # @@ -46,7 +46,6 @@ CDEFS+=-DCOMPMOD_NAMESPACE=framework # --- Generate ----------------------------------------------------- SLOFILES= $(SLO)$/stillinteraction.obj \ - $(SLO)$/restricteduiinteraction.obj \ $(SLO)$/preventduplicateinteraction.obj # --- Targets ------------------------------------------------------ diff --git a/framework/source/interaction/restricteduiinteraction.cxx b/framework/source/interaction/restricteduiinteraction.cxx index f1f70c2f3c00..e69de29bb2d1 100644 --- a/framework/source/interaction/restricteduiinteraction.cxx +++ b/framework/source/interaction/restricteduiinteraction.cxx @@ -1,247 +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.cxx,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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_framework.hxx" - -#include "interaction/restricteduiinteraction.hxx" - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ -#include <threadhelp/readguard.hxx> -#include <threadhelp/writeguard.hxx> -#include <macros/generic.hxx> -#include <macros/debug.hxx> -#include <services.h> - -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ -#include <com/sun/star/task/XInteractionAbort.hpp> -#include <com/sun/star/task/XInteractionRetry.hpp> -#include <com/sun/star/ucb/InteractiveIOException.hpp> -#include <com/sun/star/ucb/InteractiveNetworkException.hpp> -#include <com/sun/star/ucb/InteractiveCHAOSException.hpp> -#include <com/sun/star/ucb/InteractiveWrongMediumException.hpp> -#include <com/sun/star/java/WrongJavaVersionException.hpp> -#include <com/sun/star/sync2/BadPartnershipException.hpp> - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ -#include <vcl/svapp.hxx> - -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - -namespace framework{ - -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - -DEFINE_XINTERFACE_2( RestrictedUIInteraction , - OWeakObject , - DIRECT_INTERFACE(css::lang::XTypeProvider ) , - DIRECT_INTERFACE(css::task::XInteractionHandler) ) - -DEFINE_XTYPEPROVIDER_2( RestrictedUIInteraction , - css::lang::XTypeProvider , - css::task::XInteractionHandler ) - -//_________________________________________________________________________________________________________________ - -RestrictedUIInteraction::RestrictedUIInteraction( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , - sal_Int32 nMaxRetry ) - : ThreadHelpBase ( &Application::GetSolarMutex() ) - , ::cppu::OWeakObject ( ) - , m_aRequest ( ) - , m_nIORetry ( 0 ) - , m_nNetworkRetry ( 0 ) - , m_nChaosRetry ( 0 ) - , m_nWrongMediumRetry ( 0 ) - , m_nWrongJavaVersionRetry( 0 ) - , m_nBadPartnershipRetry ( 0 ) - , m_nMaxRetry ( nMaxRetry ) -{ - m_xGenericUIHandler = css::uno::Reference< css::task::XInteractionHandler >( - xSMGR->createInstance(IMPLEMENTATIONNAME_UIINTERACTIONHANDLER), - css::uno::UNO_QUERY); -} - -//_________________________________________________________________________________________________________________ - -void SAL_CALL RestrictedUIInteraction::handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) throw( css::uno::RuntimeException ) -{ - // safe the request for outside analyzing everytime! - css::uno::Any aRequest = xRequest->getRequest(); - /* SAFE { */ - WriteGuard aWriteLock(m_aLock); - m_aRequest = aRequest; - aWriteLock.unlock(); - /* } SAFE */ - - // analyze the request - // We need XAbort as possible continuation as minimum! - // But we can use retry too, if it exist ... - css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > lContinuations = xRequest->getContinuations(); - css::uno::Reference< css::task::XInteractionAbort > xAbort; - css::uno::Reference< css::task::XInteractionRetry > xRetry; - - sal_Int32 nCount=lContinuations.getLength(); - for (sal_Int32 i=0; i<nCount; ++i) - { - if ( ! xAbort.is() ) - xAbort = css::uno::Reference< css::task::XInteractionAbort >( lContinuations[i], css::uno::UNO_QUERY ); - - if ( ! xRetry.is() ) - xRetry = css::uno::Reference< css::task::XInteractionRetry >( lContinuations[i], css::uno::UNO_QUERY ); - } - - // differ between interactions for abort (io error) - // and other ones (ambigous filter) which can be forwarded - // to the generic UI handler - - // These interactions seams to inform the user only. - // They can't solve any conflict realy. - // But may some of them supports a retry. Then we use it. - // Otherwhise we abort it - so the load request will fail. - css::ucb::InteractiveIOException aIoException ; - css::ucb::InteractiveNetworkException aNetworkException ; - css::ucb::InteractiveCHAOSException aChaosException ; - css::ucb::InteractiveWrongMediumException aWrongMediumException ; - css::java::WrongJavaVersionException aWrongJavaVersionException ; - css::sync2::BadPartnershipException aBadPartnershipException ; - - sal_Int32 nTriesBefore = 0 ; - sal_Bool bForward = sal_True; - - /* SAFE { */ - aWriteLock.lock(); - - if (aRequest >>= aIoException) - { - ++m_nIORetry; - nTriesBefore = m_nIORetry; - bForward = sal_False; - } - else - if (aRequest >>= aNetworkException) - { - ++m_nNetworkRetry; - nTriesBefore = m_nNetworkRetry; - bForward = sal_False; - } - else - if (aRequest >>= aChaosException) - { - ++m_nChaosRetry; - nTriesBefore = m_nChaosRetry; - bForward = sal_False; - } - else - if (aRequest >>= aWrongMediumException) - { - ++m_nWrongMediumRetry; - nTriesBefore = m_nWrongMediumRetry; - bForward = sal_False; - } - else - if (aRequest >>= aWrongJavaVersionException) - { - ++m_nWrongJavaVersionRetry; - nTriesBefore = m_nWrongJavaVersionRetry; - bForward = sal_False; - } - else - if (aRequest >>= aBadPartnershipException) - { - ++m_nBadPartnershipRetry; - nTriesBefore = m_nBadPartnershipRetry; - bForward = sal_False; - } - - // By the way - use the lock to get threadsafe member copies. - sal_Int32 nMaxRetry = m_nMaxRetry; - css::uno::Reference< css::task::XInteractionHandler > xHandler = m_xGenericUIHandler; - - aWriteLock.unlock(); - /* } SAFE */ - - LOG_ASSERT(xHandler.is(), "RestrictedUIInteraction::handle()\nMiss generic UI handler to delegate request! Will do nothing ...") - - // It's a interaction which shouldn't be shown at the UI. - // Look for possible retries and use it. Otherwhise abort it. - if ( !bForward ) - { - LOG_ASSERT(xAbort.is(), "RestrictedUIInteraction::handle()\nMiss \"Abort\" continuation as minimum. Will do nothing ... ") - - // It's a interaction which shouldn't be shown at the UI. - // Look for possible retries and use it. Otherwhise abort it. - if (nTriesBefore <= nMaxRetry && xRetry.is()) - xRetry->select(); - else - if (xAbort.is()) - xAbort->select(); - } - else - // Otherwhise the request seams to show real dialogs to solve the conflict. - // Delegate it to the generic UI handler. - if (xHandler.is()) - xHandler->handle(xRequest); -} - -//_________________________________________________________________________________________________________________ - -css::uno::Any RestrictedUIInteraction::getRequest() const -{ - /* SAFE { */ - ReadGuard aReadLock(m_aLock); - return m_aRequest; - /* } SAFE */ -} - -//_________________________________________________________________________________________________________________ - -sal_Bool RestrictedUIInteraction::wasUsed() const -{ - /* SAFE { */ - ReadGuard aReadLock(m_aLock); - return m_aRequest.hasValue(); - /* } SAFE */ -} - -} // namespace framework diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index 85caa85b24ca..a72d2516d8b8 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: job.cxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.12.82.1 $ * * This file is part of OpenOffice.org. * @@ -200,22 +200,6 @@ void Job::setJobData( const JobData& aData ) /* } SAFE */ } -JobData Job::getJobData() -{ - /* SAFE { */ - ReadGuard aReadLock(m_aLock); - return m_aJobCfg; - /* } SAFE */ -} - -JobData& Job::getJobDataRef() -{ - /* SAFE { */ - ReadGuard aReadLock(m_aLock); - return m_aJobCfg; - /* } SAFE */ -} - //________________________________ /** @short runs the job diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index b6776ec27130..77bfe23c4ea2 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: jobdata.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.82.1 $ * * This file is part of OpenOffice.org. * @@ -443,16 +443,6 @@ JobData::EEnvironment JobData::getEnvironment() const //________________________________ -::rtl::OUString JobData::getAlias() const -{ - /* SAFE { */ - ReadGuard aReadLock(m_aLock); - return m_sAlias; - /* } SAFE */ -} - -//________________________________ - ::rtl::OUString JobData::getService() const { /* SAFE { */ @@ -507,16 +497,6 @@ css::uno::Sequence< css::beans::NamedValue > JobData::getConfig() const } //________________________________ - -JobResult JobData::getResult() const -{ - /* SAFE { */ - ReadGuard aReadLock(m_aLock); - return m_aLastExecutionResult; - /* } SAFE */ -} - -//________________________________ /** @short return information, if this job is part of the global configuration package org.openoffice.Office.Jobs diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx index dac988d2ce4e..66b4eff3ecf2 100644 --- a/framework/source/jobs/jobresult.cxx +++ b/framework/source/jobs/jobresult.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: jobresult.cxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.82.1 $ * * This file is part of OpenOffice.org. * @@ -253,16 +253,6 @@ css::uno::Sequence< css::beans::NamedValue > JobResult::getArguments() const //________________________________ -sal_Bool JobResult::getDeactivate() const -{ - /* SAFE { */ - ReadGuard aReadLock(m_aLock); - return m_bDeactivate; - /* } SAFE */ -} - -//________________________________ - css::frame::DispatchResultEvent JobResult::getDispatchResult() const { /* SAFE { */ diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx index 4efbad5569e0..ce7d9c57629e 100644 --- a/framework/source/jobs/joburl.cxx +++ b/framework/source/jobs/joburl.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: joburl.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.82.1 $ * * This file is part of OpenOffice.org. * @@ -181,24 +181,6 @@ sal_Bool JobURL::getEvent( /*OUT*/ ::rtl::OUString& sEvent ) const } //________________________________ - -sal_Bool JobURL::getEventArgs( /*OUT*/ ::rtl::OUString& sEventArgs ) const -{ - /* SAFE { */ - ReadGuard aReadLock(m_aLock); - - sEventArgs = ::rtl::OUString(); - sal_Bool bSet = ((m_eRequest & E_EVENT) == E_EVENT); - if (bSet) - sEventArgs = m_sEventArgs; - - aReadLock.unlock(); - /* } SAFE */ - - return bSet; -} - -//________________________________ /** @short get the alias item of this job URL @descr Because the three possible parts of such URL (event, alias, service) @@ -232,24 +214,6 @@ sal_Bool JobURL::getAlias( /*OUT*/ ::rtl::OUString& sAlias ) const } //________________________________ - -sal_Bool JobURL::getAliasArgs( /*OUT*/ ::rtl::OUString& sAliasArgs ) const -{ - /* SAFE { */ - ReadGuard aReadLock(m_aLock); - - sAliasArgs = ::rtl::OUString(); - sal_Bool bSet = ((m_eRequest & E_ALIAS) == E_ALIAS); - if (bSet) - sAliasArgs = m_sAliasArgs; - - aReadLock.unlock(); - /* } SAFE */ - - return bSet; -} - -//________________________________ /** @short get the service item of this job URL @descr Because the three possible parts of such URL (event, service, service) @@ -283,24 +247,6 @@ sal_Bool JobURL::getService( /*OUT*/ ::rtl::OUString& sService ) const } //________________________________ - -sal_Bool JobURL::getServiceArgs( /*OUT*/ ::rtl::OUString& sServiceArgs ) const -{ - /* SAFE { */ - ReadGuard aReadLock(m_aLock); - - sServiceArgs = ::rtl::OUString(); - sal_Bool bSet = ((m_eRequest & E_SERVICE) == E_SERVICE); - if (bSet) - sServiceArgs = m_sServiceArgs; - - aReadLock.unlock(); - /* } SAFE */ - - return bSet; -} - -//________________________________ /** @short searches for a special identifier in the given string and split it @descr If the given identifier could be found at the beginning of the given string, @@ -655,6 +601,60 @@ void JobURL::impldbg_checkURL( /*IN*/ const sal_Char* pURL , return sBuffer.makeStringAndClear(); } +//________________________________ + +sal_Bool JobURL::getServiceArgs( /*OUT*/ ::rtl::OUString& sServiceArgs ) const +{ + /* SAFE { */ + ReadGuard aReadLock(m_aLock); + + sServiceArgs = ::rtl::OUString(); + sal_Bool bSet = ((m_eRequest & E_SERVICE) == E_SERVICE); + if (bSet) + sServiceArgs = m_sServiceArgs; + + aReadLock.unlock(); + /* } SAFE */ + + return bSet; +} + +//________________________________ + +sal_Bool JobURL::getEventArgs( /*OUT*/ ::rtl::OUString& sEventArgs ) const +{ + /* SAFE { */ + ReadGuard aReadLock(m_aLock); + + sEventArgs = ::rtl::OUString(); + sal_Bool bSet = ((m_eRequest & E_EVENT) == E_EVENT); + if (bSet) + sEventArgs = m_sEventArgs; + + aReadLock.unlock(); + /* } SAFE */ + + return bSet; +} + +//________________________________ + +sal_Bool JobURL::getAliasArgs( /*OUT*/ ::rtl::OUString& sAliasArgs ) const +{ + /* SAFE { */ + ReadGuard aReadLock(m_aLock); + + sAliasArgs = ::rtl::OUString(); + sal_Bool bSet = ((m_eRequest & E_ALIAS) == E_ALIAS); + if (bSet) + sAliasArgs = m_sAliasArgs; + + aReadLock.unlock(); + /* } SAFE */ + + return bSet; +} + #endif // ENABLE_COMPONENT_SELF_CHECK } // namespace framework diff --git a/framework/source/loadenv/targethelper.cxx b/framework/source/loadenv/targethelper.cxx index 865db7176438..dea75007e568 100644 --- a/framework/source/loadenv/targethelper.cxx +++ b/framework/source/loadenv/targethelper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: targethelper.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.82.1 $ * * This file is part of OpenOffice.org. * @@ -47,44 +47,6 @@ namespace framework{ // declarations /*----------------------------------------------- - 05.08.2003 09:12 ------------------------------------------------*/ -TargetHelper::ESpecialTarget TargetHelper::classifyTarget(const ::rtl::OUString& sTarget) -{ - if ( - (!sTarget.getLength() ) || - (sTarget.equals(SPECIALTARGET_SELF)) - ) - return E_SELF; - - if (sTarget.equals(SPECIALTARGET_PARENT)) - return E_PARENT; - - if (sTarget.equals(SPECIALTARGET_TOP)) - return E_TOP; - - if (sTarget.equals(SPECIALTARGET_BLANK)) - return E_BLANK; - - if (sTarget.equals(SPECIALTARGET_DEFAULT)) - return E_DEFAULT; - - if (sTarget.equals(SPECIALTARGET_BEAMER)) - return E_BEAMER; - - if (sTarget.equals(SPECIALTARGET_MENUBAR)) - return E_MENUBAR; - - if (sTarget.equals(SPECIALTARGET_HELPAGENT)) - return E_HELPAGENT; - - if (sTarget.equals(SPECIALTARGET_HELPTASK)) - return E_HELPTASK; - - return E_NOT_SPECIAL; -} - -/*----------------------------------------------- 05.08.2003 09:08 -----------------------------------------------*/ sal_Bool TargetHelper::matchSpecialTarget(const ::rtl::OUString& sCheckTarget , diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index acbfb5b1aafb..b1ede5fce89e 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: desktop.cxx,v $ - * $Revision: 1.64 $ + * $Revision: 1.64.80.1 $ * * This file is part of OpenOffice.org. * @@ -50,7 +50,6 @@ #include <dispatch/interceptionhelper.hxx> #endif #include <classes/taskcreator.hxx> -#include <classes/targetfinder.hxx> #include <threadhelp/transactionguard.hxx> #include <threadhelp/writeguard.hxx> #include <threadhelp/readguard.hxx> diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 9bf33707f809..427c2b4dc6d6 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -8,7 +8,7 @@ * * $RCSfile: frame.cxx,v $ * - * $Revision: 1.106 $ + * $Revision: 1.106.80.1 $ * * This file is part of OpenOffice.org. * @@ -47,7 +47,6 @@ #include <helper/oframes.hxx> #include <helper/statusindicatorfactory.hxx> #include <helper/titlehelper.hxx> -#include <classes/targetfinder.hxx> #include <classes/droptargetlistener.hxx> #include <classes/taskcreator.hxx> #include <loadenv/targethelper.hxx> @@ -2689,7 +2688,6 @@ css::uno::Any SAL_CALL Frame::impl_getPropertyValue(const ::rtl::OUString& /*sPr switch (nHandle) { case FRAME_PROPHANDLE_TITLE : - //aValue <<= implts_getTitleFromWindow(); aValue <<= getTitle (); break; @@ -2847,67 +2845,6 @@ void Frame::implts_resizeComponentWindow() } /*-****************************************************************************************************//** - @short helper to set/get a title on/from our container window - @descr We need this impl method to make it threadsafe. Another reason is - we can't hold this value - by using an own member ... because if somewhere change the title by using the vcl-window directly ... - we never get this information! That's why we write and rewad this property direct via toolkit and vcl! - - @seealso interface XVclWindowPeer - - @param "sTitle", new value to set it on our window - @return Current title of our window. - - @onerror We do nothing or return an empty value. -*//*-*****************************************************************************************************/ -void Frame::implts_setTitleOnWindow( const ::rtl::OUString& sTitle ) -{ - /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ - // Look for rejected calls. - TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); - - /* SAFE AREA ----------------------------------------------------------------------------------------------- */ - // Make snapshot of neccessary members and release lock. - ReadGuard aReadLock( m_aLock ); - css::uno::Reference< css::awt::XVclWindowPeer > xContainerWindow( m_xContainerWindow, css::uno::UNO_QUERY ); - aReadLock.unlock(); - /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ - - // Use non well known feature of toolkit to set property on window! - // -> cast window to XVclWindowPeer interface and call setProperty() ... - if( xContainerWindow.is() == sal_True ) - { - css::uno::Any aValue; - aValue <<= sTitle; - xContainerWindow->setProperty( DECLARE_ASCII("Title"), aValue ); - } -} - -//***************************************************************************************************************** -const ::rtl::OUString Frame::implts_getTitleFromWindow() const -{ - /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ - // Look for rejected calls. - TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); - - /* SAFE AREA ----------------------------------------------------------------------------------------------- */ - // Make snapshot of neccessary members and release lock. - ReadGuard aReadLock( m_aLock ); - css::uno::Reference< css::awt::XVclWindowPeer > xContainerWindow( m_xContainerWindow, css::uno::UNO_QUERY ); - aReadLock.unlock(); - /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ - - // Use non well known feature of toolkit to get property from window! - // -> cast window to XVclWindowPeer interface and call getProperty() ... - ::rtl::OUString sTitle; - if( xContainerWindow.is() == sal_True ) - { - css::uno::Any aValue = xContainerWindow->getProperty( DECLARE_ASCII("Title") ); - aValue >>= sTitle; - } - return sTitle; -} - -/*-****************************************************************************************************//** @short helper to set icon on our container window (if it is a system window!) @descr We use our internal set controller (if it exist) to specify which factory he represanted. These information can be used to find right icon. But our controller can say it us directly diff --git a/framework/source/uiconfiguration/graphicnameaccess.cxx b/framework/source/uiconfiguration/graphicnameaccess.cxx index b51fbdf8bea7..8fae61c88d3e 100644 --- a/framework/source/uiconfiguration/graphicnameaccess.cxx +++ b/framework/source/uiconfiguration/graphicnameaccess.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: graphicnameaccess.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.82.1 $ * * This file is part of OpenOffice.org. * @@ -60,11 +60,6 @@ void GraphicNameAccess::addElement( const rtl::OUString& rName, const uno::Refer m_aNameToElementMap.insert( NameGraphicHashMap::value_type( rName, rElement )); } -sal_uInt32 GraphicNameAccess::size() const -{ - return m_aNameToElementMap.size(); -} - // XNameAccess uno::Any SAL_CALL GraphicNameAccess::getByName( const ::rtl::OUString& aName ) throw( container::NoSuchElementException, diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx index 560dc26be784..3ec26805de71 100644 --- a/framework/source/uiconfiguration/imagemanager.cxx +++ b/framework/source/uiconfiguration/imagemanager.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: imagemanager.cxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.16.82.1 $ * * This file is part of OpenOffice.org. * @@ -500,13 +500,6 @@ throw (::com::sun::star::uno::RuntimeException) implts_initialize(); } -sal_Bool ImageManager::hasStorage() -throw (::com::sun::star::uno::RuntimeException) -{ - ResetableGuard aLock( m_aLock ); - return ( m_xUserConfigStorage.is() ); -} - // XInitialization void SAL_CALL ImageManager::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) { diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index e37ce5366d82..f2569e211662 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: uicategorydescription.cxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.34.1 $ * * This file is part of OpenOffice.org. * @@ -147,7 +147,6 @@ class ConfigurationAccess_UICategory : // interfaces Any getUINameFromID( const rtl::OUString& rId ); Any getUINameFromCache( const rtl::OUString& rId ); Sequence< rtl::OUString > getAllIds(); - void resetCache(); sal_Bool fillCache(); private: @@ -268,12 +267,6 @@ throw ( RuntimeException ) return sal_True; } -void ConfigurationAccess_UICategory::resetCache() -{ - m_aIdCache.clear(); - m_bCacheFilled = sal_False; -} - sal_Bool ConfigurationAccess_UICategory::fillCache() { RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ConfigurationAccess_UICategory::fillCache" ); diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index d51f46c78cb5..8dc43db5a55f 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: complextoolbarcontroller.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.26.1 $ * * This file is part of OpenOffice.org. * @@ -345,11 +345,6 @@ uno::Reference< frame::XDispatch > ComplexToolbarController::getDispatchFromComm // -------------------------------------------------------- -void ComplexToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& ) -{ - // must be implemented by sub class! -} - const ::com::sun::star::util::URL& ComplexToolbarController::getInitializedURL() { if ( m_aURL.Complete.getLength() == 0 ) diff --git a/framework/source/uielement/logoimagestatusbarcontroller.cxx b/framework/source/uielement/logoimagestatusbarcontroller.cxx index aebf65945b35..963c652251fd 100644 --- a/framework/source/uielement/logoimagestatusbarcontroller.cxx +++ b/framework/source/uielement/logoimagestatusbarcontroller.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: logoimagestatusbarcontroller.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.82.1 $ * * This file is part of OpenOffice.org. * @@ -61,12 +61,6 @@ DEFINE_XSERVICEINFO_MULTISERVICE ( LogoImageStatusbarController DEFINE_INIT_SERVICE ( LogoImageStatusbarController, {} ) -LogoImageStatusbarController::LogoImageStatusbarController() -{ - Image aImage( FwkResId( RID_IMAGE_STATUSBAR_LOGO )); - m_aLogoImage = aImage; -} - LogoImageStatusbarController::LogoImageStatusbarController( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) : svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), rtl::OUString(), 0 ) { diff --git a/framework/source/uielement/logotextstatusbarcontroller.cxx b/framework/source/uielement/logotextstatusbarcontroller.cxx index 89ccb5c32e03..efba92bcfd1d 100644 --- a/framework/source/uielement/logotextstatusbarcontroller.cxx +++ b/framework/source/uielement/logotextstatusbarcontroller.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: logotextstatusbarcontroller.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.82.1 $ * * This file is part of OpenOffice.org. * @@ -62,11 +62,6 @@ DEFINE_XSERVICEINFO_MULTISERVICE ( LogoTextStatusbarController DEFINE_INIT_SERVICE ( LogoTextStatusbarController, {} ) -LogoTextStatusbarController::LogoTextStatusbarController() -{ - m_aLogoText = String( FwkResId( STR_STATUSBAR_LOGOTEXT )); -} - LogoTextStatusbarController::LogoTextStatusbarController( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) : svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), rtl::OUString(), 0 ) { diff --git a/framework/source/uielement/simpletextstatusbarcontroller.cxx b/framework/source/uielement/simpletextstatusbarcontroller.cxx index 5daca50e99de..0fa26733f2fb 100644 --- a/framework/source/uielement/simpletextstatusbarcontroller.cxx +++ b/framework/source/uielement/simpletextstatusbarcontroller.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: simpletextstatusbarcontroller.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.82.1 $ * * This file is part of OpenOffice.org. * @@ -62,10 +62,6 @@ DEFINE_XSERVICEINFO_MULTISERVICE ( SimpleTextStatusbarController DEFINE_INIT_SERVICE ( SimpleTextStatusbarController, {} ) -SimpleTextStatusbarController::SimpleTextStatusbarController() -{ -} - SimpleTextStatusbarController::SimpleTextStatusbarController( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) : svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), rtl::OUString(), 0 ) { diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index 9d325ddcb830..b73e85f5dd68 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: statusbarwrapper.cxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.34.1 $ * * This file is part of OpenOffice.org. * @@ -89,15 +89,6 @@ StatusBarWrapper::~StatusBarWrapper() { } -const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& StatusBarWrapper::getServiceFactory() -{ - ResetableGuard aLock( m_aLock ); - if ( m_bDisposed ) - throw DisposedException(); - - return m_xServiceFactory; -} - void SAL_CALL StatusBarWrapper::dispose() throw (::com::sun::star::uno::RuntimeException) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index 04703810c56c..1ac950ec463c 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: uicommanddescription.cxx,v $ - * $Revision: 1.17 $ + * $Revision: 1.17.34.1 $ * * This file is part of OpenOffice.org. * @@ -175,7 +175,6 @@ class ConfigurationAccess_UICommand : // interfaces void fillInfoFromResult( CmdToInfoMap& rCmdInfo, const rtl::OUString& aLabel ); Any getUILabelFromCommand( const rtl::OUString& rCommandURL ); Sequence< rtl::OUString > getAllCommands(); - void resetCache(); sal_Bool fillCache(); sal_Bool addGenericInfoToCache(); @@ -391,13 +390,6 @@ Any ConfigurationAccess_UICommand::getSequenceFromCache( const ::rtl::OUString& return Any(); } -void ConfigurationAccess_UICommand::resetCache() -{ - m_aCmdInfoCache.clear(); - m_bCacheFilled = sal_False; - m_bGenericDataRetrieved = sal_False; -} - sal_Bool ConfigurationAccess_UICommand::fillCache() { RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ConfigurationAccess_UICommand::fillCache" ); diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx index 92c3a878b179..d93330b83701 100644 --- a/framework/source/uifactory/uielementfactorymanager.cxx +++ b/framework/source/uifactory/uielementfactorymanager.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: uielementfactorymanager.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.12.1 $ * * This file is part of OpenOffice.org. * @@ -113,7 +113,6 @@ class ConfigurationAccess_UIElementFactoryManager : // interfaces rtl::OUString getFactorySpecifierFromTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule ) const; void addFactorySpecifierToTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule, const rtl::OUString& aServiceSpecifier ); void removeFactorySpecifierFromTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule ); - Sequence< rtl::OUString > getAllFactories() const; Sequence< Sequence< PropertyValue > > getFactoriesDescription() const; // container.XContainerListener @@ -258,24 +257,6 @@ void ConfigurationAccess_UIElementFactoryManager::removeFactorySpecifierFromType m_aUIElementFactoryManagerMap.erase( aHashKey ); } -Sequence< rtl::OUString > ConfigurationAccess_UIElementFactoryManager::getAllFactories() const -{ - // SAFE - ResetableGuard aLock( m_aLock ); - - Sequence< rtl::OUString > aSeq( m_aUIElementFactoryManagerMap.size() ); - - sal_Int32 nIndex = 0; - UIElementFactoryManagerMap::const_iterator pIter = m_aUIElementFactoryManagerMap.begin(); - while ( pIter != m_aUIElementFactoryManagerMap.end() ); - { - aSeq[nIndex++] = pIter->second; - ++pIter; - } - - return aSeq; -} - Sequence< Sequence< PropertyValue > > ConfigurationAccess_UIElementFactoryManager::getFactoriesDescription() const { // SAFE diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk index 6fb93ee8a784..a6c3d2137385 100644 --- a/framework/util/makefile.mk +++ b/framework/util/makefile.mk @@ -1,14 +1,14 @@ #************************************************************************* # # 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: makefile.mk,v $ # -# $Revision: 1.124 $ +# $Revision: 1.124.26.1 $ # # This file is part of OpenOffice.org. # @@ -216,7 +216,6 @@ SHL4OBJS= \ $(SLO)$/backingwindow.obj \ $(SLO)$/buttontoolbarcontroller.obj \ $(SLO)$/closedispatcher.obj \ - $(SLO)$/colorlistener.obj \ $(SLO)$/comboboxtoolbarcontroller.obj \ $(SLO)$/complextoolbarcontroller.obj \ $(SLO)$/configaccess.obj \ @@ -293,7 +292,6 @@ SHL4OBJS= \ $(SLO)$/progressbarwrapper.obj \ $(SLO)$/recentfilesmenucontroller.obj \ $(SLO)$/registerservices.obj \ - $(SLO)$/restricteduiinteraction.obj \ $(SLO)$/servicehandler.obj \ $(SLO)$/sessionlistener.obj \ $(SLO)$/simpletextstatusbarcontroller.obj \ @@ -309,11 +307,9 @@ SHL4OBJS= \ $(SLO)$/stillinteraction.obj \ $(SLO)$/storageholder.obj \ $(SLO)$/tagwindowasmodified.obj \ - $(SLO)$/targetfinder.obj \ $(SLO)$/targethelper.obj \ $(SLO)$/taskcreator.obj \ $(SLO)$/taskcreatorsrv.obj \ - $(SLO)$/timerhelper.obj \ $(SLO)$/titlebarupdate.obj \ $(SLO)$/togglebuttontoolbarcontroller.obj \ $(SLO)$/toolbarcontrollerfactory.obj\ @@ -389,7 +385,7 @@ SHL5DEPN= $(SHL1IMPLIBN) $(SHL1TARGETN) DEF5NAME= $(SHL5TARGET) SHL5VERSIONMAP= exports.map - + RESLIB1NAME= fwe RESLIB1IMAGES= $(PRJ)$/res RESLIB1SRSFILES= $(SRS)$/fwk_classes.srs \ diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx index d730d2949388..eaad0adab79d 100644 --- a/sfx2/inc/sfx2/mnumgr.hxx +++ b/sfx2/inc/sfx2/mnumgr.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: mnumgr.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.84.1 $ * * This file is part of OpenOffice.org. * @@ -105,6 +105,11 @@ private: DECL_LINK( SelectHdl, void * ); Menu* pSVMenu; +private:
+ // only declared, but not defined: don't allow copying
+ SfxPopupMenuManager( const SfxPopupMenuManager& );
+ SfxPopupMenuManager& operator=( const SfxPopupMenuManager& );
+
public: SfxPopupMenuManager( const ResId&, SfxBindings& ); SfxPopupMenuManager( PopupMenu*, SfxBindings& ); diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 932b74dd1335..87822c728aa8 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: docfile.cxx,v $ - * $Revision: 1.204 $ + * $Revision: 1.203.50.2 $ * * This file is part of OpenOffice.org. * @@ -3261,8 +3261,9 @@ void SfxMedium::SetStorage_Impl( const uno::Reference < embed::XStorage >& rStor SfxItemSet* SfxMedium::GetItemSet() const { - if( !pSet ) ((SfxMedium*)this)->pSet = - new SfxAllItemSet( SFX_APP()->GetPool() ); + // this method *must* return an ItemSet, returning NULL can cause crashes + if( !pSet ) + ((SfxMedium*)this)->pSet = new SfxAllItemSet( SFX_APP()->GetPool() ); return pSet; } //---------------------------------------------------------------- diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 76185e3f9a3c..4fb14464e770 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: doctemplates.cxx,v $ - * $Revision: 1.43 $ + * $Revision: 1.42.84.2 $ * * This file is part of OpenOffice.org. * @@ -158,6 +158,26 @@ class DocTemplates_EntryData_Impl; class GroupData_Impl; //============================================================================= +#include <com/sun/star/task/XInteractionHandler.hpp> +#include <com/sun/star/ucb/XProgressHandler.hpp> +#include <com/sun/star/ucb/XCommandEnvironment.hpp> + +class TplTaskEnvironment : public ::cppu::WeakImplHelper1< ucb::XCommandEnvironment > +{ + uno::Reference< task::XInteractionHandler > m_xInteractionHandler; + uno::Reference< ucb::XProgressHandler > m_xProgressHandler; + +public: + TplTaskEnvironment( const uno::Reference< task::XInteractionHandler>& rxInteractionHandler ) + : m_xInteractionHandler( rxInteractionHandler ) + {} + + virtual uno::Reference<task::XInteractionHandler> SAL_CALL getInteractionHandler() throw (uno::RuntimeException) + { return m_xInteractionHandler; } + + virtual uno::Reference<ucb::XProgressHandler> SAL_CALL getProgressHandler() throw (uno::RuntimeException) + { return m_xProgressHandler; } +}; class SfxDocTplService_Impl { @@ -383,6 +403,13 @@ DECLARE_LIST( GroupList_Impl, GroupData_Impl* ) //----------------------------------------------------------------------------- void SfxDocTplService_Impl::init_Impl() { + uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); + if ( xFactory.is() ) + { + uno::Reference < task::XInteractionHandler > xInteractionHandler( xFactory->createInstance( DEFINE_CONST_UNICODE("com.sun.star.task.InteractionHandler") ), uno::UNO_QUERY ); + maCmdEnv = new TplTaskEnvironment( xInteractionHandler ); + } + ::osl::ClearableMutexGuard aGuard( maMutex ); sal_Bool bIsInitialized = sal_False; sal_Bool bNeedsUpdate = sal_False; @@ -1263,7 +1290,7 @@ uno::Sequence< beans::StringPair > SfxDocTplService_Impl::ReadUINamesForTemplate // TODO/LATER: Use hashmap in future uno::Sequence< beans::StringPair > aUINames; - if ( Content::create( aLocObj.GetMainURL( INetURLObject::NO_DECODE ), maCmdEnv, aLocContent ) ) + if ( Content::create( aLocObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference < ucb::XCommandEnvironment >(), aLocContent ) ) { try { diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 5c738bfd12d3..067c7ec6369d 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: objstor.cxx,v $ - * $Revision: 1.212 $ + * $Revision: 1.212.44.1 $ * * This file is part of OpenOffice.org. * @@ -2427,7 +2427,7 @@ sal_Bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs ) // copy the original itemset, but remove the "version" item, because pMediumTmp // is a new medium "from scratch", so no version should be stored into it - SfxItemSet* pSet = pRetrMedium->GetItemSet() ? new SfxAllItemSet(*pRetrMedium->GetItemSet()): 0; + SfxItemSet* pSet = new SfxAllItemSet(*pRetrMedium->GetItemSet()); pSet->ClearItem( SID_VERSION ); // create a medium as a copy; this medium is only for writingm, because it uses the same name as the original one diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index d0b8842b0fe6..a8fcc83263c5 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -2893,7 +2893,7 @@ void SfxViewFrame::StateView_Impl case SID_NEWWINDOW: { - if ( !GetViewShell()->NewWindowAllowed() && !pDocSh->HasName() ) + if ( !GetViewShell()->NewWindowAllowed() /* && !pDocSh->HasName() */ ) rSet.DisableItem( nWhich ); else { diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 0d496c7ccfe7..73e062167e00 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: viewprn.cxx,v $ - * $Revision: 1.36 $ + * $Revision: 1.36.84.1 $ * * This file is part of OpenOffice.org. * @@ -643,7 +643,10 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) // Collate SFX_REQUEST_ARG(rReq, pCollateItem, SfxBoolItem, SID_PRINT_COLLATE, FALSE); if ( pCollateItem ) + { bCollate = pCollateItem->GetValue(); + pPrintDlg->CheckCollate( bCollate ); + } // Selection SFX_REQUEST_ARG(rReq, pSelectItem, SfxBoolItem, SID_SELECTION, FALSE); diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 7e70bd3cd3cd..7c5e4c5c6788 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: elementimport.cxx,v $ - * $Revision: 1.60 $ + * $Revision: 1.60.56.1 $ * * This file is part of OpenOffice.org. * @@ -543,7 +543,10 @@ namespace xmloff //--------------------------------------------------------------------- void OElementImport::simulateDefaultedAttribute(const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, const sal_Char* _pAttributeDefault) { - Reference< XPropertySetInfo > xPropsInfo = m_xElement->getPropertySetInfo(); + Reference< XPropertySetInfo > xPropsInfo; + if ( m_xElement.is()) { + xPropsInfo=m_xElement->getPropertySetInfo(); + } OSL_ENSURE( xPropsInfo.is(), "OPropertyImport::simulateDefaultedAttribute: the component should be more gossipy about it's properties!" ); if ( !xPropsInfo.is() || xPropsInfo->hasPropertyByName( _rPropertyName ) ) diff --git a/xmloff/source/transform/FlatTContext.cxx b/xmloff/source/transform/FlatTContext.cxx index 9949e664e190..8420c01dc62c 100644 --- a/xmloff/source/transform/FlatTContext.cxx +++ b/xmloff/source/transform/FlatTContext.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: FlatTContext.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.56.1 $ * * This file is part of OpenOffice.org. * @@ -52,30 +52,12 @@ XMLPersTextContentTContext::XMLPersTextContentTContext( XMLPersTextContentTContext::XMLPersTextContentTContext( XMLTransformerBase& rImp, const OUString& rQName, - sal_uInt16 nActionMap ) : - XMLPersAttrListTContext( rImp, rQName, nActionMap ) -{ -} - -XMLPersTextContentTContext::XMLPersTextContentTContext( - XMLTransformerBase& rImp, - const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken ) : XMLPersAttrListTContext( rImp, rQName, nPrefix, eToken ) { } -XMLPersTextContentTContext::XMLPersTextContentTContext( - XMLTransformerBase& rImp, - const OUString& rQName, - sal_uInt16 nPrefix, - ::xmloff::token::XMLTokenEnum eToken, - sal_uInt16 nActionMap ) : - XMLPersAttrListTContext( rImp, rQName, nPrefix, eToken, nActionMap ) -{ -} - XMLPersTextContentTContext::~XMLPersTextContentTContext() { } diff --git a/xmloff/source/transform/FlatTContext.hxx b/xmloff/source/transform/FlatTContext.hxx index bf049163346c..094862af267e 100644 --- a/xmloff/source/transform/FlatTContext.hxx +++ b/xmloff/source/transform/FlatTContext.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: FlatTContext.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.56.1 $ * * This file is part of OpenOffice.org. * @@ -48,24 +48,12 @@ public: XMLPersTextContentTContext( XMLTransformerBase& rTransformer, const ::rtl::OUString& rQName ); - // attr list/text content persistence + attribute processing - XMLPersTextContentTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, - sal_uInt16 nActionMap ); - // attr list/text content persistence + renaming XMLPersTextContentTContext( XMLTransformerBase& rTransformer, const ::rtl::OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken ); - // attr list/text content persistence + renaming + attribute processing - XMLPersTextContentTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, - sal_uInt16 nPrefix, - ::xmloff::token::XMLTokenEnum eToken, - sal_uInt16 nActionMap ); - // A contexts destructor does anything that is required if an element // ends. By default, nothing is done. // Note that virtual methods cannot be used inside destructors. Use diff --git a/xmloff/source/transform/MutableAttrList.cxx b/xmloff/source/transform/MutableAttrList.cxx index 491f34ac4ac8..7c3e83635dd6 100644 --- a/xmloff/source/transform/MutableAttrList.cxx +++ b/xmloff/source/transform/MutableAttrList.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: MutableAttrList.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.56.1 $ * * This file is part of OpenOffice.org. * @@ -94,21 +94,6 @@ const Sequence< sal_Int8 > & XMLMutableAttributeList::getUnoTunnelId() throw() return *pSeq; } -XMLMutableAttributeList* XMLMutableAttributeList::getImplementation( - Reference< XInterface > xInt ) throw() -{ - Reference< XUnoTunnel > xUT( xInt, UNO_QUERY ); - if( xUT.is() ) - { - return - reinterpret_cast<XMLMutableAttributeList*>( - sal::static_int_cast<sal_IntPtr>( - xUT->getSomething( XMLMutableAttributeList::getUnoTunnelId()))); - } - else - return NULL; -} - // XUnoTunnel sal_Int64 SAL_CALL XMLMutableAttributeList::getSomething( const Sequence< sal_Int8 >& rId ) diff --git a/xmloff/source/transform/MutableAttrList.hxx b/xmloff/source/transform/MutableAttrList.hxx index 4a373d43938d..5ca53dfaf420 100644 --- a/xmloff/source/transform/MutableAttrList.hxx +++ b/xmloff/source/transform/MutableAttrList.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: MutableAttrList.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.56.1 $ * * This file is part of OpenOffice.org. * @@ -59,7 +59,6 @@ public: ~XMLMutableAttributeList(); static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - static XMLMutableAttributeList* getImplementation( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ) throw(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 8ae35567a09f..026c7eab0b1a 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: OOo2Oasis.cxx,v $ - * $Revision: 1.23 $ + * $Revision: 1.23.56.1 $ * * This file is part of OpenOffice.org. * @@ -2017,17 +2017,6 @@ Sequence< sal_Int8 > static CreateUnoTunnelId() return aSeq; } -// XUnoTunnelHelper -OOo2OasisTransformer* OOo2OasisTransformer::getImplementation( Reference< XInterface > xInt ) throw() -{ - Reference< XUnoTunnel > xUT( xInt, UNO_QUERY ); - if( xUT.is() ) - return reinterpret_cast< OOo2OasisTransformer* >( - xUT->getSomething( OOo2OasisTransformer::getUnoTunnelId() )); - else - return NULL; -} - const Sequence< sal_Int8 > & OOo2OasisTransformer::getUnoTunnelId() throw() { static Sequence< sal_Int8 > aSeq = ::CreateUnoTunnelId(); diff --git a/xmloff/source/transform/OOo2Oasis.hxx b/xmloff/source/transform/OOo2Oasis.hxx index 673e3f504390..2e3a03dac3e1 100644 --- a/xmloff/source/transform/OOo2Oasis.hxx +++ b/xmloff/source/transform/OOo2Oasis.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: OOo2Oasis.hxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.56.1 $ * * This file is part of OpenOffice.org. * @@ -65,7 +65,6 @@ public: virtual ~OOo2OasisTransformer() throw(); static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - static OOo2OasisTransformer * getImplementation( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ) throw(); // XInterface diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index aa83a6df6e24..5b3bd8e1e0c0 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: Oasis2OOo.cxx,v $ - * $Revision: 1.24 $ + * $Revision: 1.24.56.1 $ * * This file is part of OpenOffice.org. * @@ -2028,17 +2028,6 @@ Oasis2OOoTransformer::~Oasis2OOoTransformer() throw() return aSeq; } -// XUnoTunnelHelper -Oasis2OOoTransformer* Oasis2OOoTransformer::getImplementation( Reference< XInterface > xInt ) throw() -{ - Reference< XUnoTunnel > xUT( xInt, UNO_QUERY ); - if( xUT.is() ) - return reinterpret_cast< Oasis2OOoTransformer* >( - xUT->getSomething( Oasis2OOoTransformer::getUnoTunnelId() )); - else - return NULL; -} - const Sequence< sal_Int8 > & Oasis2OOoTransformer::getUnoTunnelId() throw() { static Sequence< sal_Int8 > aSeq = ::CreateUnoTunnelId(); diff --git a/xmloff/source/transform/Oasis2OOo.hxx b/xmloff/source/transform/Oasis2OOo.hxx index 4cd0e64c092c..9422de94aa43 100644 --- a/xmloff/source/transform/Oasis2OOo.hxx +++ b/xmloff/source/transform/Oasis2OOo.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: Oasis2OOo.hxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.56.1 $ * * This file is part of OpenOffice.org. * @@ -58,8 +58,6 @@ public: virtual ~Oasis2OOoTransformer() throw(); static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - static Oasis2OOoTransformer * getImplementation( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ) throw(); - // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/xmloff/source/transform/ProcAddAttrTContext.cxx b/xmloff/source/transform/ProcAddAttrTContext.cxx index e3e0e995d524..e77699dc06c8 100644 --- a/xmloff/source/transform/ProcAddAttrTContext.cxx +++ b/xmloff/source/transform/ProcAddAttrTContext.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ProcAddAttrTContext.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.56.1 $ * * This file is part of OpenOffice.org. * @@ -48,20 +48,6 @@ TYPEINIT1( XMLProcAddAttrTransformerContext, XMLProcAttrTransformerContext); XMLProcAddAttrTransformerContext::XMLProcAddAttrTransformerContext( XMLTransformerBase& rImp, const OUString& rQName, - sal_uInt16 nActionMap, - sal_uInt16 nAPrefix, - ::xmloff::token::XMLTokenEnum eAToken, - ::xmloff::token::XMLTokenEnum eVToken ) : - XMLProcAttrTransformerContext( rImp, rQName, nActionMap ), - m_aAttrQName( rImp.GetNamespaceMap().GetQNameByKey( nAPrefix, - ::xmloff::token::GetXMLToken( eAToken ) ) ), - m_aAttrValue( ::xmloff::token::GetXMLToken( eVToken ) ) -{ -} - -XMLProcAddAttrTransformerContext::XMLProcAddAttrTransformerContext( - XMLTransformerBase& rImp, - const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken, sal_uInt16 nActionMap, diff --git a/xmloff/source/transform/ProcAddAttrTContext.hxx b/xmloff/source/transform/ProcAddAttrTContext.hxx index 83a27170837e..006cccac8725 100644 --- a/xmloff/source/transform/ProcAddAttrTContext.hxx +++ b/xmloff/source/transform/ProcAddAttrTContext.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ProcAddAttrTContext.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.56.1 $ * * This file is part of OpenOffice.org. * @@ -45,13 +45,6 @@ public: XMLProcAddAttrTransformerContext( XMLTransformerBase& rTransformer, const ::rtl::OUString& rQName, - sal_uInt16 nActionMap, - sal_uInt16 nAPrefix, - ::xmloff::token::XMLTokenEnum eAToken, - ::xmloff::token::XMLTokenEnum eVToken ); - - XMLProcAddAttrTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken, sal_uInt16 nActionMap, diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index 1503bc1b33de..12b36274609e 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: TransformerBase.cxx,v $ - * $Revision: 1.23 $ + * $Revision: 1.23.56.1 $ * * This file is part of OpenOffice.org. * @@ -1482,24 +1482,6 @@ const XMLTransformerContext *XMLTransformerBase::GetAncestorContext( return nSize > nPos+2 ? (*m_pContexts)[nSize-(nPos+2)].get() : 0; } -bool XMLTransformerBase::isDraw() const -{ - Reference< XServiceInfo > xSI( mxModel, UNO_QUERY ); - return xSI.is() && xSI->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) ); -} - -bool XMLTransformerBase::isImpress() const -{ - Reference< XServiceInfo > xSI( mxModel, UNO_QUERY ); - return xSI.is() && xSI->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) ); -} - -bool XMLTransformerBase::isCalc() const -{ - Reference< XServiceInfo > xSI( mxModel, UNO_QUERY ); - return xSI.is() && xSI->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ) ) ); -} - bool XMLTransformerBase::isWriter() const { Reference< XServiceInfo > xSI( mxModel, UNO_QUERY ); diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx index faf3d99cc644..909e7ef2733a 100644 --- a/xmloff/source/transform/TransformerBase.hxx +++ b/xmloff/source/transform/TransformerBase.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: TransformerBase.hxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.56.1 $ * * This file is part of OpenOffice.org. * @@ -204,9 +204,6 @@ public: inline void SetClass( const ::rtl::OUString& r ) { m_aClass = r; } inline const ::rtl::OUString& GetClass() const { return m_aClass; } - bool isDraw() const; - bool isImpress() const; - bool isCalc() const; bool isWriter() const; }; |