summaryrefslogtreecommitdiff
path: root/framework/inc/classes
diff options
context:
space:
mode:
Diffstat (limited to 'framework/inc/classes')
-rw-r--r--framework/inc/classes/actiontriggercontainer.hxx14
-rw-r--r--framework/inc/classes/actiontriggerpropertyset.hxx29
-rw-r--r--framework/inc/classes/actiontriggerseparatorpropertyset.hxx10
-rw-r--r--framework/inc/classes/addonmenu.hxx140
-rw-r--r--framework/inc/classes/addonsoptions.hxx374
-rw-r--r--framework/inc/classes/bmkmenu.hxx81
-rw-r--r--framework/inc/classes/converter.hxx3
-rw-r--r--framework/inc/classes/framelistanalyzer.hxx213
-rw-r--r--framework/inc/classes/fwkresid.hxx7
-rw-r--r--framework/inc/classes/imagewrapper.hxx3
-rw-r--r--framework/inc/classes/menuextensionsupplier.hxx50
-rw-r--r--framework/inc/classes/propertysethelper.hxx3
-rw-r--r--framework/inc/classes/protocolhandlercache.hxx9
-rw-r--r--framework/inc/classes/rootactiontriggercontainer.hxx49
-rw-r--r--framework/inc/classes/sfxhelperfunctions.hxx73
15 files changed, 69 insertions, 989 deletions
diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx
index f53ddac470..072c5d4f2d 100644
--- a/framework/inc/classes/actiontriggercontainer.hxx
+++ b/framework/inc/classes/actiontriggercontainer.hxx
@@ -32,14 +32,16 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
+#include <framework/fwedllapi.h>
#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
@@ -49,17 +51,17 @@ class ActionTriggerContainer : public PropertySetContainer,
virtual ~ActionTriggerContainer();
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
+ virtual ::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 ();
// XMultiServiceFactory
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier )
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier )
throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments )
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments )
throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames()
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames()
throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo
@@ -71,7 +73,7 @@ class ActionTriggerContainer : public PropertySetContainer,
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);
};
-
+
}
#endif // __FRAMEWORK_CLASSES_ACTIONTRIGGERCONTAINER_HXX_
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx
index 020aafddf2..e71e98d276 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -41,6 +41,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <framework/fwedllapi.h>
#define SERVICENAME_ACTIONTRIGGER "com.sun.star.ui.ActionTrigger"
#define IMPLEMENTATIONNAME_ACTIONTRIGGER "com.sun.star.comp.ui.ActionTrigger"
@@ -48,7 +49,7 @@
namespace framework
{
-class 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 ,
@@ -56,23 +57,23 @@ class ActionTriggerPropertySet : public ThreadHelpBase , // Struct for righ
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:
//---------------------------------------------------------------------------------------------------------
@@ -81,11 +82,11 @@ class ActionTriggerPropertySet : public ThreadHelpBase , // Struct for righ
virtual 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 )
+ const com::sun::star::uno::Any& aValue )
throw( com::sun::star::lang::IllegalArgumentException );
- virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& aValue )
+ virtual 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;
@@ -93,7 +94,7 @@ class ActionTriggerPropertySet : public ThreadHelpBase , // Struct for righ
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
- virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
+ virtual 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();
diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
index ce85a5d527..acc4014e00 100644
--- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
@@ -37,10 +37,12 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <framework/fwedllapi.h>
#define SERVICENAME_ACTIONTRIGGERSEPARATOR "com.sun.star.ui.ActionTriggerSeparator"
#define IMPLEMENTATIONNAME_ACTIONTRIGGERSEPARATOR "com.sun.star.comp.ui.ActionTriggerSeparator"
+
namespace framework
{
@@ -56,7 +58,7 @@ class ActionTriggerSeparatorPropertySet : public ThreadHelpBase , // Struct
virtual ~ActionTriggerSeparatorPropertySet();
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
+ virtual ::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 ();
@@ -77,11 +79,11 @@ class ActionTriggerSeparatorPropertySet : public ThreadHelpBase , // Struct
virtual 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 )
+ const com::sun::star::uno::Any& aValue )
throw( com::sun::star::lang::IllegalArgumentException );
- virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& aValue )
+ virtual 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;
@@ -89,7 +91,7 @@ class ActionTriggerSeparatorPropertySet : public ThreadHelpBase , // Struct
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
- virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
+ virtual 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();
diff --git a/framework/inc/classes/addonmenu.hxx b/framework/inc/classes/addonmenu.hxx
deleted file mode 100644
index 7c7d606b8b..0000000000
--- a/framework/inc/classes/addonmenu.hxx
+++ /dev/null
@@ -1,140 +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_CLASSES_ADDONMENU_HXX_
-#define __FRAMEWORK_CLASSES_ADDONMENU_HXX_
-
-//_________________________________________________________________________________________________________________
-// interface includes
-//_________________________________________________________________________________________________________________
-
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-
-//_________________________________________________________________________________________________________________
-// includes of other projects
-//_________________________________________________________________________________________________________________
-
-#include <vcl/menu.hxx>
-
-#define ADDONMENU_ITEMID_START 2000
-#define ADDONMENU_ITEMID_END 3000
-
-namespace framework
-{
-
-class 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 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 AddonMenuManager
-{
- public:
- enum MenuType
- {
- ADDON_MENU,
- ADDON_POPUPMENU
- };
-
- static sal_Bool HasAddonMenuElements();
- static sal_Bool HasAddonHelpMenuElements();
-
- static sal_Bool IsAddonMenuId( sal_uInt16 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,
- sal_uInt16 nMergeAtPos,
- MenuBar* pMergeMenuBar );
-
- // Returns the next position to insert a menu item/sub menu
- static sal_uInt16 GetNextPos( sal_uInt16 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,
- sal_uInt16 nInsPos,
- sal_uInt16& 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 040b357add..0000000000
--- 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
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_
-#define __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_
-
-//_________________________________________________________________________________________________________________
-// includes
-//_________________________________________________________________________________________________________________
-
-#include <sal/types.h>
-#include <osl/mutex.hxx>
-#include <vcl/image.hxx>
-#include <vcl/bitmap.hxx>
-#include <vcl/svapp.hxx>
-#include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/beans/PropertyValue.hpp>
-
-//_________________________________________________________________________________________________________________
-// 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 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 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 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 7028762b52..0000000000
--- 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
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef __FRAMEWORK_CLASSES_BMKMENU_HXX
-#define __FRAMEWORK_CLASSES_BMKMENU_HXX
-
-#include "classes/addonmenu.hxx"
-//_________________________________________________________________________________________________________________
-// interface includes
-//_________________________________________________________________________________________________________________
-
-#include <com/sun/star/frame/XFrame.hpp>
-
-//_________________________________________________________________________________________________________________
-// includes of other projects
-//_________________________________________________________________________________________________________________
-
-#include <vcl/menu.hxx>
-#include <vcl/image.hxx>
-
-class String;
-class ImageList;
-
-#define BMKMENU_ITEMID_START 20000
-
-namespace framework
-{
-
-class BmkMenu_Impl;
-class 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;
- sal_uInt16 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/converter.hxx b/framework/inc/classes/converter.hxx
index 65c3277c95..7cabaff4cf 100644
--- a/framework/inc/classes/converter.hxx
+++ b/framework/inc/classes/converter.hxx
@@ -47,6 +47,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <tools/datetime.hxx>
+#include <fwidllapi.h>
//_________________________________________________________________________________________________________________
// namespace
@@ -62,7 +63,7 @@ namespace framework{
// exported definitions
//_________________________________________________________________________________________________________________
-class Converter
+class FWI_DLLPUBLIC Converter
{
public:
// Seq<Any> <=> Seq<beans.PropertyValue>
diff --git a/framework/inc/classes/framelistanalyzer.hxx b/framework/inc/classes/framelistanalyzer.hxx
deleted file mode 100644
index 34eeabd03d..0000000000
--- a/framework/inc/classes/framelistanalyzer.hxx
+++ /dev/null
@@ -1,213 +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_CLASSES_FRAMELISTANALYZER_HXX_
-#define __FRAMEWORK_CLASSES_FRAMELISTANALYZER_HXX_
-
-//_______________________________________________
-// interface includes
-#include <com/sun/star/frame/XFrame.hpp>
-
-//_______________________________________________
-// other includes
-
-//_______________________________________________
-// 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 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:
-
- <listing>
- if (m_xReferenceFrame == help)
- {
- m_xHelp = NULL;
- m_bIsHelp = sal_True;
- }
- else
- if (xOtherFrame == help)
- {
- m_xHelp = xOtherFrame;
- m_bIsHelp = sal_False;
- }
- </listing>
-
- 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:
-
- <listing>
- if (m_xReferenceFrame == backing)
- {
- m_xBackingComponent = NULL;
- m_bIsBackingComponent = sal_True;
- }
- else
- if (xOtherFrame == backing)
- {
- m_xBackingComponent = xOtherFrame;
- m_bIsBackingComponent = sal_False ;
- }
- </listing>
-
- 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_
diff --git a/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx
index 58ed7d38e7..b4f8bb3b74 100644
--- a/framework/inc/classes/fwkresid.hxx
+++ b/framework/inc/classes/fwkresid.hxx
@@ -29,16 +29,17 @@
#define __FRAMEWORK_CLASSES_FWKRESID_HXX_
#include <tools/resid.hxx>
+#include <framework/fwedllapi.h>
namespace framework
{
-class FwkResId : public ResId
+class FWE_DLLPUBLIC FwkResId : public ResId
{
public:
FwkResId( sal_uInt16 nId );
-
- static ResMgr* GetResManager();
+
+ static ResMgr* GetResManager();
};
}
diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx
index 57c4515124..32a364f815 100644
--- a/framework/inc/classes/imagewrapper.hxx
+++ b/framework/inc/classes/imagewrapper.hxx
@@ -34,11 +34,12 @@
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <cppuhelper/implbase2.hxx>
#include <vcl/image.hxx>
+#include <framework/fwedllapi.h>
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
deleted file mode 100644
index eda9f9eb52..0000000000
--- a/framework/inc/classes/menuextensionsupplier.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_CLASSES_MENUEXTENSIONSUPPLIER_HXX_
-#define __FRAMEWORK_CLASSES_MENUEXTENSIONSUPPLIER_HXX_
-
-#include <rtl/ustring.hxx>
-
-struct MenuExtensionItem
-{
- rtl::OUString aLabel;
- rtl::OUString aURL;
-};
-
-typedef MenuExtensionItem ( *pfunc_setMenuExtensionSupplier)();
-
-namespace framework
-{
-
-pfunc_setMenuExtensionSupplier SAL_CALL SetMenuExtensionSupplier( pfunc_setMenuExtensionSupplier pSetMenuExtensionSupplier );
-
-MenuExtensionItem SAL_CALL GetMenuExtension();
-
-}
-
-#endif // __FRAMEWORK_CLASSES_MENUEXTENSIONSUPPLIER_HXX_
diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx
index a5de798d77..c3dbf271a8 100644
--- a/framework/inc/classes/propertysethelper.hxx
+++ b/framework/inc/classes/propertysethelper.hxx
@@ -49,6 +49,7 @@
// other includes
#include <cppuhelper/weakref.hxx>
+#include <fwidllapi.h>
//_________________________________________________________________________________________________________________
// namespace
@@ -66,7 +67,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 d28b79bdd2..f260767091 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -47,6 +47,7 @@
#include <unotools/configitem.hxx>
#include <rtl/ustring.hxx>
+#include <fwidllapi.h>
//_________________________________________________________________________________________________________________
// namespace
@@ -76,7 +77,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:
@@ -94,7 +95,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:
@@ -133,7 +134,7 @@ typedef BaseHash< ProtocolHandler > HandlerHash;
*/
class HandlerCFGAccess;
-class HandlerCache
+class FWI_DLLPUBLIC HandlerCache
{
/* member */
private:
@@ -178,7 +179,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 5c11f41c9f..d3e1acbf9d 100644
--- a/framework/inc/classes/rootactiontriggercontainer.hxx
+++ b/framework/inc/classes/rootactiontriggercontainer.hxx
@@ -35,14 +35,15 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
+#include <framework/fwedllapi.h>
-#define IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER "com.sun.star.comp.ui.RootActionTriggerContainer"
+#define IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER "com.sun.star.comp.ui.RootActionTriggerContainer"
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,
@@ -53,47 +54,47 @@ class RootActionTriggerContainer : public PropertySetContainer,
RootActionTriggerContainer( const Menu* pMenu, const ::rtl::OUString* pMenuIdentifier, const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
virtual ~RootActionTriggerContainer();
- const Menu* GetMenu();
-
+ const Menu* GetMenu();
+
::com::sun::star::uno::Sequence< sal_Int8 > GetUnoTunnelId() const;
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
+ virtual ::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 ();
// XMultiServiceFactory
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier )
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier )
throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments )
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments )
throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames()
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames()
throw (::com::sun::star::uno::RuntimeException);
// XIndexContainer
- virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element )
+ virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-
- virtual void SAL_CALL removeByIndex( sal_Int32 Index )
+
+ virtual void SAL_CALL removeByIndex( sal_Int32 Index )
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
// XIndexReplace
- virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element )
+ virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
// XIndexAccess
- virtual sal_Int32 SAL_CALL getCount()
+ virtual sal_Int32 SAL_CALL getCount()
throw (::com::sun::star::uno::RuntimeException);
-
- virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
+
+ virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
// XElementAccess
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
+ virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
throw (::com::sun::star::uno::RuntimeException);
-
- virtual sal_Bool SAL_CALL hasElements()
+
+ virtual sal_Bool SAL_CALL hasElements()
throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo
@@ -111,17 +112,17 @@ class RootActionTriggerContainer : public PropertySetContainer,
// XNamed
virtual ::rtl::OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
-
+
private:
void FillContainer();
- sal_Bool m_bContainerCreated;
- sal_Bool m_bContainerChanged;
- sal_Bool m_bInContainerCreation;
- const Menu* m_pMenu;
+ sal_Bool m_bContainerCreated;
+ sal_Bool m_bContainerChanged;
+ sal_Bool m_bInContainerCreation;
+ const Menu* m_pMenu;
const ::rtl::OUString* m_pMenuIdentifier;
};
-
+
}
#endif // __FRAMEWORK_CLASSES_ROOTACTIONTRIGGERCONTAINER_HXX_
diff --git a/framework/inc/classes/sfxhelperfunctions.hxx b/framework/inc/classes/sfxhelperfunctions.hxx
deleted file mode 100644
index 71194fba98..0000000000
--- a/framework/inc/classes/sfxhelperfunctions.hxx
+++ /dev/null
@@ -1,73 +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_CLASSES_SFXHELPERFUNCTIONS_HXX_
-#define __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_
-
-#include <com/sun/star/frame/XFrame.hpp>
-#include <rtl/ustring.hxx>
-#include <vcl/toolbox.hxx>
-#include <vcl/status.hxx>
-#include <svtools/toolboxcontroller.hxx>
-#include <svtools/statusbarcontroller.hxx>
-
-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 );
-typedef void ( *pfunc_activateToolPanel)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL );
-
-namespace framework
-{
-
-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 );
-
-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 );
-
-pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars pRefreshToolbarsFunc );
-
-void SAL_CALL RefreshToolbars( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-
-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 );
-
-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 );
-
-pfunc_activateToolPanel SAL_CALL SetActivateToolPanel( pfunc_activateToolPanel i_pActivator );
-
-void SAL_CALL ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL );
-}
-
-#endif // __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_