From 39e9098c77157ea38411a237a6b52e0f76f12ce1 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Apr 2010 23:01:28 +0200 Subject: CWS gnumake2: export all symbols in framework using declspec --- framework/inc/classes/actiontriggercontainer.hxx | 4 +++- framework/inc/classes/actiontriggerpropertyset.hxx | 3 ++- .../classes/actiontriggerseparatorpropertyset.hxx | 2 ++ framework/inc/classes/addonmenu.hxx | 7 ++++--- framework/inc/classes/addonsoptions.hxx | 8 ++++---- framework/inc/classes/bmkmenu.hxx | 4 ++-- framework/inc/classes/converter.hxx | 3 ++- framework/inc/classes/framelistanalyzer.hxx | 3 ++- framework/inc/classes/fwkresid.hxx | 3 ++- framework/inc/classes/imagewrapper.hxx | 3 ++- framework/inc/classes/menuextensionsupplier.hxx | 7 ++++--- framework/inc/classes/propertysethelper.hxx | 3 ++- framework/inc/classes/protocolhandlercache.hxx | 11 ++++++----- .../inc/classes/rootactiontriggercontainer.hxx | 3 ++- framework/inc/classes/sfxhelperfunctions.hxx | 21 +++++++++++---------- 15 files changed, 50 insertions(+), 35 deletions(-) (limited to 'framework/inc/classes') diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx index 44186f2f7080..b523590f9abc 100644 --- a/framework/inc/classes/actiontriggercontainer.hxx +++ b/framework/inc/classes/actiontriggercontainer.hxx @@ -35,14 +35,16 @@ #include #include #include +#include #define SERVICENAME_ACTIONTRIGGERCONTAINER "com.sun.star.ui.ActionTriggerContainer" #define IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER "com.sun.star.comp.ui.ActionTriggerContainer" + namespace framework { -class ActionTriggerContainer : public PropertySetContainer, +class FWE_DLLPUBLIC ActionTriggerContainer : public PropertySetContainer, public com::sun::star::lang::XMultiServiceFactory, public com::sun::star::lang::XServiceInfo, public com::sun::star::lang::XTypeProvider diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx index 5c987ffebbc8..6d612c6f4751 100644 --- a/framework/inc/classes/actiontriggerpropertyset.hxx +++ b/framework/inc/classes/actiontriggerpropertyset.hxx @@ -44,6 +44,7 @@ #include #include #include +#include #define SERVICENAME_ACTIONTRIGGER "com.sun.star.ui.ActionTrigger" #define IMPLEMENTATIONNAME_ACTIONTRIGGER "com.sun.star.comp.ui.ActionTrigger" @@ -51,7 +52,7 @@ namespace framework { -class ActionTriggerPropertySet : public ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. +class FWE_DLLPUBLIC ActionTriggerPropertySet : public ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::com::sun::star::lang::XServiceInfo , public ::com::sun::star::lang::XTypeProvider, public ::cppu::OBroadcastHelper , diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx index d940f3d85eea..17053edf57f0 100644 --- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx +++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx @@ -40,10 +40,12 @@ #include #include #include +#include #define SERVICENAME_ACTIONTRIGGERSEPARATOR "com.sun.star.ui.ActionTriggerSeparator" #define IMPLEMENTATIONNAME_ACTIONTRIGGERSEPARATOR "com.sun.star.comp.ui.ActionTriggerSeparator" + namespace framework { diff --git a/framework/inc/classes/addonmenu.hxx b/framework/inc/classes/addonmenu.hxx index 0bce4509297d..3b60233eeaa7 100644 --- a/framework/inc/classes/addonmenu.hxx +++ b/framework/inc/classes/addonmenu.hxx @@ -43,6 +43,7 @@ //_________________________________________________________________________________________________________________ #include +#include #define ADDONMENU_ITEMID_START 2000 #define ADDONMENU_ITEMID_END 3000 @@ -50,7 +51,7 @@ namespace framework { -class AddonMenu : public PopupMenu +class FWE_DLLPUBLIC AddonMenu : public PopupMenu { public: AddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); @@ -61,7 +62,7 @@ class AddonMenu : public PopupMenu }; class AddonMenuManager; -class AddonPopupMenu : public AddonMenu +class FWE_DLLPUBLIC AddonPopupMenu : public AddonMenu { public: ~AddonPopupMenu(); @@ -83,7 +84,7 @@ class AddonPopupMenu : public AddonMenu friend class AddonMenuManager; }; -class AddonMenuManager +class FWE_DLLPUBLIC AddonMenuManager { public: enum MenuType diff --git a/framework/inc/classes/addonsoptions.hxx b/framework/inc/classes/addonsoptions.hxx index f1cc49cf5a72..fdd265491cb1 100644 --- a/framework/inc/classes/addonsoptions.hxx +++ b/framework/inc/classes/addonsoptions.hxx @@ -41,7 +41,7 @@ #include #include #include - +#include //_________________________________________________________________________________________________________________ // types, enums, ... //_________________________________________________________________________________________________________________ @@ -84,7 +84,7 @@ namespace framework typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > MergeMenuDefinition; -struct MergeMenuInstruction +struct FWE_DLLPUBLIC MergeMenuInstruction { ::rtl::OUString aMergePoint; ::rtl::OUString aMergeCommand; @@ -95,7 +95,7 @@ struct MergeMenuInstruction }; typedef ::std::vector< MergeMenuInstruction > MergeMenuInstructionContainer; -struct MergeToolbarInstruction +struct FWE_DLLPUBLIC MergeToolbarInstruction { ::rtl::OUString aMergeToolbar; ::rtl::OUString aMergePoint; @@ -135,7 +135,7 @@ class AddonsOptions_Impl; @devstatus ready to use *//*-*************************************************************************************************************/ -class AddonsOptions +class FWE_DLLPUBLIC AddonsOptions { //------------------------------------------------------------------------------------------------------------- // public methods diff --git a/framework/inc/classes/bmkmenu.hxx b/framework/inc/classes/bmkmenu.hxx index 5e4b2818afeb..8b624c6880ae 100644 --- a/framework/inc/classes/bmkmenu.hxx +++ b/framework/inc/classes/bmkmenu.hxx @@ -36,7 +36,7 @@ //_________________________________________________________________________________________________________________ #include - +#include //_________________________________________________________________________________________________________________ // includes of other projects //_________________________________________________________________________________________________________________ @@ -53,7 +53,7 @@ namespace framework { class BmkMenu_Impl; -class BmkMenu : public AddonMenu +class FWE_DLLPUBLIC BmkMenu : public AddonMenu { public: enum BmkMenuType diff --git a/framework/inc/classes/converter.hxx b/framework/inc/classes/converter.hxx index 7d792fa077b9..b36c9f1f7ca3 100644 --- a/framework/inc/classes/converter.hxx +++ b/framework/inc/classes/converter.hxx @@ -50,6 +50,7 @@ #include #include #include +#include //_________________________________________________________________________________________________________________ // namespace @@ -65,7 +66,7 @@ namespace framework{ // exported definitions //_________________________________________________________________________________________________________________ -class Converter +class FWI_DLLPUBLIC Converter { public: // Seq <=> Seq diff --git a/framework/inc/classes/framelistanalyzer.hxx b/framework/inc/classes/framelistanalyzer.hxx index 1680ab994f11..3c921186a2d7 100644 --- a/framework/inc/classes/framelistanalyzer.hxx +++ b/framework/inc/classes/framelistanalyzer.hxx @@ -44,6 +44,7 @@ //_______________________________________________ // other includes +#include //_______________________________________________ // namespace @@ -63,7 +64,7 @@ namespace framework{ to switch into the backing mode, close the current active frame only or exit the whole application explicitly or implicitly. */ -class FrameListAnalyzer +class FWI_DLLPUBLIC FrameListAnalyzer { //_______________________________________ // types diff --git a/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx index 8157dc6e15dd..8c541db028ec 100644 --- a/framework/inc/classes/fwkresid.hxx +++ b/framework/inc/classes/fwkresid.hxx @@ -32,11 +32,12 @@ #define __FRAMEWORK_CLASSES_FWKRESID_HXX_ #include +#include namespace framework { -class FwkResId : public ResId +class FWE_DLLPUBLIC FwkResId : public ResId { public: FwkResId( USHORT nId ); diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx index eb9e2fd00a74..a12bdec59ee5 100644 --- a/framework/inc/classes/imagewrapper.hxx +++ b/framework/inc/classes/imagewrapper.hxx @@ -37,11 +37,12 @@ #include #include #include +#include namespace framework { -class ImageWrapper : public ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. +class FWE_DLLPUBLIC ImageWrapper : public ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::WeakImplHelper2< ::com::sun::star::awt::XBitmap, ::com::sun::star::lang::XUnoTunnel > { diff --git a/framework/inc/classes/menuextensionsupplier.hxx b/framework/inc/classes/menuextensionsupplier.hxx index e747c9e23a80..2ea5c160993b 100644 --- a/framework/inc/classes/menuextensionsupplier.hxx +++ b/framework/inc/classes/menuextensionsupplier.hxx @@ -32,8 +32,9 @@ #define __FRAMEWORK_CLASSES_MENUEXTENSIONSUPPLIER_HXX_ #include +#include -struct MenuExtensionItem +struct FWE_DLLPUBLIC MenuExtensionItem { rtl::OUString aLabel; rtl::OUString aURL; @@ -44,9 +45,9 @@ typedef MenuExtensionItem ( *pfunc_setMenuExtensionSupplier)(); namespace framework { -pfunc_setMenuExtensionSupplier SAL_CALL SetMenuExtensionSupplier( pfunc_setMenuExtensionSupplier pSetMenuExtensionSupplier ); +FWE_DLLPUBLIC pfunc_setMenuExtensionSupplier SAL_CALL SetMenuExtensionSupplier( pfunc_setMenuExtensionSupplier pSetMenuExtensionSupplier ); -MenuExtensionItem SAL_CALL GetMenuExtension(); +FWE_DLLPUBLIC MenuExtensionItem SAL_CALL GetMenuExtension(); } diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx index d6b24561da51..0e7cdde3d72c 100644 --- a/framework/inc/classes/propertysethelper.hxx +++ b/framework/inc/classes/propertysethelper.hxx @@ -52,6 +52,7 @@ // other includes #include +#include //_________________________________________________________________________________________________________________ // namespace @@ -69,7 +70,7 @@ namespace framework{ * Further the derived and this base class share the same lock. * So it's possible to be threadsafe if it's needed. */ -class PropertySetHelper : public css::beans::XPropertySet +class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet , public css::beans::XPropertySetInfo { //------------------------------------------------------------------------- diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index 595b358a789a..b2af31bdf967 100644 --- a/framework/inc/classes/protocolhandlercache.hxx +++ b/framework/inc/classes/protocolhandlercache.hxx @@ -50,6 +50,7 @@ #include #include +#include //_________________________________________________________________________________________________________________ // namespace @@ -79,7 +80,7 @@ namespace framework{ This struct holds the information about one such registered protocol handler. A list of handler objects is defined as ProtocolHandlerHash. see below */ -struct ProtocolHandler +struct FWI_DLLPUBLIC ProtocolHandler { /* member */ public: @@ -97,7 +98,7 @@ struct ProtocolHandler uno implementation names as value. Overloading of the index operator makes it possible to search for a key by using a full qualified URL on list of all possible pattern keys. */ -class PatternHash : public BaseHash< ::rtl::OUString > +class FWI_DLLPUBLIC PatternHash : public BaseHash< ::rtl::OUString > { /* interface */ public: @@ -135,8 +136,8 @@ typedef BaseHash< ProtocolHandler > HandlerHash; @modified 30.04.2002 11:19, as96863 */ -class HandlerCFGAccess; -class HandlerCache +class FWI_DLLPUBLIC HandlerCFGAccess; +class FWI_DLLPUBLIC HandlerCache { /* member */ private: @@ -181,7 +182,7 @@ class HandlerCache @modified 30.04.2002 09:58, as96863 */ -class HandlerCFGAccess : public ::utl::ConfigItem +class FWI_DLLPUBLIC HandlerCFGAccess : public ::utl::ConfigItem { private: HandlerCache* m_pCache; diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx index 70e00d09033e..be6a11c0a9cb 100644 --- a/framework/inc/classes/rootactiontriggercontainer.hxx +++ b/framework/inc/classes/rootactiontriggercontainer.hxx @@ -38,6 +38,7 @@ #include #include #include +#include #define IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER "com.sun.star.comp.ui.RootActionTriggerContainer" @@ -45,7 +46,7 @@ namespace framework { -class RootActionTriggerContainer : public PropertySetContainer, +class FWE_DLLPUBLIC RootActionTriggerContainer : public PropertySetContainer, public com::sun::star::lang::XMultiServiceFactory, public com::sun::star::lang::XServiceInfo, public com::sun::star::lang::XUnoTunnel, diff --git a/framework/inc/classes/sfxhelperfunctions.hxx b/framework/inc/classes/sfxhelperfunctions.hxx index f34411edbb27..2d99c9796beb 100644 --- a/framework/inc/classes/sfxhelperfunctions.hxx +++ b/framework/inc/classes/sfxhelperfunctions.hxx @@ -31,6 +31,7 @@ #ifndef __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_ #define __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_ +#include #include #include #include @@ -47,25 +48,25 @@ typedef bool ( *pfunc_isDockingWindowVisible)( const ::com::sun::star::uno::Refe namespace framework { -pfunc_setToolBoxControllerCreator SAL_CALL SetToolBoxControllerCreator( pfunc_setToolBoxControllerCreator pSetToolBoxControllerCreator ); +FWE_DLLPUBLIC pfunc_setToolBoxControllerCreator SAL_CALL SetToolBoxControllerCreator( pfunc_setToolBoxControllerCreator pSetToolBoxControllerCreator ); -svt::ToolboxController* SAL_CALL CreateToolBoxController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL ); +FWE_DLLPUBLIC svt::ToolboxController* SAL_CALL CreateToolBoxController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL ); -pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator pSetStatusBarControllerCreator ); +FWE_DLLPUBLIC pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator pSetStatusBarControllerCreator ); -svt::StatusbarController* SAL_CALL CreateStatusBarController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const ::rtl::OUString& aCommandURL ); +FWE_DLLPUBLIC svt::StatusbarController* SAL_CALL CreateStatusBarController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const ::rtl::OUString& aCommandURL ); -pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars pRefreshToolbarsFunc ); +FWE_DLLPUBLIC pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars pRefreshToolbarsFunc ); -void SAL_CALL RefreshToolbars( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); +FWE_DLLPUBLIC void SAL_CALL RefreshToolbars( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); -pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingWindow pCreateDockingWindow ); +FWE_DLLPUBLIC pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingWindow pCreateDockingWindow ); -void SAL_CALL CreateDockingWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL ); +FWE_DLLPUBLIC void SAL_CALL CreateDockingWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL ); -pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDockingWindowVisible pIsDockingWindowVisible ); +FWE_DLLPUBLIC pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDockingWindowVisible pIsDockingWindowVisible ); -bool SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL ); +FWE_DLLPUBLIC bool SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL ); } #endif // __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_ -- cgit From 36ea4fb1e54249406893f794fbdad69181ab94df Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Apr 2010 19:05:02 +0200 Subject: CWS gnumake2: move all delivered framework headers to inc/framework --- framework/inc/classes/actiontriggercontainer.hxx | 2 +- framework/inc/classes/actiontriggerpropertyset.hxx | 2 +- .../classes/actiontriggerseparatorpropertyset.hxx | 2 +- framework/inc/classes/addonmenu.hxx | 141 -------- framework/inc/classes/addonsoptions.hxx | 374 --------------------- framework/inc/classes/bmkmenu.hxx | 81 ----- framework/inc/classes/fwkresid.hxx | 2 +- framework/inc/classes/imagewrapper.hxx | 2 +- framework/inc/classes/menuextensionsupplier.hxx | 51 --- .../inc/classes/rootactiontriggercontainer.hxx | 2 +- framework/inc/classes/sfxhelperfunctions.hxx | 69 ---- 11 files changed, 6 insertions(+), 722 deletions(-) delete mode 100644 framework/inc/classes/addonmenu.hxx delete mode 100644 framework/inc/classes/addonsoptions.hxx delete mode 100644 framework/inc/classes/bmkmenu.hxx delete mode 100644 framework/inc/classes/menuextensionsupplier.hxx delete mode 100644 framework/inc/classes/sfxhelperfunctions.hxx (limited to 'framework/inc/classes') diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx index 56ab8e8e7583..936f6cf0cdbb 100644 --- a/framework/inc/classes/actiontriggercontainer.hxx +++ b/framework/inc/classes/actiontriggercontainer.hxx @@ -32,7 +32,7 @@ #include #include #include -#include +#include #define SERVICENAME_ACTIONTRIGGERCONTAINER "com.sun.star.ui.ActionTriggerContainer" #define IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER "com.sun.star.comp.ui.ActionTriggerContainer" diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx index 37f71438f4b6..a02794891634 100644 --- a/framework/inc/classes/actiontriggerpropertyset.hxx +++ b/framework/inc/classes/actiontriggerpropertyset.hxx @@ -41,7 +41,7 @@ #include #include #include -#include +#include #define SERVICENAME_ACTIONTRIGGER "com.sun.star.ui.ActionTrigger" #define IMPLEMENTATIONNAME_ACTIONTRIGGER "com.sun.star.comp.ui.ActionTrigger" diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx index be62ea962f05..f3579e98fcc1 100644 --- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx +++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #define SERVICENAME_ACTIONTRIGGERSEPARATOR "com.sun.star.ui.ActionTriggerSeparator" #define IMPLEMENTATIONNAME_ACTIONTRIGGERSEPARATOR "com.sun.star.comp.ui.ActionTriggerSeparator" diff --git a/framework/inc/classes/addonmenu.hxx b/framework/inc/classes/addonmenu.hxx deleted file mode 100644 index b85c8c5a8d52..000000000000 --- a/framework/inc/classes/addonmenu.hxx +++ /dev/null @@ -1,141 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef __FRAMEWORK_CLASSES_ADDONMENU_HXX_ -#define __FRAMEWORK_CLASSES_ADDONMENU_HXX_ - -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -#include -#include -#include - -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - -#include -#include - -#define ADDONMENU_ITEMID_START 2000 -#define ADDONMENU_ITEMID_END 3000 - -namespace framework -{ - -class FWE_DLLPUBLIC AddonMenu : public PopupMenu -{ - public: - AddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); - ~AddonMenu(); - - protected: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; -}; - -class AddonMenuManager; -class FWE_DLLPUBLIC AddonPopupMenu : public AddonMenu -{ - public: - ~AddonPopupMenu(); - - // Check if command URL string has the unique prefix to identify addon popup menus - static sal_Bool IsCommandURLPrefix( const rtl::OUString& aCmdURL ); - - void SetCommandURL( const rtl::OUString& aCmdURL ) { m_aCommandURL = aCmdURL; } - const rtl::OUString& GetCommandURL() const { return m_aCommandURL; } - - protected: - void Initialize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonPopupMenuDefinition ); - - private: - AddonPopupMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ); - - rtl::OUString m_aCommandURL; - - friend class AddonMenuManager; -}; - -class FWE_DLLPUBLIC AddonMenuManager -{ - public: - enum MenuType - { - ADDON_MENU, - ADDON_POPUPMENU - }; - - static sal_Bool HasAddonMenuElements(); - static sal_Bool HasAddonHelpMenuElements(); - - static sal_Bool IsAddonMenuId( USHORT nId ) { return (( nId >= ADDONMENU_ITEMID_START ) && ( nId < ADDONMENU_ITEMID_END )); } - - // Check if the context string matches the provided xModel context - static sal_Bool IsCorrectContext( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rModel, const rtl::OUString& aContext ); - - // Factory method to create different Add-On menu types - static PopupMenu* CreatePopupMenuType( MenuType eMenuType, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ); - - // Create the Add-Ons menu - static AddonMenu* CreateAddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); - - // Merge the Add-Ons help menu items into the given menu bar at a defined pos - static void MergeAddonHelpMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, - MenuBar* pMergeMenuBar ); - - // Merge the addon popup menus into the given menu bar at the provided pos. - static void MergeAddonPopupMenus( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, - const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel, - USHORT nMergeAtPos, - MenuBar* pMergeMenuBar ); - - // Returns the next position to insert a menu item/sub menu - static USHORT GetNextPos( USHORT nPos ); - - // Build up the menu item and sub menu into the provided pCurrentMenu. The sub menus should be of type nSubMenuType. - static void BuildMenu( PopupMenu* pCurrentMenu, - MenuType nSubMenuType, - USHORT nInsPos, - USHORT& nUniqueMenuId, - com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > aAddonMenuDefinition, - const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, - const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel ); - - // Retrieve the menu entry property values from a sequence - static void GetMenuEntry( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonMenuEntry, - ::rtl::OUString& rTitle, - ::rtl::OUString& rURL, - ::rtl::OUString& rTarget, - ::rtl::OUString& rImageId, - ::rtl::OUString& rContext, - com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > >& rAddonSubMenu ); -}; - -} // namespace framework - -#endif // #ifndef __FRAMEWORK_CLASSES_ADDONMENU_HXX_ diff --git a/framework/inc/classes/addonsoptions.hxx b/framework/inc/classes/addonsoptions.hxx deleted file mode 100644 index 42428a97b398..000000000000 --- a/framework/inc/classes/addonsoptions.hxx +++ /dev/null @@ -1,374 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_ -#define __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_ - -//_________________________________________________________________________________________________________________ -// includes -//_________________________________________________________________________________________________________________ - -#include -#include -#include -#include -#include -#include -#include -#include -//_________________________________________________________________________________________________________________ -// types, enums, ... -//_________________________________________________________________________________________________________________ - -/*-************************************************************************************************************//** - @descr The method GetAddonsMenu() returns a list of property values. - Use follow defines to seperate values by names. -*//*-*************************************************************************************************************/ -#define ADDONSMENUITEM_STRING_URL "URL" -#define ADDONSMENUITEM_STRING_TITLE "Title" -#define ADDONSMENUITEM_STRING_TARGET "Target" -#define ADDONSMENUITEM_STRING_IMAGEIDENTIFIER "ImageIdentifier" -#define ADDONSMENUITEM_STRING_CONTEXT "Context" -#define ADDONSMENUITEM_STRING_SUBMENU "Submenu" -#define ADDONSMENUITEM_STRING_CONTROLTYPE "ControlType" -#define ADDONSMENUITEM_STRING_WIDTH "Width" - -#define ADDONSMENUITEM_URL_LEN 3 -#define ADDONSMENUITEM_TITLE_LEN 5 -#define ADDONSMENUITEM_TARGET_LEN 6 -#define ADDONSMENUITEM_SUBMENU_LEN 7 -#define ADDONSMENUITEM_CONTEXT_LEN 7 -#define ADDONSMENUITEM_IMAGEIDENTIFIER_LEN 15 - -#define ADDONSMENUITEM_PROPERTYNAME_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_URL )) -#define ADDONSMENUITEM_PROPERTYNAME_TITLE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_TITLE )) -#define ADDONSMENUITEM_PROPERTYNAME_TARGET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_TARGET )) -#define ADDONSMENUITEM_PROPERTYNAME_IMAGEIDENTIFIER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_IMAGEIDENTIFIER )) -#define ADDONSMENUITEM_PROPERTYNAME_CONTEXT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_CONTEXT )) -#define ADDONSMENUITEM_PROPERTYNAME_SUBMENU ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_SUBMENU )) -#define ADDONSMENUITEM_PROPERTYNAME_CONTROLTYPE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_CONTROLTYPE )) -#define ADDONSMENUITEM_PROPERTYNAME_WIDTH ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_WIDTH )) - -#define ADDONSPOPUPMENU_URL_PREFIX_STR "private:menu/Addon" - -#define ADDONSPOPUPMENU_URL_PREFIX ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ADDONSPOPUPMENU_URL_PREFIX_STR )) - -namespace framework -{ - -typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > MergeMenuDefinition; - -struct FWE_DLLPUBLIC MergeMenuInstruction -{ - ::rtl::OUString aMergePoint; - ::rtl::OUString aMergeCommand; - ::rtl::OUString aMergeCommandParameter; - ::rtl::OUString aMergeFallback; - ::rtl::OUString aMergeContext; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > aMergeMenu; -}; -typedef ::std::vector< MergeMenuInstruction > MergeMenuInstructionContainer; - -struct FWE_DLLPUBLIC MergeToolbarInstruction -{ - ::rtl::OUString aMergeToolbar; - ::rtl::OUString aMergePoint; - ::rtl::OUString aMergeCommand; - ::rtl::OUString aMergeCommandParameter; - ::rtl::OUString aMergeFallback; - ::rtl::OUString aMergeContext; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > aMergeToolbarItems; -}; - -typedef ::std::vector< MergeToolbarInstruction > MergeToolbarInstructionContainer; - -//_________________________________________________________________________________________________________________ -// forward declarations -//_________________________________________________________________________________________________________________ - -/*-************************************************************************************************************//** - @short forward declaration to our private date container implementation - @descr We use these class as internal member to support small memory requirements. - You can create the container if it is neccessary. The class which use these mechanism - is faster and smaller then a complete implementation! -*//*-*************************************************************************************************************/ - -class AddonsOptions_Impl; - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - -/*-************************************************************************************************************//** - @short collect informations about menu features - @descr - - - @implements - - @base - - - @devstatus ready to use -*//*-*************************************************************************************************************/ - -class FWE_DLLPUBLIC AddonsOptions -{ - //------------------------------------------------------------------------------------------------------------- - // public methods - //------------------------------------------------------------------------------------------------------------- - - public: - //--------------------------------------------------------------------------------------------------------- - // constructor / destructor - //--------------------------------------------------------------------------------------------------------- - - /*-****************************************************************************************************//** - @short standard constructor and destructor - @descr This will initialize an instance with default values. - We implement these class with a refcount mechanism! Every instance of this class increase it - at create and decrease it at delete time - but all instances use the same data container! - He is implemented as a static member ... - - @seealso member m_nRefCount - @seealso member m_pDataContainer - - @param - - @return - - - @onerror - - *//*-*****************************************************************************************************/ - - AddonsOptions(); - ~AddonsOptions(); - - //--------------------------------------------------------------------------------------------------------- - // interface - //--------------------------------------------------------------------------------------------------------- - - /*-****************************************************************************************************//** - @short clears completely the addons menu - @descr Call this methods to clear the addons menu - To fill it again use AppendItem(). - - @seealso - - - @param "eMenu" select right menu to clear. - @return - - - @onerror - - *//*-*****************************************************************************************************/ - - void Clear(); - - /*-****************************************************************************************************//** - @short returns if an addons menu is available - @descr Call to retrieve if a addons menu is available - - - @return sal_True if there is a menu otherwise sal_False - *//*-*****************************************************************************************************/ - - sal_Bool HasAddonsMenu() const; - - /*-****************************************************************************************************//** - @short returns if an addons help menu is available - @descr Call to retrieve if a addons menu is available - - - @return sal_True if there is a menu otherwise sal_False - *//*-*****************************************************************************************************/ - - sal_Bool HasAddonsHelpMenu() const; - - /*-****************************************************************************************************//** - @short returns number of addons toolbars - @descr Call to retrieve the number of addons toolbars - - - @return number of addons toolbars - *//*-*****************************************************************************************************/ - sal_Int32 GetAddonsToolBarCount() const ; - - /*-****************************************************************************************************//** - @short returns the complete addons menu - @descr Call it to get all entries of the addon menu. - We return a list of all nodes with his names and properties. - - @seealso - - - @return A list of menu items is returned. - - @onerror We return an empty list. - *//*-*****************************************************************************************************/ - - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& GetAddonsMenu() const; - - /*-****************************************************************************************************//** - @short Gets the menu bar part of all addon components registered - @descr - - - @seealso - - - @return A complete - - @onerror We return sal_False - *//*-*****************************************************************************************************/ - - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& GetAddonsMenuBarPart() const; - - /*-****************************************************************************************************//** - @short Gets a toolbar part of an single addon - @descr - - - @seealso - - - @return A complete - - @onerror We return sal_False - *//*-*****************************************************************************************************/ - - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& GetAddonsToolBarPart( sal_uInt32 nIndex ) const; - - /*-****************************************************************************************************//** - @short Gets a unique toolbar resource name of an single addon - @descr - - - @seealso - - - @return A complete - - @onerror We return sal_False - *//*-*****************************************************************************************************/ - - const ::rtl::OUString GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const; - - /*-****************************************************************************************************//** - @short Retrieves all available merge instructions for the Office menu bar - @descr - - - @seealso - - - @return The filled MergeMenuDefinitionContaier - - @onerror We return sal_False - *//*-*****************************************************************************************************/ - - const MergeMenuInstructionContainer& GetMergeMenuInstructions() const; - - /*-****************************************************************************************************//** - @short Retrieves all available merge instructions for a single toolbar - @descr - - - @seealso - - - @return The filled - - @onerror We return sal_False - *//*-*****************************************************************************************************/ - bool GetMergeToolbarInstructions( const ::rtl::OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbar ) const; - - /*-****************************************************************************************************//** - @short Gets the Add-On help menu part of all addon components registered - @descr - - - @seealso - - - @return A complete - - @onerror We return sal_False - *//*-*****************************************************************************************************/ - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& GetAddonsHelpMenu() const; - - /*-****************************************************************************************************//** - @short Retrieve an image for a command URL which is defined inside the addon menu configuration - @descr Call it to retrieve an image for a command URL which is defined inside the addon menu configuration - - @seealso - - - @return An image which was defined in the configuration for the menu item. The image can be empty - no bitmap was defined for the request image properties. - - @onerror An empty image - *//*-*****************************************************************************************************/ - - Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const; - - Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast ) const; - //------------------------------------------------------------------------------------------------------------- - // private methods - //------------------------------------------------------------------------------------------------------------- - - /*-****************************************************************************************************//** - @short return a reference to a static mutex - @descr These class is partially threadsafe (for de-/initialization only). - All access methods are'nt safe! - We create a static mutex only for one ime and use at different times. - - @seealso - - - @param - - @return A reference to a static mutex member. - - @onerror - - *//*-*****************************************************************************************************/ - - static ::osl::Mutex& GetOwnStaticMutex(); - - /*-****************************************************************************************************//** - @short return a reference to a static mutex - @descr These class is partially threadsafe (for de-/initialization only). - All access methods are'nt safe! - We create a static mutex only for one ime and use at different times. - - @seealso - - - @param - - @return A reference to a static mutex member. - - @onerror - - *//*-*****************************************************************************************************/ - DECL_STATIC_LINK( AddonsOptions, Notify, void* ); - - //------------------------------------------------------------------------------------------------------------- - // private member - //------------------------------------------------------------------------------------------------------------- - - private: - - /*Attention - - Don't initialize these static member in these header! - a) Double dfined symbols will be detected ... - b) and unresolved externals exist at linking time. - Do it in your source only. - */ - - static AddonsOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! - static sal_Int32 m_nRefCount ; /// internal ref count mechanism - -}; // class SvtMenuOptions - -} - -#endif // #ifndef __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_ diff --git a/framework/inc/classes/bmkmenu.hxx b/framework/inc/classes/bmkmenu.hxx deleted file mode 100644 index 846a9d8b9ba4..000000000000 --- a/framework/inc/classes/bmkmenu.hxx +++ /dev/null @@ -1,81 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef __FRAMEWORK_CLASSES_BMKMENU_HXX -#define __FRAMEWORK_CLASSES_BMKMENU_HXX - -#include "classes/addonmenu.hxx" -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -#include -#include -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - -#include -#include - -class String; -class ImageList; - -#define BMKMENU_ITEMID_START 20000 - -namespace framework -{ - -class BmkMenu_Impl; -class FWE_DLLPUBLIC BmkMenu : public AddonMenu -{ - public: - enum BmkMenuType - { - BMK_NEWMENU, - BMK_WIZARDMENU - }; - - BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - BmkMenuType nType ); - ~BmkMenu(); - - void Initialize(); // Synchrones Laden der Eintraege - - protected: - BmkMenu::BmkMenuType m_nType; - USHORT CreateMenuId(); - - private: - BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - BmkMenuType, BmkMenu* pRoot ); - - BmkMenu_Impl* _pImp; -}; - -} // namespace framework - -#endif // #ifndef __FRAMEWORK_CLASSES_BMKMENU_HXX diff --git a/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx index 2efd1dee3ad9..6cfe3fc7a0dd 100644 --- a/framework/inc/classes/fwkresid.hxx +++ b/framework/inc/classes/fwkresid.hxx @@ -29,7 +29,7 @@ #define __FRAMEWORK_CLASSES_FWKRESID_HXX_ #include -#include +#include namespace framework { diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx index 9b54a149bb53..2001314e9edb 100644 --- a/framework/inc/classes/imagewrapper.hxx +++ b/framework/inc/classes/imagewrapper.hxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include namespace framework { diff --git a/framework/inc/classes/menuextensionsupplier.hxx b/framework/inc/classes/menuextensionsupplier.hxx deleted file mode 100644 index 9f34f1dd7327..000000000000 --- a/framework/inc/classes/menuextensionsupplier.hxx +++ /dev/null @@ -1,51 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef __FRAMEWORK_CLASSES_MENUEXTENSIONSUPPLIER_HXX_ -#define __FRAMEWORK_CLASSES_MENUEXTENSIONSUPPLIER_HXX_ - -#include -#include - -struct FWE_DLLPUBLIC MenuExtensionItem -{ - rtl::OUString aLabel; - rtl::OUString aURL; -}; - -typedef MenuExtensionItem ( *pfunc_setMenuExtensionSupplier)(); - -namespace framework -{ - -FWE_DLLPUBLIC pfunc_setMenuExtensionSupplier SAL_CALL SetMenuExtensionSupplier( pfunc_setMenuExtensionSupplier pSetMenuExtensionSupplier ); - -FWE_DLLPUBLIC MenuExtensionItem SAL_CALL GetMenuExtension(); - -} - -#endif // __FRAMEWORK_CLASSES_MENUEXTENSIONSUPPLIER_HXX_ diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx index 2c5fa9afa071..e3c26d190ce9 100644 --- a/framework/inc/classes/rootactiontriggercontainer.hxx +++ b/framework/inc/classes/rootactiontriggercontainer.hxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #define IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER "com.sun.star.comp.ui.RootActionTriggerContainer" diff --git a/framework/inc/classes/sfxhelperfunctions.hxx b/framework/inc/classes/sfxhelperfunctions.hxx deleted file mode 100644 index ecc05621a41a..000000000000 --- a/framework/inc/classes/sfxhelperfunctions.hxx +++ /dev/null @@ -1,69 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_ -#define __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_ - -#include -#include -#include -#include -#include -#include -#include - -typedef svt::ToolboxController* ( *pfunc_setToolBoxControllerCreator)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL ); -typedef svt::StatusbarController* ( *pfunc_setStatusBarControllerCreator)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const ::rtl::OUString& aCommandURL ); -typedef void ( *pfunc_getRefreshToolbars)( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); -typedef void ( *pfunc_createDockingWindow)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL ); -typedef bool ( *pfunc_isDockingWindowVisible)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL ); - -namespace framework -{ - -FWE_DLLPUBLIC pfunc_setToolBoxControllerCreator SAL_CALL SetToolBoxControllerCreator( pfunc_setToolBoxControllerCreator pSetToolBoxControllerCreator ); - -FWE_DLLPUBLIC svt::ToolboxController* SAL_CALL CreateToolBoxController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL ); - -FWE_DLLPUBLIC pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator pSetStatusBarControllerCreator ); - -FWE_DLLPUBLIC svt::StatusbarController* SAL_CALL CreateStatusBarController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const ::rtl::OUString& aCommandURL ); - -FWE_DLLPUBLIC pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars pRefreshToolbarsFunc ); - -FWE_DLLPUBLIC void SAL_CALL RefreshToolbars( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); - -FWE_DLLPUBLIC pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingWindow pCreateDockingWindow ); - -FWE_DLLPUBLIC void SAL_CALL CreateDockingWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL ); - -FWE_DLLPUBLIC pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDockingWindowVisible pIsDockingWindowVisible ); - -FWE_DLLPUBLIC bool SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL ); -} - -#endif // __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_ -- cgit From 7c142871bc30b788fa350ee419f61bfdded1a14c Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 29 Apr 2010 16:27:41 +0200 Subject: CWS gnumake2: fix template export of MSVC --- framework/inc/classes/actiontriggerpropertyset.hxx | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'framework/inc/classes') diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx index a02794891634..3f373f272afd 100644 --- a/framework/inc/classes/actiontriggerpropertyset.hxx +++ b/framework/inc/classes/actiontriggerpropertyset.hxx @@ -49,7 +49,7 @@ namespace framework { -class FWE_DLLPUBLIC ActionTriggerPropertySet : public ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. +class ActionTriggerPropertySet : public ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::com::sun::star::lang::XServiceInfo , public ::com::sun::star::lang::XTypeProvider, public ::cppu::OBroadcastHelper , @@ -57,23 +57,23 @@ class FWE_DLLPUBLIC ActionTriggerPropertySet : public ThreadHelpBase public ::cppu::OWeakObject { public: - ActionTriggerPropertySet( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); - virtual ~ActionTriggerPropertySet(); + FWE_DLLPUBLIC ActionTriggerPropertySet( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); + FWE_DLLPUBLIC virtual ~ActionTriggerPropertySet(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) + 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 void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); + virtual FWE_DLLPUBLIC void SAL_CALL acquire() throw (); + virtual FWE_DLLPUBLIC void SAL_CALL release() throw (); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException); + 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); private: //--------------------------------------------------------------------------------------------------------- -- cgit From 53c343ce49df7b1f34edd90dd5b4f75227c6171e Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 29 Apr 2010 17:05:47 +0200 Subject: gnumake2: apple gcc does not like DLLPUBLIC forward delcarations --- framework/inc/classes/protocolhandlercache.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'framework/inc/classes') diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index ca54360c626a..ffdcaa1f253b 100644 --- a/framework/inc/classes/protocolhandlercache.hxx +++ b/framework/inc/classes/protocolhandlercache.hxx @@ -133,7 +133,7 @@ typedef BaseHash< ProtocolHandler > HandlerHash; @modified 30.04.2002 11:19, as96863 */ -class FWI_DLLPUBLIC HandlerCFGAccess; +class HandlerCFGAccess; class FWI_DLLPUBLIC HandlerCache { /* member */ -- cgit From 4f40fd2727a826d5d0b06617e5179829d66df5d2 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 29 Oct 2010 15:36:30 +0200 Subject: CWS gnumake2: resolve conflicts and make sources buildable on Linux --- framework/inc/classes/framelistanalyzer.hxx | 214 ---------------------------- 1 file changed, 214 deletions(-) delete mode 100644 framework/inc/classes/framelistanalyzer.hxx (limited to 'framework/inc/classes') diff --git a/framework/inc/classes/framelistanalyzer.hxx b/framework/inc/classes/framelistanalyzer.hxx deleted file mode 100644 index 745eabafb73a..000000000000 --- a/framework/inc/classes/framelistanalyzer.hxx +++ /dev/null @@ -1,214 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef __FRAMEWORK_CLASSES_FRAMELISTANALYZER_HXX_ -#define __FRAMEWORK_CLASSES_FRAMELISTANALYZER_HXX_ - -//_______________________________________________ -// interface includes -#include - -//_______________________________________________ -// other includes -#include - -//_______________________________________________ -// namespace - -namespace framework{ - -//_______________________________________________ -// exported const - -//_______________________________________________ -// exported definitions - -/** analyze and split the current available frame list of a given frames supplier - into different parts. - - These analyzed informations can be used e.g. to decide if it's neccessary - to switch into the backing mode, close the current active frame only or - exit the whole application explicitly or implicitly. - */ -class FWI_DLLPUBLIC FrameListAnalyzer -{ - //_______________________________________ - // types - - public: - - /** These enums can be combined as flags to enable/disable - special search algorithm during analyze phase. - see impl_analyze() for further informations. - But note: To be useable as flags, these enums - must be values of range [2^n]! */ - enum EDetect - { - E_MODEL = 1, - E_HELP = 2, - E_BACKINGCOMPONENT = 4, - E_HIDDEN = 8, - E_ALL = 15, - E_ZOMBIE = 32768 // use it for special test scenarios only!!! - }; - - //_______________________________________ - // member - - public: - - /** provides access to the frame container, which should be analyzed. */ - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFramesSupplier >& m_xSupplier; - - /** hold the reference frame, which is used e.g. to detect other frames with the same model. */ - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& m_xReferenceFrame; - - /** enable/disable some special analyzing steps. - see impl_analyze() for further informations. */ - sal_uInt32 m_eDetectMode; - - /** contains all frames, which uses the same model like the reference frame. - Will be filled only if m_eDetectMode has set the flag E_MODEL. - The reference frame is never part of this list! */ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > > m_lModelFrames; - - /** contains all frames, which does not contain the same model like the reference frame. - Filling of it can't be supressed by m_eDetectMode. - The reference frame is never part of this list! - All frames inside this list are visible ones. */ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > > m_lOtherVisibleFrames; - - /** contains all frames, which does not contain the same model like the reference frame. - Filling of it can't be supressed by m_eDetectMode. - The reference frame is never part of this list! - All frames inside this list are hidden ones. */ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > > m_lOtherHiddenFrames; - - /** points to the help frame. - Will be set only, if any other frame (means different from the reference frame) - contains the help component. If the reference frame itself includes the help module - it's not set ... but another member m_bIsHelp is used to safe this information. - See following example code: - - - if (m_xReferenceFrame == help) - { - m_xHelp = NULL; - m_bIsHelp = TRUE; - } - else - if (xOtherFrame == help) - { - m_xHelp = xOtherFrame; - m_bIsHelp = FALSE; - } - - - Analyzing of the help frame ignores the visible state of any frame. - But note: a hidden help frame indicates a wrong state! - */ - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xHelp; - - /** points to the frame, which contains the backing component. - Will be set only, if any other frame (means different from the reference frame) - contains the backing component. If the reference frame itself includes the - backing component it's not set ... but another member m_bIsBackingComponent - will used to safe this information. - See following example code: - - - if (m_xReferenceFrame == backing) - { - m_xBackingComponent = NULL; - m_bIsBackingComponent = TRUE; - } - else - if (xOtherFrame == backing) - { - m_xBackingComponent = xOtherFrame; - m_bIsBackingComponent = FALSE ; - } - - - Analyzing of the help frame ignores the visible state of any frame. - But note: a hidden backing mode frame indicates a wrong state! - */ - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xBackingComponent; - - /** is set to true only, if the reference frame is a hidden one. - This value is undefined if m_eDetectMode doesn't have set the flag E_HIDDEN! */ - sal_Bool m_bReferenceIsHidden; - - /** is set to true only, if the reference frame contains the help component. - In this case the member m_xHelp is set to NULL everytimes. - This value is undefined if m_eDetectMode doesn't have set the flag E_HELP! */ - sal_Bool m_bReferenceIsHelp; - - /** is set to true only, if the reference frame contains the backing component. - In this case the member m_xBackingComponent is set to NULL everytimes. - This value is undefined if m_eDetectMode doesn't have set the flag E_BACKINGCOMPONENT! */ - sal_Bool m_bReferenceIsBacking; - - //_______________________________________ - // interface - - public: - - /** starts analyze phase and fille all members with valid informations. - - @param xSupplier - Must be a valid reference to a frames supplier, which provies - access to the frame list for analyzing. - - @param xReferenceFrame - This frame must(!) exist inside the analyzed frame list and - is used for some comparing functions. Further some member states - depends from the current state of this frame. - - @param eDetectMode - It represent a flag field, which can enable/disable special - analyze steps. Note: Some member values will be undefined, if - an analyze step will be disabled. - */ - FrameListAnalyzer( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFramesSupplier >& xSupplier , - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xReferenceFrame , - sal_uInt32 eDetectMode ); - virtual ~FrameListAnalyzer(); - - //_______________________________________ - // helper - - private: - - void impl_analyze(); - - -}; // class FrameListAnalyzer - -} // namespace framework - -#endif // #ifndef __FRAMEWORK_CLASSES_FRAMELISTANALYZER_HXX_ -- cgit