diff options
Diffstat (limited to 'framework/inc/helper')
| -rw-r--r-- | framework/inc/helper/actiontriggerhelper.hxx | 78 | ||||
| -rw-r--r-- | framework/inc/helper/configimporter.hxx | 52 | ||||
| -rwxr-xr-x[-rw-r--r--] | framework/inc/helper/ilayoutnotifications.hxx (renamed from framework/inc/helper/acceleratorinfo.hxx) | 31 | ||||
| -rw-r--r-- | framework/inc/helper/imageproducer.hxx | 50 | ||||
| -rwxr-xr-x | framework/inc/helper/mischelper.hxx | 7 | ||||
| -rw-r--r-- | framework/inc/helper/networkdomain.hxx | 3 | ||||
| -rw-r--r-- | framework/inc/helper/propertysetcontainer.hxx | 3 | ||||
| -rw-r--r-- | framework/inc/helper/shareablemutex.hxx | 3 | ||||
| -rw-r--r-- | framework/inc/helper/titlehelper.hxx | 227 | ||||
| -rw-r--r-- | framework/inc/helper/uiconfigelementwrapperbase.hxx | 64 | ||||
| -rw-r--r-- | framework/inc/helper/uielementwrapperbase.hxx | 48 |
11 files changed, 87 insertions, 479 deletions
diff --git a/framework/inc/helper/actiontriggerhelper.hxx b/framework/inc/helper/actiontriggerhelper.hxx deleted file mode 100644 index 4e387a42509a..000000000000 --- a/framework/inc/helper/actiontriggerhelper.hxx +++ /dev/null @@ -1,78 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef __FRAMEWORK_HELPER_ACTIONTRIGGERHELPER_HXX_ -#define __FRAMEWORK_HELPER_ACTIONTRIGGERHELPER_HXX_ - -#include <com/sun/star/container/XIndexContainer.hpp> - -// #110897# -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <vcl/menu.hxx> - - -namespace framework -{ - class ActionTriggerHelper - { - public: - // Fills the submitted menu with the structure contained in the second - // parameter rActionTriggerContainer - // @param pNewMenu = must be a valid and empty menu - // @param rActionTriggerContainer = must be an instance of service "com.sun.star.ui.ActionTriggerContaienr" - static void - CreateMenuFromActionTriggerContainer( - Menu* pNewMenu, - const com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rActionTriggerContainer ); - - // Creates a "com::sun::star::ui::ActionTriggerContainer" with the structure of the menu - // provided as a parameter. The implementation class stores the menu pointer - // to optimize the time of creation of a menu from a actiontrigger structure. - // IMPORTANT: The caller must ensure that the menu pointer is valid through the - // life time of the XIndexContainer object!!! - // - // @param pNewMenu = Must be a valid menu. Please be aware that this implementation is based on - // the above mentioned restriction!!! - - // #110897# - static com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer > CreateActionTriggerContainerFromMenu( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - const Menu* pMenu, const ::rtl::OUString* pMenuIdentifier ); - - // Fills the submitted rActionTriggerContainer with the structure of the menu - // provided as the second parameter - // @param rActionTriggerContainer = must be an instance of service "com.sun.star.ui.ActionTriggerContainer" - // @param pNewMenu = must be a valid menu - static void - FillActionTriggerContainerFromMenu( - com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rActionTriggerContainer, - const Menu* pMenu ); - - }; -} - -#endif // __FRAMEWORK_HELPER_ACTIONTRIGGERHELPER_HXX_ diff --git a/framework/inc/helper/configimporter.hxx b/framework/inc/helper/configimporter.hxx deleted file mode 100644 index bbe465d85692..000000000000 --- a/framework/inc/helper/configimporter.hxx +++ /dev/null @@ -1,52 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef __FRAMEWORK_HELPER_CONFIGIMPORTER_HXX_ -#define __FRAMEWORK_HELPER_CONFIGIMPORTER_HXX_ - -#include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/embed/XStorage.hpp> -#include <com/sun/star/ui/XUIConfigurationManager.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> - -#include <rtl/ustring.hxx> - -namespace framework -{ - class UIConfigurationImporterOOo1x - { - public: - static sal_Bool ImportCustomToolbars( - const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >& rContainerFactory, - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > >& rSeqContainer, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager, - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rToolbarStorage ); - }; - -} // namespace framework - -#endif // __FRAMEWORK_HELPER_CONFIGIMPORTER_HXX_ diff --git a/framework/inc/helper/acceleratorinfo.hxx b/framework/inc/helper/ilayoutnotifications.hxx index bb529303df89..db63ea15c7b4 100644..100755 --- a/framework/inc/helper/acceleratorinfo.hxx +++ b/framework/inc/helper/ilayoutnotifications.hxx @@ -6,6 +6,9 @@ * * 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 @@ -25,25 +28,25 @@ * ************************************************************************/ -#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> +#ifndef __FRAMEWORK_LAYOUTMANAGER_ILAYOUTNOTIFICATIONS_HXX_ +#define __FRAMEWORK_LAYOUTMANAGER_ILAYOUTNOTIFICATIONS_HXX_ 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 ); +class ILayoutNotifications +{ + public: + enum Hint + { + HINT_NOT_SPECIFIED, + HINT_TOOLBARSPACE_HAS_CHANGED, + HINT_COUNT + }; -::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 ); + virtual void requestLayout( Hint eHint = HINT_NOT_SPECIFIED ) = 0; +}; } -#endif // __FRAMEWORK_HELPER_ACCELERATORINFO_HXX_ +#endif // __FRAMEWORK_LAYOUTMANAGER_ILAYOUTNOTIFICATIONS_HXX_ diff --git a/framework/inc/helper/imageproducer.hxx b/framework/inc/helper/imageproducer.hxx deleted file mode 100644 index c11ab44f26f4..000000000000 --- a/framework/inc/helper/imageproducer.hxx +++ /dev/null @@ -1,50 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef __FRAMEWORK_HELPER_IMAGEPRODUCER_HXX_ -#define __FRAMEWORK_HELPER_IMAGEPRODUCER_HXX_ - -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ -#include <sal/types.h> -#include <com/sun/star/frame/XFrame.hpp> -#include <vcl/image.hxx> -#include <rtl/ustring.hxx> - -namespace framework -{ - -typedef Image ( *pfunc_getImage)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast ); - -pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pGetImageFunc ); - -Image SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast ); - -} - -#endif // __FRAMEWORK_HELPER_IMAGEPRODUCER_HXX_ diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx index 6a1886244b54..5698974930ca 100755 --- a/framework/inc/helper/mischelper.hxx +++ b/framework/inc/helper/mischelper.hxx @@ -35,6 +35,7 @@ #include <i18npool/lang.h> #include <svl/languageoptions.hxx> #include <rtl/ustring.hxx> +#include <fwidllapi.h> #include <set> @@ -90,7 +91,7 @@ inline bool IsScriptTypeMatchingToLanguage( sal_Int16 nScriptType, LanguageType } -class LanguageGuessingHelper +class FWI_DLLPUBLIC LanguageGuessingHelper { mutable ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing > m_xLanguageGuesser; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; @@ -101,7 +102,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing > GetGuesser() const; }; -::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL +FWI_DLLPUBLIC ::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory ,::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xUICommandLabels ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame @@ -109,7 +110,7 @@ public: ,sal_Bool& _rIni ,const sal_Char* _pName); -void FillLangItems( std::set< ::rtl::OUString > &rLangItems, +FWI_DLLPUBLIC void FillLangItems( std::set< ::rtl::OUString > &rLangItems, const SvtLanguageTable &rLanguageTable, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > &rxFrame, const LanguageGuessingHelper & rLangGuessHelper, diff --git a/framework/inc/helper/networkdomain.hxx b/framework/inc/helper/networkdomain.hxx index 577b8a2672ad..55db4bf708dc 100644 --- a/framework/inc/helper/networkdomain.hxx +++ b/framework/inc/helper/networkdomain.hxx @@ -29,11 +29,12 @@ #define __FRAMEWORK_HELPER_NETWORKDOMAIN_HXX_ #include <rtl/ustring.hxx> +#include <fwidllapi.h> namespace framework { -class NetworkDomain +class FWI_DLLPUBLIC NetworkDomain { public: static rtl::OUString GetNTDomainName(); diff --git a/framework/inc/helper/propertysetcontainer.hxx b/framework/inc/helper/propertysetcontainer.hxx index 3420aa58b9c3..d1c50d3d9a14 100644 --- a/framework/inc/helper/propertysetcontainer.hxx +++ b/framework/inc/helper/propertysetcontainer.hxx @@ -37,11 +37,12 @@ #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <threadhelp/threadhelpbase.hxx> +#include <framework/fwedllapi.h> namespace framework { -class PropertySetContainer : public com::sun::star::container::XIndexContainer , +class FWE_DLLPUBLIC PropertySetContainer : public com::sun::star::container::XIndexContainer , public ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::OWeakObject { diff --git a/framework/inc/helper/shareablemutex.hxx b/framework/inc/helper/shareablemutex.hxx index c591bb54d5c9..1d323551b841 100644 --- a/framework/inc/helper/shareablemutex.hxx +++ b/framework/inc/helper/shareablemutex.hxx @@ -30,11 +30,12 @@ #include <osl/interlck.h> #include <osl/mutex.hxx> +#include <fwidllapi.h> namespace framework { -class ShareableMutex +class FWI_DLLPUBLIC ShareableMutex { public: ShareableMutex(); diff --git a/framework/inc/helper/titlehelper.hxx b/framework/inc/helper/titlehelper.hxx deleted file mode 100644 index 2be3e1325bb4..000000000000 --- a/framework/inc/helper/titlehelper.hxx +++ /dev/null @@ -1,227 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _FRAMEWORK_TITLEHELPER_HXX_ -#define _FRAMEWORK_TITLEHELPER_HXX_ - -//_______________________________________________ -// includes - -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/XInterface.hpp> -#include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/frame/XUntitledNumbers.hpp> -#include <com/sun/star/frame/XTitle.hpp> -#include <com/sun/star/frame/XTitleChangeBroadcaster.hpp> -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XFrameActionListener.hpp> -#include <com/sun/star/document/XEventListener.hpp> - -#include <cppuhelper/basemutex.hxx> -#include <cppuhelper/weakref.hxx> -#include <cppuhelper/implbase5.hxx> -#include <cppuhelper/interfacecontainer.hxx> - -#include <rtl/ustrbuf.hxx> - -#include <hash_map> - -//_______________________________________________ -// namespace - -namespace framework{ - -#ifdef css - #error "Ambigious namespace definition of css." -#else - #define css ::com::sun::star -#endif - -//_______________________________________________ -// definitions - -/** @short can be used as implementation helper of interface css.frame.XTitle - - @threadsafe - */ -class TitleHelper : private ::cppu::BaseMutex - , public ::cppu::WeakImplHelper5< css::frame::XTitle , - css::frame::XTitleChangeBroadcaster, - css::frame::XTitleChangeListener , - css::frame::XFrameActionListener , - css::document::XEventListener > -{ - //------------------------------------------- - // interface - public: - - //--------------------------------------- - /** @short lightweight constructor. - */ - TitleHelper(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); - - //--------------------------------------- - /** @short free all internaly used resources. - */ - virtual ~TitleHelper(); - - //--------------------------------------- - /** set an outside component which uses this container and must be set - as source of all broadcasted messages, exceptions. - - It's holded weak only so we do not need any complex dispose sessions. - - Note: Passing NULL as parameter will be alloed. It will reset the internal - member reference only. - - @param xOwner - the new owner of this collection. - */ - void setOwner (const css::uno::Reference< css::uno::XInterface >& xOwner); - - //--------------------------------------- - /** set an outside component which provides the righht string and number for - an untitled component. - - It's holded weak only so we do not need any complex dispose sessions. - - Note: Passing NULL as parameter will be alloed. It will reset the internal - member reference only. - - @param xNumbers - the right numbered collection for this helper. - */ - void connectWithUntitledNumbers (const css::uno::Reference< css::frame::XUntitledNumbers >& xNumbers); - - //--------------------------------------- - /** @see XTitle */ - virtual ::rtl::OUString SAL_CALL getTitle() - throw (css::uno::RuntimeException); - - //--------------------------------------- - /** @see XTitle */ - virtual void SAL_CALL setTitle(const ::rtl::OUString& sTitle) - throw (css::uno::RuntimeException); - - //--------------------------------------- - /** @see XTitleChangeBroadcaster */ - virtual void SAL_CALL addTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) - throw (css::uno::RuntimeException); - - //--------------------------------------- - /** @see XTitleChangeBroadcaster */ - virtual void SAL_CALL removeTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) - throw (css::uno::RuntimeException); - - //--------------------------------------- - /** @see XTitleChangeListener */ - virtual void SAL_CALL titleChanged(const css::frame::TitleChangedEvent& aEvent) - throw (css::uno::RuntimeException); - - //--------------------------------------- - /** @see css.document.XEventListener */ - virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent) - throw (css::uno::RuntimeException); - - //--------------------------------------- - /** @see css.lang.XEventListener */ - virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw (css::uno::RuntimeException); - - //--------------------------------------- - /** @see css.frame.XFrameActionListener */ - virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) - throw(css::uno::RuntimeException); - - //------------------------------------------- - // internal - private: - - void impl_sendTitleChangedEvent (); - - void impl_updateTitle (); - void impl_updateTitleForModel (const css::uno::Reference< css::frame::XModel >& xModel); - void impl_updateTitleForController (const css::uno::Reference< css::frame::XController >& xController); - void impl_updateTitleForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame); - - void impl_startListeningForModel (const css::uno::Reference< css::frame::XModel >& xModel); - void impl_startListeningForController (const css::uno::Reference< css::frame::XController >& xController); - void impl_startListeningForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame); - void impl_updateListeningForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame); - - void impl_appendComponentTitle ( ::rtl::OUStringBuffer& sTitle , - const css::uno::Reference< css::uno::XInterface >& xComponent); - void impl_appendProductName (::rtl::OUStringBuffer& sTitle); - void impl_appendProductExtension (::rtl::OUStringBuffer& sTitle); - void impl_appendModuleName (::rtl::OUStringBuffer& sTitle); - void impl_appendDebugVersion (::rtl::OUStringBuffer& sTitle); - void impl_appendEvalVersion (::rtl::OUStringBuffer& sTitle); - - void impl_setSubTitle (const css::uno::Reference< css::frame::XTitle >& xSubTitle); - ::rtl::OUString impl_getSubTitle (); - - ::rtl::OUString impl_convertURL2Title(const ::rtl::OUString& sURL); - - //------------------------------------------- - // member - private: - - /** points to the global uno service manager. */ - css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; - - /** reference to the outside UNO class using this helper. */ - css::uno::WeakReference< css::uno::XInterface > m_xOwner; - - /** used to know how an "Untitled X" string can be created right :-) */ - css::uno::WeakReference< css::frame::XUntitledNumbers > m_xUntitledNumbers; - - /** provides parts of our own title and we listen there for changes too. */ - css::uno::WeakReference< css::frame::XTitle > m_xSubTitle; - - /** if it's set to sal_True the member m_sTitle has not to be changed internaly. - It was set from outside and so outside code has to make sure it will be - updated. - */ - ::sal_Bool m_bExternalTitle; - - /** the actual title value */ - ::rtl::OUString m_sTitle; - - /** knows the leased number which must be used for untitled components. */ - ::sal_Int32 m_nLeasedNumber; - - /** contains all title change listener */ - ::cppu::OMultiTypeInterfaceContainerHelper m_aListener; -}; - -#undef css - -} // namespace framework - -#endif // _FRAMEWORK_TITLEHELPER_HXX_ diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx index 05ab216d6f06..a815e7ac544d 100644 --- a/framework/inc/helper/uiconfigelementwrapperbase.hxx +++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx @@ -58,6 +58,7 @@ #include <cppuhelper/propshlp.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/weak.hxx> +#include <framework/fwedllapi.h> namespace framework { @@ -78,45 +79,48 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider // public methods //------------------------------------------------------------------------------------------------------------- public: - UIConfigElementWrapperBase( sal_Int16 nType,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory ); - virtual ~UIConfigElementWrapperBase(); + FWE_DLLPUBLIC UIConfigElementWrapperBase( sal_Int16 nType,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory ); + virtual FWE_DLLPUBLIC ~UIConfigElementWrapperBase(); - //--------------------------------------------------------------------------------------------------------- - // XInterface, XTypeProvider - //--------------------------------------------------------------------------------------------------------- - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER + // XInterface + virtual FWE_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ); + virtual FWE_DLLPUBLIC void SAL_CALL acquire() throw(); + virtual FWE_DLLPUBLIC void SAL_CALL release() throw(); + + // XTypeProvider + virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException ); + virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException ); // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0; + virtual FWE_DLLPUBLIC void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) 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); + virtual FWE_DLLPUBLIC 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); // XUIElementSettings - virtual void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException) = 0; + virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException); // XUIElement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0; + virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0; // XUpdatable - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); // XUIConfigurationListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) 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); + virtual FWE_DLLPUBLIC void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); //------------------------------------------------------------------------------------------------------------- // protected methods @@ -124,21 +128,21 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider protected: // OPropertySetHelper - virtual sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue , + virtual FWE_DLLPUBLIC sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue , com::sun::star::uno::Any& aOldValue , sal_Int32 nHandle , const com::sun::star::uno::Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ); - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , + virtual FWE_DLLPUBLIC void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception ); using cppu::OPropertySetHelper::getFastPropertyValue; - virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue , + virtual FWE_DLLPUBLIC void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue , sal_Int32 nHandle ) const; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); - virtual void impl_fillNewData(); + virtual FWE_DLLPUBLIC void impl_fillNewData(); - static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); + static FWE_DLLPUBLIC const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); sal_Int16 m_nType; bool m_bPersistent : 1, diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx index bc83765b09fe..daa574c9411e 100644 --- a/framework/inc/helper/uielementwrapperbase.hxx +++ b/framework/inc/helper/uielementwrapperbase.hxx @@ -53,6 +53,7 @@ #include <cppuhelper/propshlp.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/weak.hxx> +#include <framework/fwedllapi.h> namespace framework { @@ -71,31 +72,34 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider // public methods //------------------------------------------------------------------------------------------------------------- public: - UIElementWrapperBase( sal_Int16 nType ); - virtual ~UIElementWrapperBase(); + FWE_DLLPUBLIC UIElementWrapperBase( sal_Int16 nType ); + virtual FWE_DLLPUBLIC ~UIElementWrapperBase(); - //--------------------------------------------------------------------------------------------------------- - // XInterface, XTypeProvider - //--------------------------------------------------------------------------------------------------------- - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER + // XInterface + virtual FWE_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ); + virtual FWE_DLLPUBLIC void SAL_CALL acquire() throw(); + virtual FWE_DLLPUBLIC void SAL_CALL release() throw(); + + // XTypeProvider + virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException ); + virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException ); // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0; + virtual FWE_DLLPUBLIC void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) 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); + virtual FWE_DLLPUBLIC 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); // XUpdatable - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); // XUIElement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0; + virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0; //------------------------------------------------------------------------------------------------------------- // protected methods @@ -103,19 +107,19 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider protected: // OPropertySetHelper - virtual sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue , + virtual FWE_DLLPUBLIC sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue , com::sun::star::uno::Any& aOldValue , sal_Int32 nHandle , const com::sun::star::uno::Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ); - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , + virtual FWE_DLLPUBLIC void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception ); using cppu::OPropertySetHelper::getFastPropertyValue; - virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue , + virtual FWE_DLLPUBLIC void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue , sal_Int32 nHandle ) const; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); - static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); + static FWE_DLLPUBLIC const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener rtl::OUString m_aResourceURL; |