[Libreoffice-commits] .: framework/inc framework/Library_fwe.mk framework/Library_fwk.mk framework/Package_inc.mk framework/source sfx2/source svx/inc svx/source xmloff/inc xmloff/Library_xo.mk xmloff/Package_inc.mk xmloff/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Tue Aug 2 16:55:55 PDT 2011
framework/Library_fwe.mk | 1
framework/Library_fwk.mk | 4
framework/Package_inc.mk | 1
framework/inc/framework/acceleratorinfo.hxx | 53
framework/inc/services/layoutmanager.hxx | 4
framework/inc/services/modelwinservice.hxx | 125
framework/inc/uielement/panelwrapper.hxx | 71
framework/source/fwe/helper/acceleratorinfo.cxx | 74
framework/source/layoutmanager/helpers.cxx | 21
framework/source/layoutmanager/helpers.hxx | 2
framework/source/layoutmanager/layoutmanager.cxx | 28
framework/source/layoutmanager/panelmanager.cxx | 186 -
framework/source/layoutmanager/panelmanager.hxx | 112
framework/source/services/backingcomp.cxx | 1
framework/source/services/modelwinservice.cxx | 282 -
framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx | 1704 ----------
framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx | 221 -
framework/source/uielement/menubarmanager.cxx | 1
framework/source/uielement/panelwrapper.cxx | 229 -
framework/source/uielement/toolbarmanager.cxx | 1
sfx2/source/appl/app.cxx | 1
svx/inc/svx/svdetc.hxx | 28
svx/source/svdraw/svdetc.cxx | 133
xmloff/Library_xo.mk | 1
xmloff/Package_inc.mk | 1
xmloff/inc/xmloff/VisAreaExport.hxx | 57
xmloff/source/draw/sdxmlexp.cxx | 2
xmloff/source/style/VisAreaExport.cxx | 86
28 files changed, 3430 deletions(-)
New commits:
commit d68d28322159b2d377becfc3831670665707ea94
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Aug 3 01:51:28 2011 +0200
callcatcher: remove unused methods
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index f6a7994..47e4bd3 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -74,7 +74,6 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\
framework/source/fwe/classes/rootactiontriggercontainer \
framework/source/fwe/classes/sfxhelperfunctions \
framework/source/fwe/dispatch/interaction \
- framework/source/fwe/helper/acceleratorinfo \
framework/source/fwe/helper/actiontriggerhelper \
framework/source/fwe/helper/configimporter \
framework/source/fwe/helper/imageproducer \
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 04a7886..b517e0d 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -114,7 +114,6 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/layoutmanager/helpers \
framework/source/layoutmanager/layoutmanager \
framework/source/layoutmanager/panel \
- framework/source/layoutmanager/panelmanager \
framework/source/layoutmanager/toolbarlayoutmanager \
framework/source/layoutmanager/uielement \
framework/source/loadenv/loadenv \
@@ -125,7 +124,6 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/services/backingwindow \
framework/source/services/desktop \
framework/source/services/frame \
- framework/source/services/modelwinservice \
framework/source/services/modulemanager \
framework/source/services/pathsettings \
framework/source/services/sessionlistener \
@@ -142,7 +140,6 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/uiconfiguration/moduleuiconfigurationmanager \
framework/source/uiconfiguration/uicategorydescription \
framework/source/uiconfiguration/uiconfigurationmanager \
- framework/source/uiconfiguration/uiconfigurationmanagerimpl \
framework/source/uiconfiguration/windowstateconfiguration \
framework/source/uielement/addonstoolbarmanager \
framework/source/uielement/addonstoolbarwrapper \
@@ -160,7 +157,6 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/uielement/menubarwrapper \
framework/source/uielement/objectmenucontroller \
framework/source/uielement/panelwindow \
- framework/source/uielement/panelwrapper \
framework/source/uielement/progressbarwrapper \
framework/source/uielement/recentfilesmenucontroller \
framework/source/uielement/spinfieldtoolbarcontroller \
diff --git a/framework/Package_inc.mk b/framework/Package_inc.mk
index b2af44e..390621c 100644
--- a/framework/Package_inc.mk
+++ b/framework/Package_inc.mk
@@ -27,7 +27,6 @@
#*************************************************************************
$(eval $(call gb_Package_Package,framework_inc,$(SRCDIR)/framework/inc))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/acceleratorinfo.hxx,framework/acceleratorinfo.hxx))
$(eval $(call gb_Package_add_file,framework_inc,inc/framework/actiontriggerhelper.hxx,framework/actiontriggerhelper.hxx))
$(eval $(call gb_Package_add_file,framework_inc,inc/framework/addonmenu.hxx,framework/addonmenu.hxx))
$(eval $(call gb_Package_add_file,framework_inc,inc/framework/addonsoptions.hxx,framework/addonsoptions.hxx))
diff --git a/framework/inc/framework/acceleratorinfo.hxx b/framework/inc/framework/acceleratorinfo.hxx
deleted file mode 100644
index 6049198..0000000
--- a/framework/inc/framework/acceleratorinfo.hxx
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_HELPER_ACCELERATORINFO_HXX_
-#define __FRAMEWORK_HELPER_ACCELERATORINFO_HXX_
-
-#include <com/sun/star/frame/XFrame.hpp>
-#include <vcl/keycod.hxx>
-#include <rtl/ustring.hxx>
-#include <framework/fwedllapi.h>
-
-namespace framework
-{
-
-typedef ::rtl::OUString ( *pfunc_getCommandURLFromKeyCode)( const KeyCode& );
-typedef KeyCode ( *pfunc_getKeyCodeFromCommandURL )( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL );
-
-pfunc_getCommandURLFromKeyCode SAL_CALL SetCommandURLFromKeyCode( pfunc_getCommandURLFromKeyCode );
-pfunc_getKeyCodeFromCommandURL SAL_CALL SetKeyCodeFromCommandURL( pfunc_getKeyCodeFromCommandURL );
-
-::rtl::OUString SAL_CALL GetCommandURLFromKeyCode( const KeyCode& aKeyCode );
-KeyCode GetKeyCodeFromCommandURL( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const rtl::OUString& aCommandURL );
-
-}
-
-#endif // __FRAMEWORK_HELPER_ACCELERATORINFO_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index 3de228c..11171b8 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -95,7 +95,6 @@ class MenuBar;
namespace framework
{
class ToolbarLayoutManager;
- class PanelManager;
class GlobalSettings;
namespace detail
{
@@ -231,7 +230,6 @@ namespace framework
//---------------------------------------------------------------------------------------------------------
void impl_clearUpMenuBar();
void implts_reset( sal_Bool bAttach );
- void implts_setMenuBarCloser(sal_Bool bCloserState);
void implts_updateMenuBarClose();
sal_Bool implts_resetMenuBar();
@@ -245,7 +243,6 @@ namespace framework
// query
//---------------------------------------------------------------------------------------------------------
::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_findElement( const rtl::OUString& aName );
- UIElement& impl_findElement( const rtl::OUString& aName );
void implts_writeNewStateData( const rtl::OUString aName, const ::com::sun::star::uno::Reference< com::sun::star::awt::XWindow >& xWindow );
sal_Bool implts_readWindowStateData( const rtl::OUString& rName, UIElement& rElementData );
@@ -371,7 +368,6 @@ namespace framework
sal_Int16 m_eSymbolsStyle;
Timer m_aAsyncLayoutTimer;
::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; // container for ALL Listener
- PanelManager* m_pPanelManager;
ToolbarLayoutManager* m_pToolbarManager;
css::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener > m_xToolbarManager;
diff --git a/framework/inc/services/modelwinservice.hxx b/framework/inc/services/modelwinservice.hxx
deleted file mode 100644
index 54138f1..0000000
--- a/framework/inc/services/modelwinservice.hxx
+++ /dev/null
@@ -1,125 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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: urltransformer.hxx,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.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_SERVICES_MODELWINSERVICE_HXX_
-#define __FRAMEWORK_SERVICES_MODELWINSERVICE_HXX_
-
-//_________________________________________________________________________________________________________________
-// my own includes
-//_________________________________________________________________________________________________________________
-
-#include <threadhelp/threadhelpbase.hxx>
-#include <macros/generic.hxx>
-#include <macros/debug.hxx>
-#include <macros/xinterface.hxx>
-#include <macros/xtypeprovider.hxx>
-#include <macros/xserviceinfo.hxx>
-#include <general.h>
-#include <stdtypes.h>
-
-//_________________________________________________________________________________________________________________
-// interface includes
-//_________________________________________________________________________________________________________________
-
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/awt/XControlModel.hpp>
-
-//_________________________________________________________________________________________________________________
-// other includes
-//_________________________________________________________________________________________________________________
-
-#include <cppuhelper/weak.hxx>
-#include <vcl/window.hxx>
-
-//_________________________________________________________________________________________________________________
-// namespace
-//_________________________________________________________________________________________________________________
-
-namespace framework{
-
-class IModelWin
-{
- public:
- virtual void registerModelForXWindow( const css::uno::Reference< css::awt::XWindow >& rWindow, const css::uno::Reference< css::awt::XControlModel >& rModel ) = 0;
- virtual void deregisterModelForXWindow( const css::uno::Reference< css::awt::XWindow >& rWindow ) = 0;
-};
-
-class ModelWinService : public css::lang::XTypeProvider
- , public css::lang::XServiceInfo
- , public css::container::XNameAccess
- , public IModelWin
- , public ::cppu::OWeakObject
-{
- public:
- ModelWinService(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
- virtual ~ModelWinService();
-
- //---------------------------------------------------------------------------------------------------------
- // XInterface, XTypeProvider, XServiceInfo
- //---------------------------------------------------------------------------------------------------------
-
- FWK_DECLARE_XINTERFACE
- FWK_DECLARE_XTYPEPROVIDER
- DECLARE_XSERVICEINFO
-
- //---------------------------------------------------------------------------------------------------------
- // IModelWin
- //---------------------------------------------------------------------------------------------------------
- virtual void registerModelForXWindow( const css::uno::Reference< css::awt::XWindow >& rWindow, const css::uno::Reference< css::awt::XControlModel >& rModel );
- virtual void deregisterModelForXWindow( const css::uno::Reference< css::awt::XWindow >& rWindow );
-
- //---------------------------------------------------------------------------------------------------------
- // XNameAccess
- //---------------------------------------------------------------------------------------------------------
- virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& sName ) throw( css::container::NoSuchElementException ,
- css::lang::WrappedTargetException ,
- css::uno::RuntimeException );
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException );
- virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& sName ) throw( css::uno::RuntimeException );
-
- //---------------------------------------------------------------------------------------------------------
- // XElementAccess
- //---------------------------------------------------------------------------------------------------------
- virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException );
- virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException );
-
- private:
- css::uno::Reference< css::lang::XMultiServiceFactory > m_xServiceManager;
-};
-
-}
-
-#endif // __FRAMEWORK_SERVICES_MODELWINSERVICE_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/panelwrapper.hxx b/framework/inc/uielement/panelwrapper.hxx
deleted file mode 100644
index 944a57f..0000000
--- a/framework/inc/uielement/panelwrapper.hxx
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-
-
-#ifndef __FRAMEWORK_UIELEMENT_PANELWRAPPER_HXX_
-#define __FRAMEWORK_UIELEMENT_PANELWRAPPER_HXX_
-
-//_________________________________________________________________________________________________________________
-// my own includes
-//_________________________________________________________________________________________________________________
-
-#include <helper/uielementwrapperbase.hxx>
-
-//_________________________________________________________________________________________________________________
-// interface includes
-//_________________________________________________________________________________________________________________
-
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
-//_________________________________________________________________________________________________________________
-// other includes
-//_________________________________________________________________________________________________________________
-
-namespace framework
-{
-
-class PanelWrapper : public UIElementWrapperBase
-{
- public:
- PanelWrapper( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
- virtual ~PanelWrapper();
-
- // XInterface
- virtual void SAL_CALL acquire() throw();
- virtual void SAL_CALL release() throw();
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException );
-
- // XComponent
- virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException);
-
- // XInitialization
- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-
- // XUIElement
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException);
-
- // XUpdatable
- virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException);
-
- // XEventListener
- using cppu::OPropertySetHelper::disposing;
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
-
- //-------------------------------------------------------------------------------------------------------------
- // protected methods
- //-------------------------------------------------------------------------------------------------------------
- protected:
- virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception );
-
- private:
- com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
- com::sun::star::uno::Reference< com::sun::star::awt::XWindow > m_xPanelWindow;
- bool m_bNoClose;
-};
-
-}
-
-#endif // __FRAMEWORK_UIELEMENT_PANELWRAPPER_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/helper/acceleratorinfo.cxx b/framework/source/fwe/helper/acceleratorinfo.cxx
deleted file mode 100644
index ff98aec..0000000
--- a/framework/source/fwe/helper/acceleratorinfo.cxx
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_framework.hxx"
-
-#include <framework/acceleratorinfo.hxx>
-
-namespace framework
-{
-
-static pfunc_getCommandURLFromKeyCode _pGetCommandURLFromKeyCode = NULL;
-static pfunc_getKeyCodeFromCommandURL _pGetKeyCodeFromCommandURL = NULL;
-
-pfunc_getCommandURLFromKeyCode SAL_CALL SetCommandURLFromKeyCode( pfunc_getCommandURLFromKeyCode pNewFunc )
-{
- pfunc_getCommandURLFromKeyCode pOldFunc = _pGetCommandURLFromKeyCode;
- _pGetCommandURLFromKeyCode = pNewFunc;
-
- return pOldFunc;
-}
-
-::rtl::OUString SAL_CALL GetCommandURLFromKeyCode( const KeyCode& aKeyCode )
-{
- if ( _pGetCommandURLFromKeyCode )
- return _pGetCommandURLFromKeyCode( aKeyCode );
- else
- return rtl::OUString();
-}
-
-pfunc_getKeyCodeFromCommandURL SAL_CALL SetKeyCodeFromCommandURL( pfunc_getKeyCodeFromCommandURL pNewFunc )
-{
- pfunc_getKeyCodeFromCommandURL pOldFunc = _pGetKeyCodeFromCommandURL;
- _pGetKeyCodeFromCommandURL = pNewFunc;
-
- return pOldFunc;
-}
-
-KeyCode SAL_CALL GetKeyCodeFromCommandURL( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const rtl::OUString& aCommandURL )
-{
- if ( _pGetKeyCodeFromCommandURL )
- return _pGetKeyCodeFromCommandURL( rFrame, aCommandURL );
- else
- return KeyCode();
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx
index cca1df0..ddaa719 100644
--- a/framework/source/layoutmanager/helpers.cxx
+++ b/framework/source/layoutmanager/helpers.cxx
@@ -272,27 +272,6 @@ void parseResourceURL( const rtl::OUString& aResourceURL, rtl::OUString& aElemen
return aRect;
}
-css::awt::Rectangle convertRectangleToAWT( const ::Rectangle& rRect )
-{
- css::awt::Rectangle aRect;
- aRect.X = rRect.Left();
- aRect.Y = rRect.Top();
- aRect.Width = rRect.GetWidth();
- aRect.Height = rRect.GetHeight();
- return aRect;
-}
-
-::Rectangle convertAWTToRectangle( const ::com::sun::star::awt::Rectangle& rRect )
-{
- ::Rectangle aRect;
- aRect.Left() = rRect.X;
- aRect.Top() = rRect.Y;
- aRect.Right() = rRect.X + rRect.Width;
- aRect.Bottom() = rRect.Y + rRect.Height;
-
- return aRect;
-}
-
bool equalRectangles( const css::awt::Rectangle& rRect1,
const css::awt::Rectangle& rRect2 )
{
diff --git a/framework/source/layoutmanager/helpers.hxx b/framework/source/layoutmanager/helpers.hxx
index 8ae7fc5..0a4a447 100644
--- a/framework/source/layoutmanager/helpers.hxx
+++ b/framework/source/layoutmanager/helpers.hxx
@@ -81,8 +81,6 @@ WindowAlign ImplConvertAlignment( sal_Int16 aAlignment );
void parseResourceURL( const rtl::OUString& aResourceURL, rtl::OUString& aElementType, rtl::OUString& aElementName );
::Rectangle putAWTToRectangle( const ::com::sun::star::awt::Rectangle& rRect );
::com::sun::star::awt::Rectangle putRectangleValueToAWT( const ::Rectangle& rRect );
-::com::sun::star::awt::Rectangle convertRectangleToAWT( const ::Rectangle& rRect );
-::Rectangle convertAWTToRectangle( const ::com::sun::star::awt::Rectangle& rRect );
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > impl_getModelFromFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
sal_Bool implts_isPreviewModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
sal_Bool implts_isFrameOrWindowTop( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame );
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index e428204..47368e6 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -35,7 +35,6 @@
// my own includes
#include <services/layoutmanager.hxx>
#include <helpers.hxx>
-#include <panelmanager.hxx>
#include <threadhelp/resetableguard.hxx>
#include <services.h>
@@ -165,7 +164,6 @@ LayoutManager::LayoutManager( const Reference< XMultiServiceFactory >& xServiceM
, m_aPropLocked( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_LOCKED ))
, m_aCustomizeCmd( RTL_CONSTASCII_USTRINGPARAM( "ConfigureDialog" ))
, m_aListenerContainer( m_aLock.getShareableOslMutex() )
- , m_pPanelManager( 0 )
, m_pToolbarManager( 0 )
{
// Initialize statusbar member
@@ -507,22 +505,6 @@ uno::Reference< ui::XUIElement > LayoutManager::implts_findElement( const rtl::O
return uno::Reference< ui::XUIElement >();
}
-UIElement& LayoutManager::impl_findElement( const rtl::OUString& aName )
-{
- static UIElement aEmptyElement;
-
- ::rtl::OUString aElementType;
- ::rtl::OUString aElementName;
-
- parseResourceURL( aName, aElementType, aElementName );
- if (( aElementType.equalsIgnoreAsciiCaseAscii( "statusbar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "statusbar" )) || ( m_aStatusBarElement.m_aName == aName ))
- return m_aStatusBarElement;
- else if ( aElementType.equalsIgnoreAsciiCaseAscii( "progressbar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "progressbar" ))
- return m_aProgressBarElement;
-
- return aEmptyElement;
-}
-
sal_Bool LayoutManager::implts_readWindowStateData( const rtl::OUString& aName, UIElement& rElementData )
{
sal_Bool bGetSettingsState( sal_False );
@@ -1587,7 +1569,6 @@ throw (RuntimeException)
if ( xUIElement.is() )
{
impl_addWindowListeners( xThis, xUIElement );
- m_pPanelManager->addDockingWindow( aName, xUIElement );
}
// The docking window is created by a factory method located in the sfx2 library.
@@ -2664,15 +2645,6 @@ sal_Bool LayoutManager::implts_resetMenuBar()
return sal_False;
}
-void LayoutManager::implts_setMenuBarCloser(sal_Bool bCloserState)
-{
- WriteGuard aWriteLock( m_aLock );
- m_bMenuBarCloser = bCloserState;
- aWriteLock.unlock();
-
- implts_updateMenuBarClose();
-}
-
IMPL_LINK( LayoutManager, MenuBarClose, MenuBar *, EMPTYARG )
{
ReadGuard aReadLock( m_aLock );
diff --git a/framework/source/layoutmanager/panelmanager.cxx b/framework/source/layoutmanager/panelmanager.cxx
deleted file mode 100644
index 017102a..0000000
--- a/framework/source/layoutmanager/panelmanager.cxx
+++ /dev/null
@@ -1,186 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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: layoutmanager.hxx,v $
- * $Revision: 1.34 $
- *
- * 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 "panelmanager.hxx"
-#include "services.h"
-#include "services/modelwinservice.hxx"
-
-//_________________________________________________________________________________________________________________
-// interface includes
-//_________________________________________________________________________________________________________________
-
-
-//_________________________________________________________________________________________________________________
-// other includes
-//_________________________________________________________________________________________________________________
-
-#include <vcl/svapp.hxx>
-#include <toolkit/unohlp.hxx>
-
-//_________________________________________________________________________________________________________________
-// namespace
-//_________________________________________________________________________________________________________________
-
-using namespace ::com::sun::star;
-
-namespace framework
-{
-
-//_________________________________________________________________________________________________________________
-// non exported definitions
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-// declarations
-//_________________________________________________________________________________________________________________
-
-
-PanelManager::PanelManager(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rSMGR,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ) :
- m_xSMGR( rSMGR ),
- m_xFrame( rFrame )
-{
- m_aPanels[PANEL_TOP] = 0;
- m_aPanels[PANEL_BOTTOM] = 0;
- m_aPanels[PANEL_LEFT] = 0;
- m_aPanels[PANEL_RIGHT] = 0;
-}
-
-PanelManager::~PanelManager()
-{
-}
-
-//---------------------------------------------------------------------------------------------------------
-// Creation and layouting
-//---------------------------------------------------------------------------------------------------------
-bool PanelManager::createPanels()
-{
- if ( m_xFrame.is() )
- {
- SolarMutexGuard aGuard;
- uno::Reference< awt::XWindow > xWindow( m_xFrame->getContainerWindow(), uno::UNO_QUERY );
- if ( xWindow.is() )
- {
- // destroy old panel windows
- delete m_aPanels[PANEL_TOP ];
- delete m_aPanels[PANEL_BOTTOM];
- delete m_aPanels[PANEL_LEFT ];
- delete m_aPanels[PANEL_RIGHT ];
-
- m_aPanels[PANEL_TOP ] = new Panel( m_xSMGR, xWindow, PANEL_TOP );
- m_aPanels[PANEL_BOTTOM] = new Panel( m_xSMGR, xWindow, PANEL_BOTTOM );
- m_aPanels[PANEL_LEFT ] = new Panel( m_xSMGR, xWindow, PANEL_LEFT );
- m_aPanels[PANEL_RIGHT ] = new Panel( m_xSMGR, xWindow, PANEL_RIGHT );
- return true;
- }
- }
-
- return false;
-}
-
-awt::Rectangle PanelManager::getPreferredSize() const
-{
- return awt::Rectangle();
-}
-
-void PanelManager::layoutPanels( const awt::Rectangle /*newSize*/ )
-{
-}
-
-//---------------------------------------------------------------------------------------------------------
-// Panel functions
-//---------------------------------------------------------------------------------------------------------
-UIElement* PanelManager::findDockingWindow( const ::rtl::OUString& /*rResourceName*/ )
-{
- return NULL;
-}
-
-bool PanelManager::addDockingWindow( const ::rtl::OUString& /*rResourceName*/, const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& /*xUIElement*/ )
-{
- return false;
-}
-
-bool PanelManager::destroyDockingWindow( const ::rtl::OUString& /*rResourceName*/ )
-{
- return false;
-}
-
-//---------------------------------------------------------------------------------------------------------
-// XDockableWindowListener
-//---------------------------------------------------------------------------------------------------------
-void SAL_CALL PanelManager::startDocking( const awt::DockingEvent& )
-throw (uno::RuntimeException)
-{
-}
-
-awt::DockingData SAL_CALL PanelManager::docking( const awt::DockingEvent& )
-throw (uno::RuntimeException)
-{
- return awt::DockingData();
-}
-
-void SAL_CALL PanelManager::endDocking( const awt::EndDockingEvent& )
-throw (uno::RuntimeException)
-{
-}
-
-sal_Bool SAL_CALL PanelManager::prepareToggleFloatingMode( const lang::EventObject& )
-throw (uno::RuntimeException)
-{
- return false;
-}
-
-void SAL_CALL PanelManager::toggleFloatingMode( const lang::EventObject& )
-throw (uno::RuntimeException)
-{
-}
-
-void SAL_CALL PanelManager::closed( const lang::EventObject& )
-throw (uno::RuntimeException)
-{
-}
-
-void SAL_CALL PanelManager::endPopupMode( const awt::EndPopupModeEvent& )
-throw (uno::RuntimeException)
-{
-}
-
-} // namespace framework
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/layoutmanager/panelmanager.hxx b/framework/source/layoutmanager/panelmanager.hxx
deleted file mode 100644
index 119fcb6..0000000
--- a/framework/source/layoutmanager/panelmanager.hxx
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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: layoutmanager.hxx,v $
- * $Revision: 1.34 $
- *
- * 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_LAYOUTMANAGER_PANELMANAGER_HXX_
-#define __FRAMEWORK_LAYOUTMANAGER_PANELMANAGER_HXX_
-
-//_________________________________________________________________________________________________________________
-// my own includes
-//_________________________________________________________________________________________________________________
-
-#include <threadhelp/threadhelpbase.hxx>
-#include <macros/generic.hxx>
-#include <macros/debug.hxx>
-#include <macros/xinterface.hxx>
-#include <macros/xtypeprovider.hxx>
-#include <macros/xserviceinfo.hxx>
-#include <general.h>
-#include <stdtypes.h>
-#include "panel.hxx"
-#include <uielement/uielement.hxx>
-
-//_________________________________________________________________________________________________________________
-// interface includes
-//_________________________________________________________________________________________________________________
-
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/awt/XDockableWindowListener.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-
-//_________________________________________________________________________________________________________________
-// other includes
-//_________________________________________________________________________________________________________________
-
-#include <cppuhelper/weak.hxx>
-#include <vcl/window.hxx>
-
-//_________________________________________________________________________________________________________________
-// namespace
-//_________________________________________________________________________________________________________________
-
-namespace framework
-{
-
-class PanelManager : private ThreadHelpBase // Struct for right initalization of mutex member! Must be first of baseclasses.
-{
- public:
- PanelManager(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rSMGR,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
- virtual ~PanelManager();
-
- bool createPanels();
- ::com::sun::star::awt::Rectangle getPreferredSize() const;
- void layoutPanels( const ::com::sun::star::awt::Rectangle newSize );
-
- UIElement* findDockingWindow( const ::rtl::OUString& rResourceName );
- bool addDockingWindow( const ::rtl::OUString& rResourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& xUIElement );
- bool destroyDockingWindow( const ::rtl::OUString& rResourceName );
-
- //---------------------------------------------------------------------------------------------------------
- // XDockableWindowListener
- //---------------------------------------------------------------------------------------------------------
- virtual void SAL_CALL startDocking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::awt::DockingData SAL_CALL docking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL endDocking( const ::com::sun::star::awt::EndDockingEvent& e ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL prepareToggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL toggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL closed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL endPopupMode( const ::com::sun::star::awt::EndPopupModeEvent& e ) throw (::com::sun::star::uno::RuntimeException);
-
- private:
- Panel* m_aPanels[PANEL_COUNT];
- css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
- css::uno::Reference< css::frame::XFrame > m_xFrame;
-};
-
-} // namespace framework
-
-#endif // __FRAMEWORK_LAYOUTMANAGER_PANELMANAGER_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index 71e924e..146e59a 100644
--- a/framework/source/services/backingcomp.cxx
+++ b/framework/source/services/backingcomp.cxx
@@ -38,7 +38,6 @@
#include <threadhelp/readguard.hxx>
#include <threadhelp/writeguard.hxx>
#include <classes/droptargetlistener.hxx>
-#include <framework/acceleratorinfo.hxx>
#include <targets.h>
#include <properties.h>
#include <services.h>
diff --git a/framework/source/services/modelwinservice.cxx b/framework/source/services/modelwinservice.cxx
deleted file mode 100644
index 7bebcdf..0000000
--- a/framework/source/services/modelwinservice.cxx
+++ /dev/null
@@ -1,282 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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: urltransformer.cxx,v $
- * $Revision: 1.17 $
- *
- * 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 "services.h"
-#include "services/modelwinservice.hxx"
-
-//_________________________________________________________________________________________________________________
-// interface includes
-//_________________________________________________________________________________________________________________
-
-#include <com/sun/star/awt/XControlModel.hpp>
-
-using namespace ::com::sun::star;
-
-//_________________________________________________________________________________________________________________
-// namespace
-//_________________________________________________________________________________________________________________
-
-namespace framework{
-
-//_________________________________________________________________________________________________________________
-// non exported definitions
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-// declarations
-//_________________________________________________________________________________________________________________
-
-class Impl_ModelWinService
-{
- public:
- ~Impl_ModelWinService();
-
- static Impl_ModelWinService* getSingleInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
-
- uno::Any getByName( const ::rtl::OUString& sName )
- throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException );
-
- uno::Sequence< ::rtl::OUString > getElementNames()
- throw( uno::RuntimeException );
-
- sal_Bool hasByName( const ::rtl::OUString& sName )
- throw( uno::RuntimeException );
-
- uno::Type getElementType()
- throw( css::uno::RuntimeException );
-
- sal_Bool hasElements()
- throw( css::uno::RuntimeException );
-
- void registerModelForXWindow( const uno::Reference< awt::XWindow >& rWindow, const uno::Reference< awt::XControlModel >& rModel );
-
- void deregisterModelForXWindow( const uno::Reference< awt::XWindow >& rWindow );
-
- private:
- typedef BaseHash< uno::WeakReference< awt::XControlModel > > ModelWinMap;
-
- Impl_ModelWinService();
- Impl_ModelWinService( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
-
- static Impl_ModelWinService* m_pModelWinService;
-
- ::com::sun::star::uno::WeakReference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
- ModelWinMap m_aModelMap;
-};
-
-Impl_ModelWinService* Impl_ModelWinService::m_pModelWinService = 0;
-
-Impl_ModelWinService* Impl_ModelWinService::getSingleInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager )
-{
- osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
- if ( !m_pModelWinService )
- m_pModelWinService = new Impl_ModelWinService( rServiceManager );
- return m_pModelWinService;
-}
-
-Impl_ModelWinService::Impl_ModelWinService( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager ) :
- m_xServiceManager( rServiceManager )
-{
-}
-
-Impl_ModelWinService::Impl_ModelWinService()
-{
-}
-
-Impl_ModelWinService::~Impl_ModelWinService()
-{
-}
-
-void Impl_ModelWinService::registerModelForXWindow( const uno::Reference< awt::XWindow >& rWindow, const uno::Reference< awt::XControlModel >& rModel )
-{
- osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
-
- ::rtl::OUString sName = rtl::OUString::valueOf( reinterpret_cast< sal_Int64 >((void*)rWindow.get()));
- ModelWinMap::iterator pIter = m_aModelMap.find( sName );
- if ( pIter != m_aModelMap.end() )
- pIter->second = rModel;
- else
- m_aModelMap[sName] = rModel;
-}
-
-void Impl_ModelWinService::deregisterModelForXWindow( const uno::Reference< awt::XWindow >& /*rWindow*/ )
-{
-}
-
-uno::Any Impl_ModelWinService::getByName( const ::rtl::OUString& sName )
-throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
-{
- uno::Any aAny;
-
- osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
- ModelWinMap::iterator pIter = m_aModelMap.find( sName );
- if ( pIter != m_aModelMap.end())
- {
- uno::Reference< awt::XControlModel > xModel( pIter->second );
- aAny = uno::makeAny(xModel);
- }
-
- return aAny;
-}
-
-uno::Sequence< ::rtl::OUString > Impl_ModelWinService::getElementNames()
-throw( uno::RuntimeException )
-{
- osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
- uno::Sequence< ::rtl::OUString > aResult( m_aModelMap.size() );
-
- sal_Int32 i = 0;
- ModelWinMap::const_iterator pIter = m_aModelMap.begin();
- while ( pIter != m_aModelMap.end())
- aResult[i++] = pIter->first;
-
- return aResult;
-}
-
-sal_Bool Impl_ModelWinService::hasByName( const ::rtl::OUString& sName )
-throw( uno::RuntimeException )
-{
- osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
- ModelWinMap::iterator pIter = m_aModelMap.find( sName );
- if ( pIter != m_aModelMap.end())
- return true;
- else
- return false;
-}
-
-uno::Type Impl_ModelWinService::getElementType()
-throw( css::uno::RuntimeException )
-{
- return ::getCppuType(( const uno::Reference< awt::XControlModel >*)NULL );
-}
-
-sal_Bool Impl_ModelWinService::hasElements()
-throw( css::uno::RuntimeException )
-{
- osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
- return (m_aModelMap.size() > 0);
-}
-
-//*****************************************************************************************************************
-// css::uno::XInterface, XTypeProvider, XServiceInfo
-//*****************************************************************************************************************
-
-DEFINE_XINTERFACE_4 ( ModelWinService ,
- OWeakObject ,
- DIRECT_INTERFACE(css::lang::XTypeProvider ),
- DIRECT_INTERFACE(css::lang::XServiceInfo ),
- DIRECT_INTERFACE(css::container::XNameAccess ),
- DIRECT_INTERFACE(css::container::XElementAccess )
- )
-
-DEFINE_XTYPEPROVIDER_4 ( ModelWinService ,
- css::lang::XTypeProvider ,
- css::lang::XServiceInfo ,
- css::container::XNameAccess ,
- css::container::XElementAccess
- )
-
-DEFINE_XSERVICEINFO_MULTISERVICE ( ModelWinService ,
- OWeakObject ,
- SERVICENAME_MODELWINSERVICE ,
- IMPLEMENTATIONNAME_MODELWINSERVICE
- )
-
-DEFINE_INIT_SERVICE ( ModelWinService,
- {
- }
- )
-
-//*****************************************************************************************************************
-// constructor
-//*****************************************************************************************************************
-ModelWinService::ModelWinService(const uno::Reference< lang::XMultiServiceFactory >& rServiceManager ) :
- m_xServiceManager( rServiceManager )
-{
-}
-
-ModelWinService::~ModelWinService()
-{
-}
-
-void ModelWinService::registerModelForXWindow( const uno::Reference< awt::XWindow >& rWindow, const uno::Reference< awt::XControlModel >& rModel )
-{
- Impl_ModelWinService::getSingleInstance(m_xServiceManager)->registerModelForXWindow( rWindow, rModel );
-}
-
-void ModelWinService::deregisterModelForXWindow( const uno::Reference< awt::XWindow >& rWindow )
-{
- Impl_ModelWinService::getSingleInstance(m_xServiceManager)->deregisterModelForXWindow( rWindow );
-}
-
-uno::Any SAL_CALL ModelWinService::getByName( const ::rtl::OUString& sName )
-throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
-{
- return Impl_ModelWinService::getSingleInstance(m_xServiceManager)->getByName( sName );
-}
-
-uno::Sequence< ::rtl::OUString > SAL_CALL ModelWinService::getElementNames()
-throw( uno::RuntimeException )
-{
- return Impl_ModelWinService::getSingleInstance(m_xServiceManager)->getElementNames( );
-}
-
-sal_Bool SAL_CALL ModelWinService::hasByName( const ::rtl::OUString& sName )
-throw( uno::RuntimeException )
-{
- return Impl_ModelWinService::getSingleInstance(m_xServiceManager)->hasByName( sName );
-}
-
-//---------------------------------------------------------------------------------------------------------
-// XElementAccess
-//---------------------------------------------------------------------------------------------------------
-uno::Type SAL_CALL ModelWinService::getElementType()
-throw( uno::RuntimeException )
-{
- return ::getCppuType( (const uno::Reference< awt::XControlModel > *)NULL );
-}
-
-sal_Bool SAL_CALL ModelWinService::hasElements()
-throw( uno::RuntimeException )
-{
- return Impl_ModelWinService::getSingleInstance(m_xServiceManager)->hasElements();
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
deleted file mode 100644
index 9f650f5..0000000
--- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
+++ /dev/null
@@ -1,1704 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_framework.hxx"
-#include <uiconfigurationmanagerimpl.hxx>
-#include <threadhelp/resetableguard.hxx>
-#include <services.h>
-#include <uielement/constitemcontainer.hxx>
-#include <uielement/rootitemcontainer.hxx>
-#include <uielement/uielementtypenames.hxx>
-#include <framework/menuconfiguration.hxx>
-#include <framework/toolboxconfiguration.hxx>
-#include <uiconfiguration/imagemanager.hxx>
-
-#include <framework/statusbarconfiguration.hxx>
-
-//_________________________________________________________________________________________________________________
-// interface includes
-//_________________________________________________________________________________________________________________
-#include <com/sun/star/ui/UIElementType.hpp>
-#include <com/sun/star/ui/ConfigurationEvent.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/io/XStream.hpp>
-
-//_________________________________________________________________________________________________________________
-// other includes
-//_________________________________________________________________________________________________________________
-
-#include <vcl/svapp.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <comphelper/sequenceashashmap.hxx>
-#include <boost/bind.hpp>
-
-//_________________________________________________________________________________________________________________
-// namespaces
-//_________________________________________________________________________________________________________________
-
-using rtl::OUString;
-using namespace com::sun::star::uno;
-using namespace com::sun::star::io;
-using namespace com::sun::star::embed;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::container;
-using namespace com::sun::star::beans;
-using namespace ::com::sun::star::ui;
-using namespace ::cppu;
-
-namespace framework
-{
-
-
-// important: The order and position of the elements must match the constant
-// definition of "::com::sun::star::ui::UIElementType"
-static const char* UIELEMENTTYPENAMES[] =
-{
- "", // Dummy value for unknown!
- UIELEMENTTYPE_MENUBAR_NAME,
- UIELEMENTTYPE_POPUPMENU_NAME,
- UIELEMENTTYPE_TOOLBAR_NAME,
- UIELEMENTTYPE_STATUSBAR_NAME,
- UIELEMENTTYPE_FLOATINGWINDOW_NAME,
- UIELEMENTTYPE_PROGRESSBAR_NAME
-};
-
-static const char RESOURCEURL_PREFIX[] = "private:resource/";
-static const sal_Int32 RESOURCEURL_PREFIX_SIZE = 17;
-static const char RESOURCEURL_CUSTOM_ELEMENT[] = "custom_";
-
-static sal_Int16 RetrieveTypeFromResourceURL( const rtl::OUString& aResourceURL )
-{
-
- if (( aResourceURL.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( RESOURCEURL_PREFIX ))) == 0 ) &&
- ( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE ))
- {
- rtl::OUString aTmpStr = aResourceURL.copy( RESOURCEURL_PREFIX_SIZE );
- sal_Int32 nIndex = aTmpStr.indexOf( '/' );
- if (( nIndex > 0 ) && ( aTmpStr.getLength() > nIndex ))
- {
- rtl::OUString aTypeStr( aTmpStr.copy( 0, nIndex ));
- for ( int i = 0; i < UIElementType::COUNT; i++ )
- {
- if ( aTypeStr.equalsAscii( UIELEMENTTYPENAMES[i] ))
- return sal_Int16( i );
- }
- }
- }
-
- return UIElementType::UNKNOWN;
-}
-
-static rtl::OUString RetrieveNameFromResourceURL( const rtl::OUString& aResourceURL )
-{
- if (( aResourceURL.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( RESOURCEURL_PREFIX ))) == 0 ) &&
- ( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE ))
- {
- sal_Int32 nIndex = aResourceURL.lastIndexOf( '/' );
- if (( nIndex > 0 ) && (( nIndex+1 ) < aResourceURL.getLength()))
- return aResourceURL.copy( nIndex+1 );
- }
-
- return rtl::OUString();
-}
-
-void UIConfigurationManagerImpl::impl_fillSequenceWithElementTypeInfo( UIElementInfoHashMap& aUIElementInfoCollection, sal_Int16 nElementType )
-{
- // preload list of element types on demand
- impl_preloadUIElementTypeList( LAYER_USERDEFINED, nElementType );
- if ( m_bUseDefault )
- impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType );
-
- UIElementDataHashMap& rUserElements = m_aUIElements[LAYER_USERDEFINED][nElementType].aElementsHashMap;
- UIElementDataHashMap::const_iterator pUserIter = rUserElements.begin();
-
- rtl::OUString aCustomUrlPrefix( RTL_CONSTASCII_USTRINGPARAM( RESOURCEURL_CUSTOM_ELEMENT ));
- while ( pUserIter != rUserElements.end() )
- {
- sal_Int32 nIndex = pUserIter->second.aResourceURL.indexOf( aCustomUrlPrefix, RESOURCEURL_PREFIX_SIZE );
- if ( nIndex > RESOURCEURL_PREFIX_SIZE )
- {
- // Performance: Retrieve user interface name only for custom user interface elements.
- // It's only used by them!
- UIElementData* pDataSettings = impl_findUIElementData( pUserIter->second.aResourceURL, nElementType );
- if ( pDataSettings && ( m_bUseDefault || !pDataSettings->bDefault ))
- {
- // Retrieve user interface name from XPropertySet interface
- rtl::OUString aUIName;
- Reference< XPropertySet > xPropSet( pDataSettings->xSettings, UNO_QUERY );
- if ( xPropSet.is() )
- {
- xPropSet->getPropertyValue( m_aPropUIName ) >>= aUIName;
- }
-
- UIElementInfo aInfo( pUserIter->second.aResourceURL, aUIName );
- aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pUserIter->second.aResourceURL, aInfo ));
- }
- }
- else
- {
- // The user interface name for standard user interface elements is stored in the WindowState.xcu file
- UIElementInfo aInfo( pUserIter->second.aResourceURL, rtl::OUString() );
- aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pUserIter->second.aResourceURL, aInfo ));
- }
- ++pUserIter;
- }
-
- if ( m_bUseDefault )
- {
- UIElementDataHashMap& rDefaultElements = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap;
- UIElementDataHashMap::const_iterator pDefIter = rDefaultElements.begin();
-
- while ( pDefIter != rDefaultElements.end() )
- {
- UIElementInfoHashMap::const_iterator pIterInfo = aUIElementInfoCollection.find( pDefIter->second.aResourceURL );
- if ( pIterInfo == aUIElementInfoCollection.end() )
- {
- sal_Int32 nIndex = pDefIter->second.aResourceURL.indexOf( aCustomUrlPrefix, RESOURCEURL_PREFIX_SIZE );
- if ( nIndex > RESOURCEURL_PREFIX_SIZE )
- {
- // Performance: Retrieve user interface name only for custom user interface elements.
- // It's only used by them!
- UIElementData* pDataSettings = impl_findUIElementData( pDefIter->second.aResourceURL, nElementType );
- if ( pDataSettings )
- {
- // Retrieve user interface name from XPropertySet interface
- rtl::OUString aUIName;
- Reference< XPropertySet > xPropSet( pDataSettings->xSettings, UNO_QUERY );
- if ( xPropSet.is() )
- {
- xPropSet->getPropertyValue( m_aPropUIName ) >>= aUIName;
- }
-
- UIElementInfo aInfo( pDefIter->second.aResourceURL, aUIName );
- aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pDefIter->second.aResourceURL, aInfo ));
- }
- }
- else
- {
- // The user interface name for standard user interface elements is stored in the WindowState.xcu file
- UIElementInfo aInfo( pDefIter->second.aResourceURL, rtl::OUString() );
- aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pDefIter->second.aResourceURL, aInfo ));
- }
- }
-
- ++pDefIter;
- } // while ( pDefIter != rDefaultElements.end() )
- }
-}
-
-void UIConfigurationManagerImpl::impl_preloadUIElementTypeList( Layer eLayer, sal_Int16 nElementType )
-{
- UIElementType& rElementTypeData = m_aUIElements[eLayer][nElementType];
-
- if ( !rElementTypeData.bLoaded )
- {
- Reference< XStorage > xElementTypeStorage = rElementTypeData.xStorage;
- if ( xElementTypeStorage.is() )
- {
- rtl::OUStringBuffer aBuf( RESOURCEURL_PREFIX_SIZE );
- aBuf.appendAscii( RESOURCEURL_PREFIX );
- aBuf.appendAscii( UIELEMENTTYPENAMES[ nElementType ] );
- aBuf.appendAscii( "/" );
- rtl::OUString aResURLPrefix( aBuf.makeStringAndClear() );
-
- UIElementDataHashMap& rHashMap = rElementTypeData.aElementsHashMap;
- Reference< XNameAccess > xNameAccess( xElementTypeStorage, UNO_QUERY );
- Sequence< rtl::OUString > aUIElementNames = xNameAccess->getElementNames();
- for ( sal_Int32 n = 0; n < aUIElementNames.getLength(); n++ )
- {
- UIElementData aUIElementData;
-
- // Resource name must be without ".xml"
- sal_Int32 nIndex = aUIElementNames[n].lastIndexOf( '.' );
- if (( nIndex > 0 ) && ( nIndex < aUIElementNames[n].getLength() ))
- {
- rtl::OUString aExtension( aUIElementNames[n].copy( nIndex+1 ));
- rtl::OUString aUIElementName( aUIElementNames[n].copy( 0, nIndex ));
-
- if (( aUIElementName.getLength() > 0 ) &&
- ( aExtension.equalsIgnoreAsciiCaseAsciiL( "xml", 3 )))
- {
- aUIElementData.aResourceURL = aResURLPrefix + aUIElementName;
- aUIElementData.aName = aUIElementNames[n];
-
- if ( eLayer == LAYER_USERDEFINED )
- {
- aUIElementData.bModified = false;
- aUIElementData.bDefault = false;
- aUIElementData.bDefaultNode = false;
- }
-
- // Create boost::unordered_map entries for all user interface elements inside the storage. We don't load the
- // settings to speed up the process.
- rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData ));
- }
- }
- }
- }
- }
-
- rElementTypeData.bLoaded = true;
-}
-
-void UIConfigurationManagerImpl::impl_requestUIElementData( sal_Int16 nElementType, Layer eLayer, UIElementData& aUIElementData )
-{
- UIElementType& rElementTypeData = m_aUIElements[eLayer][nElementType];
-
- Reference< XStorage > xElementTypeStorage = rElementTypeData.xStorage;
- if ( xElementTypeStorage.is() && aUIElementData.aName.getLength() )
- {
- try
- {
- Reference< XStream > xStream = xElementTypeStorage->openStreamElement( aUIElementData.aName, ElementModes::READ );
- Reference< XInputStream > xInputStream = xStream->getInputStream();
-
- if ( xInputStream.is() )
- {
- switch ( nElementType )
- {
- case ::com::sun::star::ui::UIElementType::UNKNOWN:
- break;
-
- case ::com::sun::star::ui::UIElementType::MENUBAR:
- {
- try
- {
- MenuConfiguration aMenuCfg( m_xServiceManager );
- Reference< XIndexAccess > xContainer( aMenuCfg.CreateMenuBarConfigurationFromXML( xInputStream ));
- RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xContainer );
- if ( pRootItemContainer )
- aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY );
- else
- aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( xContainer, sal_True ) ), UNO_QUERY );
- return;
- }
- catch ( ::com::sun::star::lang::WrappedTargetException& )
- {
- }
- }
- break;
-
- case ::com::sun::star::ui::UIElementType::POPUPMENU:
- {
- break;
- }
-
- case ::com::sun::star::ui::UIElementType::TOOLBAR:
- {
- try
- {
- Reference< XIndexContainer > xIndexContainer( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY );
- ToolBoxConfiguration::LoadToolBox( m_xServiceManager, xInputStream, xIndexContainer );
- RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xIndexContainer );
- aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY );
- return;
- }
- catch ( ::com::sun::star::lang::WrappedTargetException& )
- {
- }
-
- break;
- }
-
- case ::com::sun::star::ui::UIElementType::STATUSBAR:
- {
- try
- {
- Reference< XIndexContainer > xIndexContainer( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY );
- StatusBarConfiguration::LoadStatusBar( m_xServiceManager, xInputStream, xIndexContainer );
- RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xIndexContainer );
- aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY );
- return;
- }
- catch ( ::com::sun::star::lang::WrappedTargetException& )
- {
- }
-
- break;
- }
-
- case ::com::sun::star::ui::UIElementType::FLOATINGWINDOW:
- {
- break;
- }
- }
- }
- }
- catch ( ::com::sun::star::embed::InvalidStorageException& )
- {
- }
- catch ( ::com::sun::star::lang::IllegalArgumentException& )
- {
- }
- catch ( ::com::sun::star::io::IOException& )
- {
- }
- catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
- {
- }
- }
-
- // At least we provide an empty settings container!
- aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer() ), UNO_QUERY );
-}
-
-UIConfigurationManagerImpl::UIElementData* UIConfigurationManagerImpl::impl_findUIElementData( const rtl::OUString& aResourceURL, sal_Int16 nElementType, bool bLoad )
-{
- // preload list of element types on demand
- impl_preloadUIElementTypeList( LAYER_USERDEFINED, nElementType );
- if ( m_bUseDefault )
- impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType );
-
- // first try to look into our user-defined vector/boost::unordered_map combination
- UIElementDataHashMap& rUserHashMap = m_aUIElements[LAYER_USERDEFINED][nElementType].aElementsHashMap;
- UIElementDataHashMap::iterator pIter = rUserHashMap.find( aResourceURL );
- if ( pIter != rUserHashMap.end() )
- {
- // Default data settings data must be retrieved from the default layer!
- if ( !pIter->second.bDefault )
- {
- if ( !pIter->second.xSettings.is() && bLoad )
- impl_requestUIElementData( nElementType, LAYER_USERDEFINED, pIter->second );
- return &(pIter->second);
- }
- }
-
- if ( m_bUseDefault )
- {
- // Not successfull, we have to look into our default vector/boost::unordered_map combination
- UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap;
- pIter = rDefaultHashMap.find( aResourceURL );
- if ( pIter != rDefaultHashMap.end() )
- {
- if ( !pIter->second.xSettings.is() && bLoad )
- impl_requestUIElementData( nElementType, LAYER_DEFAULT, pIter->second );
- return &(pIter->second);
- } // if ( pIter != rDefaultHashMap.end() )
- }
-
- // Nothing has been found!
- return NULL;
-}
-
-void UIConfigurationManagerImpl::impl_storeElementTypeData( Reference< XStorage > xStorage, UIElementType& rElementType, bool bResetModifyState )
-{
- UIElementDataHashMap& rHashMap = rElementType.aElementsHashMap;
- UIElementDataHashMap::iterator pIter = rHashMap.begin();
-
- while ( pIter != rHashMap.end() )
- {
- UIElementData& rElement = pIter->second;
- if ( rElement.bModified )
- {
- if ( rElement.bDefault )
- {
- xStorage->removeElement( rElement.aName );
- rElement.bModified = sal_False; // mark as not modified
- }
- else
- {
- Reference< XStream > xStream( xStorage->openStreamElement( rElement.aName, ElementModes::WRITE|ElementModes::TRUNCATE ), UNO_QUERY );
- Reference< XOutputStream > xOutputStream( xStream->getOutputStream() );
-
- if ( xOutputStream.is() )
- {
- switch( rElementType.nElementType )
- {
- case ::com::sun::star::ui::UIElementType::MENUBAR:
- {
- try
- {
- MenuConfiguration aMenuCfg( m_xServiceManager );
- aMenuCfg.StoreMenuBarConfigurationToXML( rElement.xSettings, xOutputStream );
- }
- catch ( ::com::sun::star::lang::WrappedTargetException& )
- {
- }
- }
- break;
-
- case ::com::sun::star::ui::UIElementType::TOOLBAR:
- {
- try
- {
- ToolBoxConfiguration::StoreToolBox( m_xServiceManager, xOutputStream, rElement.xSettings );
- }
- catch ( ::com::sun::star::lang::WrappedTargetException& )
- {
- }
- }
- break;
-
- case ::com::sun::star::ui::UIElementType::STATUSBAR:
- {
- try
- {
- StatusBarConfiguration::StoreStatusBar( m_xServiceManager, xOutputStream, rElement.xSettings );
- }
- catch ( ::com::sun::star::lang::WrappedTargetException& )
- {
- }
- }
- break;
-
- default:
- break;
- }
- }
-
- // mark as not modified if we store to our own storage
- if ( bResetModifyState )
- rElement.bModified = sal_False;
- }
- }
-
- ++pIter;
- }
-
- // commit element type storage
- Reference< XTransactedObject > xTransactedObject( xStorage, UNO_QUERY );
- if ( xTransactedObject.is() )
- xTransactedObject->commit();
-
- // mark UIElementType as not modified if we store to our own storage
- if ( bResetModifyState )
- rElementType.bModified = sal_False;
-}
-
-// This is only allowed to be called on the LAYER_USER_DEFINED!
-void UIConfigurationManagerImpl::impl_resetElementTypeData(
- UIElementType& rUserElementType,
- UIElementType& rDefaultElementType,
- ConfigEventNotifyContainer& rRemoveNotifyContainer,
- ConfigEventNotifyContainer& rReplaceNotifyContainer )
-{
- UIElementDataHashMap& rHashMap = rUserElementType.aElementsHashMap;
- UIElementDataHashMap::iterator pIter = rHashMap.begin();
-
- Reference< XUIConfigurationManager > xThis( m_xOwner, UNO_QUERY );
- Reference< XNameAccess > xDefaultNameAccess( rDefaultElementType.xStorage, UNO_QUERY );
- sal_Int16 nType = rUserElementType.nElementType;
-
- // Make copies of the event structures to be thread-safe. We have to unlock our mutex before calling
- // our listeners!
- while ( pIter != rHashMap.end() )
- {
- UIElementData& rElement = pIter->second;
- if ( !rElement.bDefault )
- {
- if ( m_bUseDefault && xDefaultNameAccess->hasByName( rElement.aName ))
- {
- // Replace settings with data from default layer
- Reference< XIndexAccess > xOldSettings( rElement.xSettings );
- impl_requestUIElementData( nType, LAYER_DEFAULT, rElement );
-
- ConfigurationEvent aReplaceEvent;
- aReplaceEvent.ResourceURL = rElement.aResourceURL;
- aReplaceEvent.Accessor <<= xThis;
- aReplaceEvent.Source = m_xOwner;
- aReplaceEvent.ReplacedElement <<= xOldSettings;
- aReplaceEvent.Element <<= rElement.xSettings;
-
- rReplaceNotifyContainer.push_back( aReplaceEvent );
-
- // Mark element as default and not modified. That means "not active"
- // in the user layer anymore.
- rElement.bModified = false;
- rElement.bDefault = true;
- }
- else
- {
- // Remove user-defined settings from user layer
- ConfigurationEvent aEvent;
- aEvent.ResourceURL = rElement.aResourceURL;
- aEvent.Accessor <<= xThis;
- aEvent.Source = m_xOwner;
- aEvent.Element <<= rElement.xSettings;
-
- rRemoveNotifyContainer.push_back( aEvent );
-
- // Mark element as default and not modified. That means "not active"
- // in the user layer anymore.
- rElement.bModified = false;
- rElement.bDefault = true;
- }
- } // if ( !rElement.bDefault )
- else
- rElement.bModified = false;
-
- ++pIter;
- }
-
- // Remove all settings from our user interface elements
- rHashMap.clear();
-}
-
-void UIConfigurationManagerImpl::impl_reloadElementTypeData(
- UIElementType& rUserElementType,
- UIElementType& rDefaultElementType,
- ConfigEventNotifyContainer& rRemoveNotifyContainer,
- ConfigEventNotifyContainer& rReplaceNotifyContainer )
-{
- UIElementDataHashMap& rHashMap = rUserElementType.aElementsHashMap;
- UIElementDataHashMap::iterator pIter = rHashMap.begin();
- Reference< XStorage > xUserStorage( rUserElementType.xStorage );
- Reference< XStorage > xDefaultStorage( rDefaultElementType.xStorage );
- Reference< XNameAccess > xUserNameAccess( rUserElementType.xStorage, UNO_QUERY );
- Reference< XNameAccess > xDefaultNameAccess( rDefaultElementType.xStorage, UNO_QUERY );
-
- Reference< XUIConfigurationManager > xThis( m_xOwner, UNO_QUERY );
- sal_Int16 nType = rUserElementType.nElementType;
-
- while ( pIter != rHashMap.end() )
- {
- UIElementData& rElement = pIter->second;
- if ( rElement.bModified )
- {
- if ( xUserNameAccess->hasByName( rElement.aName ))
- {
- // Replace settings with data from user layer
- Reference< XIndexAccess > xOldSettings( rElement.xSettings );
-
- impl_requestUIElementData( nType, LAYER_USERDEFINED, rElement );
-
- ConfigurationEvent aReplaceEvent;
-
- aReplaceEvent.ResourceURL = rElement.aResourceURL;
- aReplaceEvent.Accessor <<= xThis;
- aReplaceEvent.Source = m_xOwner;
- aReplaceEvent.ReplacedElement <<= xOldSettings;
- aReplaceEvent.Element <<= rElement.xSettings;
- rReplaceNotifyContainer.push_back( aReplaceEvent );
-
- rElement.bModified = false;
- }
- else if ( m_bUseDefault && xDefaultNameAccess->hasByName( rElement.aName ))
- {
- // Replace settings with data from default layer
- Reference< XIndexAccess > xOldSettings( rElement.xSettings );
-
- impl_requestUIElementData( nType, LAYER_DEFAULT, rElement );
-
- ConfigurationEvent aReplaceEvent;
-
- aReplaceEvent.ResourceURL = rElement.aResourceURL;
- aReplaceEvent.Accessor <<= xThis;
- aReplaceEvent.Source = m_xOwner;
- aReplaceEvent.ReplacedElement <<= xOldSettings;
- aReplaceEvent.Element <<= rElement.xSettings;
- rReplaceNotifyContainer.push_back( aReplaceEvent );
-
- // Mark element as default and not modified. That means "not active"
- // in the user layer anymore.
- rElement.bModified = false;
- rElement.bDefault = true;
- }
- else
- {
- // Element settings are not in any storage => remove
- ConfigurationEvent aRemoveEvent;
-
- aRemoveEvent.ResourceURL = rElement.aResourceURL;
- aRemoveEvent.Accessor <<= xThis;
- aRemoveEvent.Source = m_xOwner;
- aRemoveEvent.Element <<= rElement.xSettings;
-
- rRemoveNotifyContainer.push_back( aRemoveEvent );
-
- // Mark element as default and not modified. That means "not active"
- // in the user layer anymore.
- rElement.bModified = false;
- rElement.bDefault = true;
- }
- }
- ++pIter;
- }
-
- rUserElementType.bModified = sal_False;
-}
-
-void UIConfigurationManagerImpl::impl_Initialize()
-{
- // Initialize the top-level structures with the storage data
- if ( m_xUserConfigStorage.is() )
- {
- // Try to access our module sub folder
- for ( sal_Int16 i = 1; i < ::com::sun::star::ui::UIElementType::COUNT;
- i++ )
- {
- Reference< XStorage > xElementTypeStorage;
- try
- {
- if ( m_pStorageHandler[i] )
- xElementTypeStorage = m_pStorageHandler[i]->getWorkingStorageUser();
- }
- catch ( com::sun::star::container::NoSuchElementException& )
- {
- }
- catch ( ::com::sun::star::embed::InvalidStorageException& )
- {
- }
- catch ( ::com::sun::star::lang::IllegalArgumentException& )
- {
- }
- catch ( ::com::sun::star::io::IOException& )
- {
- }
- catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
- {
- }
-
- m_aUIElements[LAYER_USERDEFINED][i].nElementType = i;
- m_aUIElements[LAYER_USERDEFINED][i].bModified = false;
- m_aUIElements[LAYER_USERDEFINED][i].xStorage = xElementTypeStorage;
- m_aUIElements[LAYER_USERDEFINED][i].bDefaultLayer = false;
- }
- } // if ( m_xUserConfigStorage.is() )
- else if ( !m_bUseDefault )
- {
- // We have no storage, just initialize ui element types with empty storage!
- for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
- m_aUIElements[LAYER_USERDEFINED][i].xStorage.clear();
- }
-
- if ( m_bUseDefault && m_xUserConfigStorage.is() )
- {
- Reference< XNameAccess > xNameAccess( m_xDefaultConfigStorage, UNO_QUERY_THROW );
-
- // Try to access our module sub folder
- for ( sal_Int16 i = 1; i < ::com::sun::star::ui::UIElementType::COUNT;
- i++ )
- {
- Reference< XStorage > xElementTypeStorage;
- try
- {
- xNameAccess->getByName( rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] )) >>= xElementTypeStorage;
- }
- catch ( com::sun::star::container::NoSuchElementException& )
- {
- }
-
- m_aUIElements[LAYER_DEFAULT][i].nElementType = i;
- m_aUIElements[LAYER_DEFAULT][i].bModified = false;
- m_aUIElements[LAYER_DEFAULT][i].xStorage = xElementTypeStorage;
- m_aUIElements[LAYER_DEFAULT][i].bDefaultLayer = true;
- }
- }
-}
-
-UIConfigurationManagerImpl::UIConfigurationManagerImpl( const Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager
- ,const Reference< XInterface >& _xOwner
- , bool _bUseDefault) :
- ThreadHelpBase( &Application::GetSolarMutex() )
- , m_xOwner( _xOwner )
- , m_bUseDefault(_bUseDefault)
- , m_bReadOnly( true )
- , m_bInitialized( false )
- , m_bModified( false )
- , m_bConfigRead( false )
- , m_bDisposed( false )
- , m_aXMLPostfix( RTL_CONSTASCII_USTRINGPARAM( ".xml" ))
- , m_aPropUIName( RTL_CONSTASCII_USTRINGPARAM( "UIName" ))
- , m_aPropResourceURL( RTL_CONSTASCII_USTRINGPARAM( "ResourceURL" ))
- , m_xServiceManager( xServiceManager )
- , m_aListenerContainer( m_aLock.getShareableOslMutex() )
-{
- for ( int i = 0; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
- m_pStorageHandler[i] = 0;
-
- // Make sure we have a default initialized entry for every layer and user interface element type!
- // The following code depends on this!
- m_aUIElements[LAYER_DEFAULT].resize( ::com::sun::star::ui::UIElementType::COUNT );
- m_aUIElements[LAYER_USERDEFINED].resize( ::com::sun::star::ui::UIElementType::COUNT );
-}
-
-UIConfigurationManagerImpl::~UIConfigurationManagerImpl()
-{
- for ( int i = 0; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
- delete m_pStorageHandler[i];
-}
-
-// XComponent
-void UIConfigurationManagerImpl::dispose() throw (::com::sun::star::uno::RuntimeException)
-{
- css::lang::EventObject aEvent( m_xOwner );
- m_aListenerContainer.disposeAndClear( aEvent );
-
- {
- ResetableGuard aGuard( m_aLock );
- try
- {
- if ( m_xModuleImageManager.is() )
- m_xModuleImageManager->dispose();
- }
- catch ( Exception& )
- {
- }
-
- m_xModuleImageManager.clear();
- m_aUIElements[LAYER_USERDEFINED].clear();
- m_aUIElements[LAYER_DEFAULT].clear();
- m_xDefaultConfigStorage.clear();
- m_xUserConfigStorage.clear();
- m_xUserRootCommit.clear();
- m_bConfigRead = false;
- m_bModified = false;
- m_bDisposed = true;
- }
-}
-
-void UIConfigurationManagerImpl::addEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
-{
- {
- ResetableGuard aGuard( m_aLock );
-
- /* SAFE AREA ----------------------------------------------------------------------------------------------- */
- if ( m_bDisposed )
- throw DisposedException();
- }
-
- m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
-}
-
-void UIConfigurationManagerImpl::removeEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
-{
- /* SAFE AREA ----------------------------------------------------------------------------------------------- */
- m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
-}
-
-// XInitialization
-void UIConfigurationManagerImpl::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
-{
- ResetableGuard aLock( m_aLock );
-
- if ( !m_bInitialized )
- {
- ::comphelper::SequenceAsHashMap lArgs(aArguments);
- m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleIdentifier")), ::rtl::OUString());
- m_aModuleShortName = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleShortName")), ::rtl::OUString());
-
- for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
- {
- rtl::OUString aResourceType;
- if ( i == ::com::sun::star::ui::UIElementType::MENUBAR )
- aResourceType = PresetHandler::RESOURCETYPE_MENUBAR();
- else if ( i == ::com::sun::star::ui::UIElementType::TOOLBAR )
- aResourceType = PresetHandler::RESOURCETYPE_TOOLBAR();
- else if ( i == ::com::sun::star::ui::UIElementType::STATUSBAR )
- aResourceType = PresetHandler::RESOURCETYPE_STATUSBAR();
-
- if ( aResourceType.getLength() > 0 )
- {
- m_pStorageHandler[i] = new PresetHandler( m_xServiceManager );
- m_pStorageHandler[i]->connectToResource( PresetHandler::E_MODULES,
- aResourceType, // this path wont be used later ... seee next lines!
- m_aModuleShortName,
- css::uno::Reference< css::embed::XStorage >()); // no document root used here!
- }
- }
-
- // initialize root storages for all resource types
- m_xUserRootCommit = css::uno::Reference< css::embed::XTransactedObject >(
- m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getOrCreateRootStorageUser(), css::uno::UNO_QUERY); // can be empty
- m_xDefaultConfigStorage = m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getParentStorageShare(
- m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageShare());
- m_xUserConfigStorage = m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getParentStorageUser(
- m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageUser());
-
- if ( m_xUserConfigStorage.is() )
- {
- Reference< XPropertySet > xPropSet( m_xUserConfigStorage, UNO_QUERY );
- if ( xPropSet.is() )
- {
- long nOpenMode = 0;
- if ( xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OpenMode" ))) >>= nOpenMode )
- m_bReadOnly = !( nOpenMode & ElementModes::WRITE );
- }
- }
-
- impl_Initialize();
-
- m_bInitialized = true;
- }
-}
-
-// XUIConfiguration
-void UIConfigurationManagerImpl::addConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
-{
- {
- ResetableGuard aGuard( m_aLock );
-
- /* SAFE AREA ----------------------------------------------------------------------------------------------- */
- if ( m_bDisposed )
- throw DisposedException();
- }
-
- m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XUIConfigurationListener >* ) NULL ), xListener );
-}
-
-void UIConfigurationManagerImpl::removeConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
-{
- /* SAFE AREA ----------------------------------------------------------------------------------------------- */
- m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XUIConfigurationListener >* ) NULL ), xListener );
-}
-
-
-// XUIConfigurationManager
-void UIConfigurationManagerImpl::reset() throw (::com::sun::star::uno::RuntimeException)
-{
- ResetableGuard aGuard( m_aLock );
-
- /* SAFE AREA ----------------------------------------------------------------------------------------------- */
- if ( m_bDisposed )
- throw DisposedException();
-
- if ( !isReadOnly() )
- {
- // Remove all elements from our user-defined storage!
- try
- {
- for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
- {
- UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][i];
- Reference< XStorage > xSubStorage( rElementType.xStorage, UNO_QUERY );
-
- if ( xSubStorage.is() )
- {
- bool bCommitSubStorage( false );
- Reference< XNameAccess > xSubStorageNameAccess( xSubStorage, UNO_QUERY );
- Sequence< rtl::OUString > aUIElementStreamNames = xSubStorageNameAccess->getElementNames();
- for ( sal_Int32 j = 0; j < aUIElementStreamNames.getLength(); j++ )
- {
- xSubStorage->removeElement( aUIElementStreamNames[j] );
- bCommitSubStorage = true;
- }
-
- if ( bCommitSubStorage )
- {
- Reference< XTransactedObject > xTransactedObject( xSubStorage, UNO_QUERY );
- if ( xTransactedObject.is() )
- xTransactedObject->commit();
- m_pStorageHandler[i]->commitUserChanges();
- }
- }
- }
-
- // remove settings from user defined layer and notify listener about removed settings data!
- ConfigEventNotifyContainer aRemoveEventNotifyContainer;
- ConfigEventNotifyContainer aReplaceEventNotifyContainer;
- for ( sal_Int16 j = 1; j < ::com::sun::star::ui::UIElementType::COUNT; j++ )
- {
- try
- {
- UIElementType& rUserElementType = m_aUIElements[LAYER_USERDEFINED][j];
- UIElementType& rDefaultElementType = m_aUIElements[LAYER_DEFAULT][j];
-
- impl_resetElementTypeData( rUserElementType, rDefaultElementType, aRemoveEventNotifyContainer, aReplaceEventNotifyContainer );
- rUserElementType.bModified = sal_False;
- }
- catch ( Exception& )
- {
- throw IOException();
- }
- }
-
- m_bModified = sal_False;
-
- // Unlock mutex before notify our listeners
- aGuard.unlock();
-
- // Notify our listeners
- ::std::for_each(aRemoveEventNotifyContainer.begin(),aRemoveEventNotifyContainer.end(),::boost::bind(&UIConfigurationManagerImpl::implts_notifyContainerListener,this,_1,NotifyOp_Remove));
- ::std::for_each(aReplaceEventNotifyContainer.begin(),aReplaceEventNotifyContainer.end(),::boost::bind(&UIConfigurationManagerImpl::implts_notifyContainerListener,this,_1,NotifyOp_Replace));
- }
- catch ( ::com::sun::star::lang::IllegalArgumentException& )
- {
- }
- catch ( ::com::sun::star::container::NoSuchElementException& )
- {
- }
- catch ( ::com::sun::star::embed::InvalidStorageException& )
- {
- }
- catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
- {
- }
- }
-}
-
-Sequence< Sequence< PropertyValue > > UIConfigurationManagerImpl::getUIElementsInfo( sal_Int16 ElementType )
-throw ( IllegalArgumentException, RuntimeException )
-{
- if (( ElementType < 0 ) || ( ElementType >= ::com::sun::star::ui::UIElementType::COUNT ))
- throw IllegalArgumentException();
-
- ResetableGuard aGuard( m_aLock );
- if ( m_bDisposed )
- throw DisposedException();
-
- Sequence< Sequence< PropertyValue > > aElementInfoSeq;
- UIElementInfoHashMap aUIElementInfoCollection;
-
- if ( ElementType == ::com::sun::star::ui::UIElementType::UNKNOWN )
- {
- for ( sal_Int16 i = 0; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
- impl_fillSequenceWithElementTypeInfo( aUIElementInfoCollection, sal_Int16( i ) );
- }
- else
- impl_fillSequenceWithElementTypeInfo( aUIElementInfoCollection, ElementType );
-
- Sequence< PropertyValue > aUIElementInfo( 2 );
- aUIElementInfo[0].Name = m_aPropResourceURL;
- aUIElementInfo[1].Name = m_aPropUIName;
-
- aElementInfoSeq.realloc( aUIElementInfoCollection.size() );
- UIElementInfoHashMap::const_iterator pIter = aUIElementInfoCollection.begin();
-
- sal_Int32 n = 0;
- while ( pIter != aUIElementInfoCollection.end() )
- {
- aUIElementInfo[0].Value <<= pIter->second.aResourceURL;
- aUIElementInfo[1].Value <<= pIter->second.aUIName;
- aElementInfoSeq[n++] = aUIElementInfo;
- ++pIter;
- }
-
- return aElementInfoSeq;
-}
-
-Reference< XIndexContainer > UIConfigurationManagerImpl::createSettings() throw (::com::sun::star::uno::RuntimeException)
-{
- ResetableGuard aGuard( m_aLock );
-
- if ( m_bDisposed )
- throw DisposedException();
-
- // Creates an empty item container which can be filled from outside
- return Reference< XIndexContainer >( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY );
-}
-
-sal_Bool UIConfigurationManagerImpl::hasSettings( const ::rtl::OUString& ResourceURL )
-throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
-{
- sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
-
- if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) ||
- ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT ))
- throw IllegalArgumentException();
- else
- {
- ResetableGuard aGuard( m_aLock );
-
- if ( m_bDisposed )
- throw DisposedException();
-
- UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType, false );
- if ( pDataSettings && ( m_bUseDefault || !pDataSettings->bDefault) )
- return sal_True;
- }
-
- return sal_False;
-}
-
-Reference< XIndexAccess > UIConfigurationManagerImpl::getSettings( const ::rtl::OUString& ResourceURL, sal_Bool bWriteable )
-throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
-{
- sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
-
- if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) ||
- ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT ))
- throw IllegalArgumentException();
- else
- {
- ResetableGuard aGuard( m_aLock );
-
- if ( m_bDisposed )
- throw DisposedException();
-
- UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType );
- if ( pDataSettings && ( m_bUseDefault || !pDataSettings->bDefault) )
- {
- // Create a copy of our data if someone wants to change the data.
- if ( bWriteable )
- return Reference< XIndexAccess >( static_cast< OWeakObject * >( new RootItemContainer( pDataSettings->xSettings ) ), UNO_QUERY );
- else
- return pDataSettings->xSettings;
- }
- }
-
- throw NoSuchElementException();
-}
-
-void UIConfigurationManagerImpl::replaceSettings( const ::rtl::OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData )
-throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException)
-{
- sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
-
- if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) ||
- ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT ))
- throw IllegalArgumentException();
- else if ( m_bReadOnly )
- throw IllegalAccessException();
- else
- {
- ResetableGuard aGuard( m_aLock );
-
- if ( m_bDisposed )
- throw DisposedException();
-
- UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list