summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2010-04-16 23:01:28 +0200
committerMathias Bauer <mba@openoffice.org>2010-04-16 23:01:28 +0200
commit39e9098c77157ea38411a237a6b52e0f76f12ce1 (patch)
tree9dbcd58a44a141701a05260517acba699d88e992
parent9c10c47f9cfb8f7641f0bb16908e0d19ad7d08ec (diff)
CWS gnumake2: export all symbols in framework using declspec
-rw-r--r--framework/inc/classes/actiontriggercontainer.hxx4
-rw-r--r--framework/inc/classes/actiontriggerpropertyset.hxx3
-rw-r--r--framework/inc/classes/actiontriggerseparatorpropertyset.hxx2
-rw-r--r--framework/inc/classes/addonmenu.hxx7
-rw-r--r--framework/inc/classes/addonsoptions.hxx8
-rw-r--r--framework/inc/classes/bmkmenu.hxx4
-rw-r--r--framework/inc/classes/converter.hxx3
-rw-r--r--framework/inc/classes/framelistanalyzer.hxx3
-rw-r--r--framework/inc/classes/fwkresid.hxx3
-rw-r--r--framework/inc/classes/imagewrapper.hxx3
-rw-r--r--framework/inc/classes/menuextensionsupplier.hxx7
-rw-r--r--framework/inc/classes/propertysethelper.hxx3
-rw-r--r--framework/inc/classes/protocolhandlercache.hxx11
-rw-r--r--framework/inc/classes/rootactiontriggercontainer.hxx3
-rw-r--r--framework/inc/classes/sfxhelperfunctions.hxx21
-rw-r--r--framework/inc/dispatch/interaction.hxx11
-rw-r--r--framework/inc/fwedllapi.h16
-rw-r--r--framework/inc/fwidllapi.h13
-rw-r--r--framework/inc/fwkdllapi.h10
-rw-r--r--framework/inc/helper/acceleratorinfo.hxx1
-rw-r--r--framework/inc/helper/actiontriggerhelper.hxx3
-rw-r--r--framework/inc/helper/configimporter.hxx3
-rw-r--r--framework/inc/helper/imageproducer.hxx5
-rw-r--r--framework/inc/helper/mischelper.hxx135
-rw-r--r--framework/inc/helper/networkdomain.hxx3
-rw-r--r--framework/inc/helper/popupmenucontrollerbase.hxx3
-rw-r--r--framework/inc/helper/propertysetcontainer.hxx3
-rw-r--r--framework/inc/helper/shareablemutex.hxx3
-rw-r--r--framework/inc/helper/titlehelper.hxx3
-rw-r--r--framework/inc/helper/uiconfigelementwrapperbase.hxx3
-rw-r--r--framework/inc/helper/uielementwrapperbase.hxx3
-rw-r--r--framework/inc/interaction/preventduplicateinteraction.hxx3
-rw-r--r--framework/inc/jobs/configaccess.hxx3
-rw-r--r--framework/inc/jobs/jobconst.hxx4
-rw-r--r--framework/inc/threadhelp/lockhelper.hxx5
-rw-r--r--framework/inc/threadhelp/transactionmanager.hxx3
-rw-r--r--framework/inc/uielement/constitemcontainer.hxx3
-rw-r--r--framework/inc/uielement/itemcontainer.hxx4
-rw-r--r--framework/inc/uielement/rootitemcontainer.hxx5
-rw-r--r--framework/inc/xml/eventsconfiguration.hxx5
-rw-r--r--framework/inc/xml/eventsdocumenthandler.hxx5
-rw-r--r--framework/inc/xml/imagesconfiguration.hxx13
-rw-r--r--framework/inc/xml/imagesdocumenthandler.hxx7
-rw-r--r--framework/inc/xml/menuconfiguration.hxx3
-rw-r--r--framework/inc/xml/menudocumenthandler.hxx13
-rw-r--r--framework/inc/xml/saxnamespacefilter.hxx3
-rw-r--r--framework/inc/xml/statusbarconfiguration.hxx5
-rw-r--r--framework/inc/xml/statusbardocumenthandler.hxx5
-rw-r--r--framework/inc/xml/toolboxconfiguration.hxx3
-rw-r--r--framework/inc/xml/toolboxdocumenthandler.hxx5
-rw-r--r--framework/inc/xml/xmlnamespaces.hxx3
-rw-r--r--framework/prj/build.lst38
-rw-r--r--framework/prj/d.lst3
-rw-r--r--framework/source/classes/makefile.mk31
-rw-r--r--framework/source/dispatch/makefile.mk1
-rw-r--r--framework/source/fwe/classes/actiontriggercontainer.cxx (renamed from framework/source/classes/actiontriggercontainer.cxx)0
-rw-r--r--framework/source/fwe/classes/actiontriggerpropertyset.cxx (renamed from framework/source/classes/actiontriggerpropertyset.cxx)2
-rw-r--r--framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx (renamed from framework/source/classes/actiontriggerseparatorpropertyset.cxx)0
-rw-r--r--framework/source/fwe/classes/addonmenu.cxx (renamed from framework/source/classes/addonmenu.cxx)0
-rw-r--r--framework/source/fwe/classes/addonsoptions.cxx (renamed from framework/source/classes/addonsoptions.cxx)0
-rw-r--r--framework/source/fwe/classes/bmkmenu.cxx (renamed from framework/source/classes/bmkmenu.cxx)0
-rw-r--r--framework/source/fwe/classes/fwkresid.cxx (renamed from framework/source/classes/fwkresid.cxx)0
-rw-r--r--framework/source/fwe/classes/imagewrapper.cxx (renamed from framework/source/classes/imagewrapper.cxx)0
-rw-r--r--framework/source/fwe/classes/makefile.mk62
-rw-r--r--framework/source/fwe/classes/menuextensionsupplier.cxx (renamed from framework/source/classes/menuextensionsupplier.cxx)0
-rw-r--r--framework/source/fwe/classes/rootactiontriggercontainer.cxx (renamed from framework/source/classes/rootactiontriggercontainer.cxx)0
-rw-r--r--framework/source/fwe/classes/sfxhelperfunctions.cxx (renamed from framework/source/classes/sfxhelperfunctions.cxx)2
-rw-r--r--framework/source/fwe/dispatch/interaction.cxx (renamed from framework/source/dispatch/interaction.cxx)1
-rw-r--r--framework/source/fwe/dispatch/makefile.mk52
-rw-r--r--framework/source/fwe/helper/acceleratorinfo.cxx (renamed from framework/source/helper/acceleratorinfo.cxx)0
-rw-r--r--framework/source/fwe/helper/actiontriggerhelper.cxx (renamed from framework/source/helper/actiontriggerhelper.cxx)0
-rw-r--r--framework/source/fwe/helper/configimporter.cxx (renamed from framework/source/helper/configimporter.cxx)0
-rw-r--r--framework/source/fwe/helper/imageproducer.cxx (renamed from framework/source/helper/imageproducer.cxx)0
-rw-r--r--framework/source/fwe/helper/makefile.mk59
-rw-r--r--framework/source/fwe/helper/propertysetcontainer.cxx (renamed from framework/source/helper/propertysetcontainer.cxx)0
-rw-r--r--framework/source/fwe/helper/titlehelper.cxx (renamed from framework/source/helper/titlehelper.cxx)0
-rw-r--r--framework/source/fwe/helper/uiconfigelementwrapperbase.cxx (renamed from framework/source/helper/uiconfigelementwrapperbase.cxx)0
-rw-r--r--framework/source/fwe/helper/uielementwrapperbase.cxx (renamed from framework/source/helper/uielementwrapperbase.cxx)0
-rw-r--r--framework/source/fwe/interaction/makefile.mk52
-rw-r--r--framework/source/fwe/interaction/preventduplicateinteraction.cxx (renamed from framework/source/interaction/preventduplicateinteraction.cxx)0
-rw-r--r--framework/source/fwe/xml/eventsconfiguration.cxx (renamed from framework/source/xml/eventsconfiguration.cxx)0
-rw-r--r--framework/source/fwe/xml/eventsdocumenthandler.cxx (renamed from framework/source/xml/eventsdocumenthandler.cxx)1
-rw-r--r--framework/source/fwe/xml/imagesconfiguration.cxx (renamed from framework/source/xml/imagesconfiguration.cxx)0
-rw-r--r--framework/source/fwe/xml/imagesdocumenthandler.cxx (renamed from framework/source/xml/imagesdocumenthandler.cxx)0
-rw-r--r--framework/source/fwe/xml/makefile.mk63
-rw-r--r--framework/source/fwe/xml/menuconfiguration.cxx (renamed from framework/source/xml/menuconfiguration.cxx)0
-rw-r--r--framework/source/fwe/xml/menudocumenthandler.cxx (renamed from framework/source/xml/menudocumenthandler.cxx)0
-rw-r--r--framework/source/fwe/xml/saxnamespacefilter.cxx (renamed from framework/source/xml/saxnamespacefilter.cxx)0
-rw-r--r--framework/source/fwe/xml/statusbarconfiguration.cxx (renamed from framework/source/xml/statusbarconfiguration.cxx)0
-rw-r--r--framework/source/fwe/xml/statusbardocumenthandler.cxx (renamed from framework/source/xml/statusbardocumenthandler.cxx)0
-rw-r--r--framework/source/fwe/xml/toolboxconfiguration.cxx (renamed from framework/source/xml/toolboxconfiguration.cxx)0
-rw-r--r--framework/source/fwe/xml/toolboxdocumenthandler.cxx (renamed from framework/source/xml/toolboxdocumenthandler.cxx)0
-rw-r--r--framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx (renamed from framework/source/xml/toolboxlayoutdocumenthandler.cxx)0
-rw-r--r--framework/source/fwe/xml/xmlnamespaces.cxx (renamed from framework/source/xml/xmlnamespaces.cxx)0
-rw-r--r--framework/source/fwi/classes/converter.cxx (renamed from framework/source/classes/converter.cxx)0
-rw-r--r--framework/source/fwi/classes/framelistanalyzer.cxx (renamed from framework/source/classes/framelistanalyzer.cxx)0
-rw-r--r--framework/source/fwi/classes/makefile.mk54
-rw-r--r--framework/source/fwi/classes/propertysethelper.cxx (renamed from framework/source/classes/propertysethelper.cxx)0
-rw-r--r--framework/source/fwi/classes/protocolhandlercache.cxx (renamed from framework/source/classes/protocolhandlercache.cxx)2
-rw-r--r--framework/source/fwi/helper/makefile.mk55
-rw-r--r--framework/source/fwi/helper/mischelper.cxx (renamed from framework/source/helper/mischelper.cxx)140
-rw-r--r--framework/source/fwi/helper/networkdomain.cxx (renamed from framework/source/helper/networkdomain.cxx)0
-rw-r--r--framework/source/fwi/helper/popupmenucontrollerbase.cxx (renamed from framework/source/helper/popupmenucontrollerbase.cxx)0
-rw-r--r--framework/source/fwi/helper/shareablemutex.cxx (renamed from framework/source/helper/shareablemutex.cxx)0
-rw-r--r--framework/source/fwi/jobs/configaccess.cxx (renamed from framework/source/jobs/configaccess.cxx)0
-rw-r--r--framework/source/fwi/jobs/jobconst.cxx (renamed from framework/source/jobs/jobconst.cxx)0
-rw-r--r--framework/source/fwi/jobs/makefile.mk52
-rw-r--r--framework/source/fwi/threadhelp/lockhelper.cxx (renamed from framework/source/threadhelp/lockhelper.cxx)0
-rw-r--r--framework/source/fwi/threadhelp/makefile.mk (renamed from framework/source/threadhelp/makefile.mk)4
-rw-r--r--framework/source/fwi/threadhelp/transactionmanager.cxx (renamed from framework/source/threadhelp/transactionmanager.cxx)3
-rw-r--r--framework/source/fwi/uielement/constitemcontainer.cxx (renamed from framework/source/uielement/constitemcontainer.cxx)0
-rw-r--r--framework/source/fwi/uielement/itemcontainer.cxx (renamed from framework/source/uielement/itemcontainer.cxx)0
-rw-r--r--framework/source/fwi/uielement/makefile.mk52
-rw-r--r--framework/source/fwi/uielement/rootitemcontainer.cxx (renamed from framework/source/uielement/rootitemcontainer.cxx)0
-rw-r--r--framework/source/helper/makefile.mk35
-rw-r--r--framework/source/interaction/makefile.mk3
-rw-r--r--framework/source/jobs/makefile.mk2
-rw-r--r--framework/source/services/autorecovery.cxx4
-rw-r--r--framework/source/services/desktop.cxx2
-rw-r--r--framework/source/services/pathsettings.cxx2
-rw-r--r--framework/source/uielement/makefile.mk3
-rw-r--r--framework/source/xml/makefile.mk17
-rw-r--r--framework/util/makefile.mk88
123 files changed, 895 insertions, 393 deletions
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 <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
+#include <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
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 <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <fwedllapi.h>
#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 <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <fwedllapi.h>
#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 <vcl/menu.hxx>
+#include <fwedllapi.h>
#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 <vcl/svapp.hxx>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/beans/PropertyValue.hpp>
-
+#include <fwedllapi.h>
//_________________________________________________________________________________________________________________
// 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 <com/sun/star/frame/XFrame.hpp>
-
+#include <fwedllapi.h>
//_________________________________________________________________________________________________________________
// 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 <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <tools/datetime.hxx>
+#include <fwidllapi.h>
//_________________________________________________________________________________________________________________
// namespace
@@ -65,7 +66,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
index 1680ab994f11..3c921186a2d7 100644
--- a/framework/inc/classes/framelistanalyzer.hxx
+++ b/framework/inc/classes/framelistanalyzer.hxx
@@ -44,6 +44,7 @@
//_______________________________________________
// other includes
+#include <fwidllapi.h>
//_______________________________________________
// 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 <tools/resid.hxx>
+#include <fwedllapi.h>
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 <com/sun/star/lang/XTypeProvider.hpp>
#include <cppuhelper/implbase2.hxx>
#include <vcl/image.hxx>
+#include <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
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 <rtl/ustring.hxx>
+#include <fwedllapi.h>
-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 <cppuhelper/weakref.hxx>
+#include <fwidllapi.h>
//_________________________________________________________________________________________________________________
// 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 <unotools/configitem.hxx>
#include <rtl/ustring.hxx>
+#include <fwidllapi.h>
//_________________________________________________________________________________________________________________
// 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 <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
+#include <fwedllapi.h>
#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 <fwedllapi.h>
#include <com/sun/star/frame/XFrame.hpp>
#include <rtl/ustring.hxx>
#include <vcl/toolbox.hxx>
@@ -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_
diff --git a/framework/inc/dispatch/interaction.hxx b/framework/inc/dispatch/interaction.hxx
index e2ef1cfec504..f5883b89a300 100644
--- a/framework/inc/dispatch/interaction.hxx
+++ b/framework/inc/dispatch/interaction.hxx
@@ -57,6 +57,7 @@
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
+#include <fwedllapi.h>
//_________________________________________________________________________________________________________________
// namespace
@@ -142,6 +143,8 @@ class ContinuationBase : public ::cppu::WeakImplHelper1< TContinuationType >
}; // class ContinuationBase
+//template class FWE_DLLEXPORT ContinuationBase<typename com::sun::star::task::XInteractionApprove>;
+
/*-************************************************************************************************************//**
@short declaration of some simple continuations
@descr These derived classes implements some simple continuations, which doesnt need and additional
@@ -180,7 +183,7 @@ typedef ContinuationBase< ::com::sun::star::task::XInteractionRetry > Continuati
@devstatus ready to use
@threadsafe no (used on once position only!)
*//*-*************************************************************************************************************/
-class ContinuationFilterSelect : public ContinuationBase< ::com::sun::star::document::XInteractionFilterSelect >
+class FWE_DLLPUBLIC ContinuationFilterSelect : public ContinuationBase< ::com::sun::star::document::XInteractionFilterSelect >
{
// c++ interface
public:
@@ -219,7 +222,7 @@ class ContinuationFilterSelect : public ContinuationBase< ::com::sun::star::docu
@devstatus ready to use
@threadsafe no (used on once position only!)
*//*-*************************************************************************************************************/
-class RequestFilterSelect : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
+class FWE_DLLPUBLIC RequestFilterSelect : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
{
// c++ interface
public:
@@ -254,7 +257,7 @@ class RequestFilterSelect : public ::cppu::WeakImplHelper1< ::com::sun::star::ta
@devstatus ready to use
@threadsafe no (used on once position only!)
*//*-*************************************************************************************************************/
-class RequestAmbigousFilter : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
+class FWE_DLLPUBLIC RequestAmbigousFilter : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
{
// c++ interface
public:
@@ -291,7 +294,7 @@ class RequestAmbigousFilter : public ::cppu::WeakImplHelper1< ::com::sun::star::
@devstatus ready to use
@threadsafe no (used on once position only!)
*//*-*************************************************************************************************************/
-class InteractionRequest : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
+class FWE_DLLPUBLIC InteractionRequest : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
{
// c++ interface
public:
diff --git a/framework/inc/fwedllapi.h b/framework/inc/fwedllapi.h
new file mode 100644
index 000000000000..2742d09ab134
--- /dev/null
+++ b/framework/inc/fwedllapi.h
@@ -0,0 +1,16 @@
+#ifndef INCLUDED_FWEDLLAPI_H
+#define INCLUDED_FWEDLLAPI_H
+
+#include "sal/types.h"
+
+#if defined(FWE_DLLIMPLEMENTATION)
+#define FWE_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#include <cppuhelper/interfacecontainer.h>
+template struct FWE_DLLPUBLIC cppu::OBroadcastHelperVar<class cppu::OMultiTypeInterfaceContainerHelper,class com::sun::star::uno::Type>;
+//class FWE_DLLPUBLIC SvPtrarr;
+#else
+#define FWE_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define FWE_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif /* INCLUDED_FWEDLLAPI_H */
diff --git a/framework/inc/fwidllapi.h b/framework/inc/fwidllapi.h
new file mode 100644
index 000000000000..8f4b50cf77e0
--- /dev/null
+++ b/framework/inc/fwidllapi.h
@@ -0,0 +1,13 @@
+#ifndef INCLUDED_FWIDLLAPI_H
+#define INCLUDED_FWIDLLAPI_H
+
+#include "sal/types.h"
+
+#if defined(FWI_DLLIMPLEMENTATION)
+#define FWI_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define FWI_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define FWI_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif /* INCLUDED_FWIDLLAPI_H */
diff --git a/framework/inc/fwkdllapi.h b/framework/inc/fwkdllapi.h
new file mode 100644
index 000000000000..45c65b166eb5
--- /dev/null
+++ b/framework/inc/fwkdllapi.h
@@ -0,0 +1,10 @@
+#ifndef INCLUDED_FWKDLLAPI_H
+#define INCLUDED_FWKDLLAPI_H
+
+#include "sal/types.h"
+
+#include <fwidllapi.h>
+#include <cppuhelper/interfacecontainer.h>
+template struct FWI_DLLPUBLIC cppu::OBroadcastHelperVar<class cppu::OMultiTypeInterfaceContainerHelper,class com::sun::star::uno::Type>;
+
+#endif /* INCLUDED_FWKDLLAPI_H */
diff --git a/framework/inc/helper/acceleratorinfo.hxx b/framework/inc/helper/acceleratorinfo.hxx
index d68c5964cc98..70169439b7db 100644
--- a/framework/inc/helper/acceleratorinfo.hxx
+++ b/framework/inc/helper/acceleratorinfo.hxx
@@ -34,6 +34,7 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <vcl/keycod.hxx>
#include <rtl/ustring.hxx>
+#include <fwedllapi.h>
namespace framework
{
diff --git a/framework/inc/helper/actiontriggerhelper.hxx b/framework/inc/helper/actiontriggerhelper.hxx
index 76ae24a70a89..dc249e315489 100644
--- a/framework/inc/helper/actiontriggerhelper.hxx
+++ b/framework/inc/helper/actiontriggerhelper.hxx
@@ -36,11 +36,12 @@
// #110897#
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <vcl/menu.hxx>
+#include <fwedllapi.h>
namespace framework
{
- class ActionTriggerHelper
+ class FWE_DLLPUBLIC ActionTriggerHelper
{
public:
// Fills the submitted menu with the structure contained in the second
diff --git a/framework/inc/helper/configimporter.hxx b/framework/inc/helper/configimporter.hxx
index 8357676ffc8f..7a44b73f9790 100644
--- a/framework/inc/helper/configimporter.hxx
+++ b/framework/inc/helper/configimporter.hxx
@@ -37,10 +37,11 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <rtl/ustring.hxx>
+#include <fwedllapi.h>
namespace framework
{
- class UIConfigurationImporterOOo1x
+ class FWE_DLLPUBLIC UIConfigurationImporterOOo1x
{
public:
static sal_Bool ImportCustomToolbars(
diff --git a/framework/inc/helper/imageproducer.hxx b/framework/inc/helper/imageproducer.hxx
index 4a427b911775..a661c4cafbb7 100644
--- a/framework/inc/helper/imageproducer.hxx
+++ b/framework/inc/helper/imageproducer.hxx
@@ -38,15 +38,16 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <vcl/image.hxx>
#include <rtl/ustring.hxx>
+#include <fwedllapi.h>
namespace framework
{
typedef Image ( *pfunc_getImage)( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
-pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pGetImageFunc );
+pfunc_getImage FWE_DLLPUBLIC SAL_CALL SetImageProducer( pfunc_getImage pGetImageFunc );
-Image SAL_CALL GetImageFromURL( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
+Image FWE_DLLPUBLIC SAL_CALL GetImageFromURL( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
}
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 1bd908b266c6..511ea63d74b9 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -1,72 +1,73 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: acceleratorinfo.hxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __MISC_HELPER_HXX_
-#define __MISC_HELPER_HXX_
-
-#include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-
-#include <i18npool/lang.h>
-#include <svl/languageoptions.hxx>
-
-namespace framework
-{
-
-inline bool IsScriptTypeMatchingToLanguage( sal_Int16 nScriptType, LanguageType nLang )
-{
- return 0 != (nScriptType & SvtLanguageOptions::GetScriptTypeOfLanguage( nLang ));
-}
-
-
-class LanguageGuessingHelper
-{
- mutable ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing > m_xLanguageGuesser;
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
-
-public:
- LanguageGuessingHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceManager) : m_xServiceManager(_xServiceManager){}
-
- ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing > GetGuesser() const;
-};
-
-::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: acceleratorinfo.hxx,v $
+ * $Revision: 1.6 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __MISC_HELPER_HXX_
+#define __MISC_HELPER_HXX_
+
+#include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+
+#include <i18npool/lang.h>
+#include <svl/languageoptions.hxx>
+#include <fwidllapi.h>
+
+namespace framework
+{
+
+inline bool IsScriptTypeMatchingToLanguage( sal_Int16 nScriptType, LanguageType nLang )
+{
+ return 0 != (nScriptType & SvtLanguageOptions::GetScriptTypeOfLanguage( nLang ));
+}
+
+
+class FWI_DLLPUBLIC LanguageGuessingHelper
+{
+ mutable ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing > m_xLanguageGuesser;
+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
+
+public:
+ LanguageGuessingHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceManager) : m_xServiceManager(_xServiceManager){}
+
+ ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing > GetGuesser() const;
+};
+
+FWI_DLLPUBLIC ::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL
,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory
,::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xUICommandLabels
,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame
,::rtl::OUString& _rModuleIdentifier
,sal_Bool& _rIni
- ,const sal_Char* _pName);
-
-} // namespace framework
-
-#endif // __MISC_HELPER_HXX_
-
+ ,const sal_Char* _pName);
+
+} // namespace framework
+
+#endif // __MISC_HELPER_HXX_
+
diff --git a/framework/inc/helper/networkdomain.hxx b/framework/inc/helper/networkdomain.hxx
index ad939b5e6c8d..621ddf837cb0 100644
--- a/framework/inc/helper/networkdomain.hxx
+++ b/framework/inc/helper/networkdomain.hxx
@@ -32,11 +32,12 @@
#define __FRAMEWORK_HELPER_NETWORKDOMAIN_HXX_
#include <rtl/ustring.hxx>
+#include <fwidllapi.h>
namespace framework
{
-class NetworkDomain
+class FWI_DLLPUBLIC NetworkDomain
{
public:
static rtl::OUString GetNTDomainName();
diff --git a/framework/inc/helper/popupmenucontrollerbase.hxx b/framework/inc/helper/popupmenucontrollerbase.hxx
index 25d308a72641..c02fd1bb99ca 100644
--- a/framework/inc/helper/popupmenucontrollerbase.hxx
+++ b/framework/inc/helper/popupmenucontrollerbase.hxx
@@ -63,10 +63,11 @@
#include <toolkit/awt/vclxmenu.hxx>
#include <cppuhelper/weak.hxx>
#include <rtl/ustring.hxx>
+#include <fwidllapi.h>
namespace framework
{
- class PopupMenuControllerBase : public com::sun::star::lang::XTypeProvider ,
+ class FWI_DLLPUBLIC PopupMenuControllerBase : public com::sun::star::lang::XTypeProvider ,
public com::sun::star::lang::XServiceInfo ,
public ::com::sun::star::frame::XPopupMenuController ,
public com::sun::star::lang::XInitialization ,
diff --git a/framework/inc/helper/propertysetcontainer.hxx b/framework/inc/helper/propertysetcontainer.hxx
index 4fd8893e2ef9..180977bb9e25 100644
--- a/framework/inc/helper/propertysetcontainer.hxx
+++ b/framework/inc/helper/propertysetcontainer.hxx
@@ -40,11 +40,12 @@
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <threadhelp/threadhelpbase.hxx>
+#include <fwedllapi.h>
namespace framework
{
-class PropertySetContainer : public com::sun::star::container::XIndexContainer ,
+class FWE_DLLPUBLIC PropertySetContainer : public com::sun::star::container::XIndexContainer ,
public ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses.
public ::cppu::OWeakObject
{
diff --git a/framework/inc/helper/shareablemutex.hxx b/framework/inc/helper/shareablemutex.hxx
index b8d9eadfb0f9..2537dd1c1c8d 100644
--- a/framework/inc/helper/shareablemutex.hxx
+++ b/framework/inc/helper/shareablemutex.hxx
@@ -33,11 +33,12 @@
#include <osl/interlck.h>
#include <osl/mutex.hxx>
+#include <fwidllapi.h>
namespace framework
{
-class ShareableMutex
+class FWI_DLLPUBLIC ShareableMutex
{
public:
ShareableMutex();
diff --git a/framework/inc/helper/titlehelper.hxx b/framework/inc/helper/titlehelper.hxx
index 01ba60837073..22400c5618b1 100644
--- a/framework/inc/helper/titlehelper.hxx
+++ b/framework/inc/helper/titlehelper.hxx
@@ -55,6 +55,7 @@
#include <rtl/ustrbuf.hxx>
#include <hash_map>
+#include <fwedllapi.h>
//_______________________________________________
// namespace
@@ -74,7 +75,7 @@ namespace framework{
@threadsafe
*/
-class TitleHelper : private ::cppu::BaseMutex
+class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex
, public ::cppu::WeakImplHelper5< css::frame::XTitle ,
css::frame::XTitleChangeBroadcaster,
css::frame::XTitleChangeListener ,
diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx
index 2069f6b983f0..cbd30212a555 100644
--- a/framework/inc/helper/uiconfigelementwrapperbase.hxx
+++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx
@@ -61,11 +61,12 @@
#include <cppuhelper/propshlp.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/weak.hxx>
+#include <fwedllapi.h>
namespace framework
{
-class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider ,
+class FWE_DLLPUBLIC UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider ,
public ::com::sun::star::ui::XUIElement ,
public ::com::sun::star::ui::XUIElementSettings ,
public ::com::sun::star::lang::XInitialization ,
diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx
index 9ca92aca36b2..eb8a5430789a 100644
--- a/framework/inc/helper/uielementwrapperbase.hxx
+++ b/framework/inc/helper/uielementwrapperbase.hxx
@@ -56,11 +56,12 @@
#include <cppuhelper/propshlp.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/weak.hxx>
+#include <fwedllapi.h>
namespace framework
{
-class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider ,
+class FWE_DLLPUBLIC UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider ,
public ::com::sun::star::ui::XUIElement ,
public ::com::sun::star::lang::XInitialization ,
public ::com::sun::star::lang::XComponent ,
diff --git a/framework/inc/interaction/preventduplicateinteraction.hxx b/framework/inc/interaction/preventduplicateinteraction.hxx
index 2b43ab02fcdc..de6e2eab5ad4 100644
--- a/framework/inc/interaction/preventduplicateinteraction.hxx
+++ b/framework/inc/interaction/preventduplicateinteraction.hxx
@@ -31,6 +31,7 @@
#ifndef __FRAMEWORK_INTERACTION_PREVENTDUPLICATEINTERACTION_HXX_
#define __FRAMEWORK_INTERACTION_PREVENTDUPLICATEINTERACTION_HXX_
+#include <fwedllapi.h>
//_________________________________________________________________________________________________________________
// my own includes
//_________________________________________________________________________________________________________________
@@ -85,7 +86,7 @@ struct ThreadHelpBase2
mutable ::osl::Mutex m_aLock;
};
-class PreventDuplicateInteraction : private ThreadHelpBase2
+class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2
,public ::cppu::WeakImplHelper1< css::task::XInteractionHandler >
{
//_____________________________________
diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx
index 2b773cb6a7b4..2110aa7f338d 100644
--- a/framework/inc/jobs/configaccess.hxx
+++ b/framework/inc/jobs/configaccess.hxx
@@ -45,6 +45,7 @@
//_______________________________________
// other includes
#include <rtl/ustring.hxx>
+#include <fwidllapi.h>
//_______________________________________
// namespace
@@ -61,7 +62,7 @@ namespace framework{
instead of using soecialize config items of the svtools
project. This class can wrapp such configuration access.
*/
-class ConfigAccess : public ThreadHelpBase
+class FWI_DLLPUBLIC ConfigAccess : public ThreadHelpBase
{
//___________________________________
// const
diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx
index a7bccde7cb9b..16cbb1ff396a 100644
--- a/framework/inc/jobs/jobconst.hxx
+++ b/framework/inc/jobs/jobconst.hxx
@@ -44,6 +44,7 @@
// other includes
#include <rtl/ustring.hxx>
+#include <fwidllapi.h>
//_______________________________________
// namespace
@@ -62,10 +63,9 @@ namespace framework{
it's code. Typos can occure or code will be changed by new developers ...
Shared set of constant values can help to improve the mentainance of this code.
*/
-class JobConst
+class FWI_DLLPUBLIC JobConst
{
public:
-
static const ::rtl::OUString ANSWER_DEACTIVATE_JOB();
static const ::rtl::OUString ANSWER_SAVE_ARGUMENTS();
static const ::rtl::OUString ANSWER_SEND_DISPATCHRESULT();
diff --git a/framework/inc/threadhelp/lockhelper.hxx b/framework/inc/threadhelp/lockhelper.hxx
index d4e0b4572fba..8982a2703762 100644
--- a/framework/inc/threadhelp/lockhelper.hxx
+++ b/framework/inc/threadhelp/lockhelper.hxx
@@ -49,6 +49,7 @@
//_________________________________________________________________________________________________________________
#include <osl/mutex.hxx>
#include <vos/mutex.hxx>
+#include <fwidllapi.h>
//_________________________________________________________________________________________________________________
// namespace
@@ -66,7 +67,7 @@ namespace framework{
of your implementation - because base classes are initialized by his order and before your
member! Thats why ist a good place to declare your thread help member so.
*//*-*************************************************************************************************************/
-enum ELockType
+enum FWI_DLLPUBLIC ELockType
{
E_NOTHING = 0 ,
E_OWNMUTEX = 1 ,
@@ -107,7 +108,7 @@ enum ELockType
@devstatus draft
*//*-*************************************************************************************************************/
-class LockHelper : public IMutex
+class FWI_DLLPUBLIC LockHelper : public IMutex
, public IRWLock
, private INonCopyable
{
diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx
index 72baadf5bff2..fcd0d3a9ec46 100644
--- a/framework/inc/threadhelp/transactionmanager.hxx
+++ b/framework/inc/threadhelp/transactionmanager.hxx
@@ -52,6 +52,7 @@
// other includes
//_________________________________________________________________________________________________________________
#include <osl/mutex.hxx>
+#include <fwidllapi.h>
//_________________________________________________________________________________________________________________
// namespace
@@ -81,7 +82,7 @@ namespace framework{
@devstatus draft
*//*-*************************************************************************************************************/
-class TransactionManager : public ITransactionManager
+class FWI_DLLPUBLIC TransactionManager : public ITransactionManager
, private INonCopyable
{
//-------------------------------------------------------------------------------------------------------------
diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx
index d1278564d22c..1d41eacc8e5f 100644
--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -59,13 +59,14 @@
#include <cppuhelper/propshlp.hxx>
#include <vector>
+#include <fwidllapi.h>
namespace framework
{
class RootItemContainer;
class ItemContainer;
-class ConstItemContainer : public ::com::sun::star::lang::XTypeProvider ,
+class FWI_DLLPUBLIC ConstItemContainer : public ::com::sun::star::lang::XTypeProvider ,
public com::sun::star::container::XIndexAccess ,
public ::com::sun::star::lang::XUnoTunnel ,
public ::com::sun::star::beans::XFastPropertySet,
diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx
index f9499e83edb8..8910d5ca66f6 100644
--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -55,12 +55,12 @@
#include <cppuhelper/implbase1.hxx>
#include <vector>
+#include <fwidllapi.h>
namespace framework
{
-
class ConstItemContainer;
-class ItemContainer : public ::cppu::WeakImplHelper1< ::com::sun::star::container::XIndexContainer>
+class FWI_DLLPUBLIC ItemContainer : public ::cppu::WeakImplHelper1< ::com::sun::star::container::XIndexContainer>
{
friend class ConstItemContainer;
diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx
index 284ce9136457..599ea220112d 100644
--- a/framework/inc/uielement/rootitemcontainer.hxx
+++ b/framework/inc/uielement/rootitemcontainer.hxx
@@ -60,13 +60,12 @@
#include <cppuhelper/interfacecontainer.hxx>
#include <vector>
+#include <fwidllapi.h>
namespace framework
{
-
class ConstItemContainer;
-class ItemContainer;
-class RootItemContainer : public ::com::sun::star::lang::XTypeProvider ,
+class FWI_DLLPUBLIC RootItemContainer : public ::com::sun::star::lang::XTypeProvider ,
public ::com::sun::star::container::XIndexContainer ,
public ::com::sun::star::lang::XSingleComponentFactory ,
public ::com::sun::star::lang::XUnoTunnel ,
diff --git a/framework/inc/xml/eventsconfiguration.hxx b/framework/inc/xml/eventsconfiguration.hxx
index 69e6f85c6f90..ebc821fca547 100644
--- a/framework/inc/xml/eventsconfiguration.hxx
+++ b/framework/inc/xml/eventsconfiguration.hxx
@@ -31,6 +31,7 @@
#ifndef __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_
#define __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_
+#include <fwedllapi.h>
#include <svl/svarray.hxx>
#include <tools/string.hxx>
#include <tools/stream.hxx>
@@ -43,13 +44,13 @@
namespace framework
{
-struct EventsConfig
+struct FWE_DLLPUBLIC EventsConfig
{
::com::sun::star::uno::Sequence< ::rtl::OUString > aEventNames;
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aEventsProperties;
};
-class EventsConfiguration
+class FWE_DLLPUBLIC EventsConfiguration
{
public:
// #110897#
diff --git a/framework/inc/xml/eventsdocumenthandler.hxx b/framework/inc/xml/eventsdocumenthandler.hxx
index db490dbb6c18..df9e0e0f9e4c 100644
--- a/framework/inc/xml/eventsdocumenthandler.hxx
+++ b/framework/inc/xml/eventsdocumenthandler.hxx
@@ -53,6 +53,7 @@
#include <hash_map>
#include <stdtypes.h>
+#include <fwedllapi.h>
//_________________________________________________________________________________________________________________
// namespace
//_________________________________________________________________________________________________________________
@@ -62,7 +63,7 @@ namespace framework{
//*****************************************************************************************************************
// Hash code function for using in all hash maps of follow implementation.
-class OReadEventsDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OReadEventsDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses.
public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
{
public:
@@ -152,7 +153,7 @@ class OReadEventsDocumentHandler : private ThreadHelpBase, // Struct for right
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator;
};
-class OWriteEventsDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OWriteEventsDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
{
public:
OWriteEventsDocumentHandler(
diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx
index d0961892b96b..be362e5f9779 100644
--- a/framework/inc/xml/imagesconfiguration.hxx
+++ b/framework/inc/xml/imagesconfiguration.hxx
@@ -31,6 +31,7 @@
#ifndef __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
#define __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
+#include <fwedllapi.h>
#include <svl/svarray.hxx>
#include <tools/string.hxx>
#include <tools/stream.hxx>
@@ -46,13 +47,13 @@
namespace framework
{
-enum ImageMaskMode
+enum FWE_DLLPUBLIC ImageMaskMode
{
ImageMaskMode_Color,
ImageMaskMode_Bitmap
};
-struct ImageItemDescriptor
+struct FWE_DLLPUBLIC ImageItemDescriptor
{
ImageItemDescriptor() : nIndex( -1 ) {}
@@ -60,7 +61,7 @@ struct ImageItemDescriptor
long nIndex; // index of the bitmap inside the bitmaplist
};
-struct ExternalImageItemDescriptor
+struct FWE_DLLPUBLIC ExternalImageItemDescriptor
{
String aCommandURL; // URL command to dispatch
String aURL; // a URL to an external bitmap
@@ -72,7 +73,7 @@ SV_DECL_PTRARR_DEL( ImageItemListDescriptor, ImageItemDescriptorPtr, 10, 2)
typedef ExternalImageItemDescriptor* ExternalImageItemDescriptorPtr;
SV_DECL_PTRARR_DEL( ExternalImageItemListDescriptor, ExternalImageItemDescriptorPtr, 10, 2)
-struct ImageListItemDescriptor
+struct FWE_DLLPUBLIC ImageListItemDescriptor
{
ImageListItemDescriptor() : nMaskMode( ImageMaskMode_Color ),
pImageItemList( 0 ) {}
@@ -91,7 +92,7 @@ struct ImageListItemDescriptor
typedef ImageListItemDescriptor* ImageListItemDescriptorPtr;
SV_DECL_PTRARR_DEL( ImageListDescriptor, ImageListItemDescriptorPtr, 10, 2)
-struct ImageListsDescriptor
+struct FWE_DLLPUBLIC ImageListsDescriptor
{
ImageListsDescriptor() : pImageList( 0 ),
pExternalImageList( 0 ) {}
@@ -101,7 +102,7 @@ struct ImageListsDescriptor
ExternalImageItemListDescriptor* pExternalImageList;
};
-class ImagesConfiguration
+class FWE_DLLPUBLIC ImagesConfiguration
{
public:
// #110897#
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index a58da84b89aa..794b3bb8e88c 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -31,6 +31,8 @@
#ifndef __FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_
#define __FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_
+#include <fwedllapi.h>
+
//_________________________________________________________________________________________________________________
// interface includes
//_________________________________________________________________________________________________________________
@@ -50,6 +52,7 @@
#include <hash_map>
#include <stdtypes.h>
+
//_________________________________________________________________________________________________________________
// namespace
//_________________________________________________________________________________________________________________
@@ -59,7 +62,7 @@ namespace framework{
//*****************************************************************************************************************
// Hash code function for using in all hash maps of follow implementation.
-class OReadImagesDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OReadImagesDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses.
public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
{
public:
@@ -160,7 +163,7 @@ class OReadImagesDocumentHandler : private ThreadHelpBase, // Struct for right
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator;
};
-class OWriteImagesDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OWriteImagesDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
{
public:
OWriteImagesDocumentHandler(
diff --git a/framework/inc/xml/menuconfiguration.hxx b/framework/inc/xml/menuconfiguration.hxx
index 954fc2ae5e3e..36b84f9af6b0 100644
--- a/framework/inc/xml/menuconfiguration.hxx
+++ b/framework/inc/xml/menuconfiguration.hxx
@@ -43,6 +43,7 @@
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <fwedllapi.h>
//_________________________________________________________________________________________________________________
// includes of other projects
@@ -73,7 +74,7 @@ const USHORT ITEMID_ADDONHELP = FWK_SID_ADDONHELP;
namespace framework
{
-class MenuConfiguration
+class FWE_DLLPUBLIC MenuConfiguration
{
public:
struct Attributes
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index a85a4c200086..149f481bb9a9 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -51,6 +51,7 @@
#include <rtl/ustring.hxx>
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <fwedllapi.h>
//_________________________________________________________________________________________________________________
// namespace
@@ -58,7 +59,7 @@
namespace framework{
-class ReadMenuDocumentHandlerBase : public ThreadHelpBase, // Struct for right initalization of mutex member! Must be first of baseclasses.
+class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase : public ThreadHelpBase, // Struct for right initalization of mutex member! Must be first of baseclasses.
public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
{
public:
@@ -120,7 +121,7 @@ class ReadMenuDocumentHandlerBase : public ThreadHelpBase, // Struct for right
};
-class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
+class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
{
public:
// #110897#
@@ -164,7 +165,7 @@ class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
}; // OReadMenuDocumentHandler
-class OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
+class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
{
public:
// #110897#
@@ -211,7 +212,7 @@ class OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
}; // OReadMenuBarHandler
-class OReadMenuHandler : public ReadMenuDocumentHandlerBase
+class FWE_DLLPUBLIC OReadMenuHandler : public ReadMenuDocumentHandlerBase
{
public:
OReadMenuHandler( const com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rMenuContainer,
@@ -249,7 +250,7 @@ class OReadMenuHandler : public ReadMenuDocumentHandlerBase
}; // OReadMenuHandler
-class OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase
+class FWE_DLLPUBLIC OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase
{
public:
OReadMenuPopupHandler( const com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rMenuContainer,
@@ -292,7 +293,7 @@ class OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase
}; // OReadMenuPopupHandler
-class OWriteMenuDocumentHandler
+class FWE_DLLPUBLIC OWriteMenuDocumentHandler
{
public:
OWriteMenuDocumentHandler(
diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx
index 9f0a5bbf2646..777c23600a9d 100644
--- a/framework/inc/xml/saxnamespacefilter.hxx
+++ b/framework/inc/xml/saxnamespacefilter.hxx
@@ -39,6 +39,7 @@
#include <cppuhelper/implbase1.hxx>
#include <stack>
+#include <fwedllapi.h>
//_________________________________________________________________________________________________________________
// namespace
@@ -47,7 +48,7 @@
namespace framework
{
-class SaxNamespaceFilter : public ThreadHelpBase, // Struct for right initalization of mutex member! Must be first of baseclasses.
+class FWE_DLLPUBLIC SaxNamespaceFilter : public ThreadHelpBase, // Struct for right initalization of mutex member! Must be first of baseclasses.
public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
{
public:
diff --git a/framework/inc/xml/statusbarconfiguration.hxx b/framework/inc/xml/statusbarconfiguration.hxx
index 8619ae423622..70bf1a966d31 100644
--- a/framework/inc/xml/statusbarconfiguration.hxx
+++ b/framework/inc/xml/statusbarconfiguration.hxx
@@ -1,6 +1,7 @@
#ifndef __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_
#define __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_
+#include <fwedllapi.h>
#include <svl/svarray.hxx>
#include <tools/string.hxx>
#include <tools/stream.hxx>
@@ -14,7 +15,7 @@
namespace framework
{
-struct StatusBarItemDescriptor
+struct FWE_DLLPUBLIC StatusBarItemDescriptor
{
String aURL; // URL command to dispatch
long nItemBits; // properties for this statusbar item (WinBits)
@@ -31,7 +32,7 @@ struct StatusBarItemDescriptor
typedef StatusBarItemDescriptor* StatusBarItemDescriptorPtr;
SV_DECL_PTRARR_DEL( StatusBarDescriptor, StatusBarItemDescriptorPtr, 10, 2)
-class StatusBarConfiguration
+class FWE_DLLPUBLIC StatusBarConfiguration
{
public:
static sal_Bool LoadStatusBar(
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index 6e66fa6ae403..bfa0dbaf9d98 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -52,6 +52,7 @@
#include <hash_map>
#include <stdtypes.h>
+#include <fwedllapi.h>
//_________________________________________________________________________________________________________________
// namespace
@@ -62,7 +63,7 @@ namespace framework{
//*****************************************************************************************************************
// Hash code function for using in all hash maps of follow implementation.
-class OReadStatusBarDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses.
public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
{
public:
@@ -151,7 +152,7 @@ class OReadStatusBarDocumentHandler : private ThreadHelpBase, // Struct for ri
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator;
};
-class OWriteStatusBarDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
{
public:
OWriteStatusBarDocumentHandler(
diff --git a/framework/inc/xml/toolboxconfiguration.hxx b/framework/inc/xml/toolboxconfiguration.hxx
index 924c601ac689..d386eef4323d 100644
--- a/framework/inc/xml/toolboxconfiguration.hxx
+++ b/framework/inc/xml/toolboxconfiguration.hxx
@@ -1,6 +1,7 @@
#ifndef __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_
#define __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_
+#include <fwedllapi.h>
#include <svl/svarray.hxx>
#include <vcl/bitmap.hxx>
#include <tools/string.hxx>
@@ -17,7 +18,7 @@
namespace framework
{
-class ToolBoxConfiguration
+class FWE_DLLPUBLIC ToolBoxConfiguration
{
public:
// #110897#
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index ccf64e6d0033..953f684c742c 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -46,6 +46,7 @@
#include <rtl/ustring.hxx>
#include <cppuhelper/implbase1.hxx>
#include <stdtypes.h>
+#include <fwedllapi.h>
//_________________________________________________________________________________________________________________
// namespace
@@ -56,7 +57,7 @@ namespace framework{
//*****************************************************************************************************************
// Hash code function for using in all hash maps of follow implementation.
-class OReadToolBoxDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses.
public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
{
public:
@@ -168,7 +169,7 @@ class OReadToolBoxDocumentHandler : private ThreadHelpBase, // Struct for right
};
-class OWriteToolBoxDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
{
public:
OWriteToolBoxDocumentHandler(
diff --git a/framework/inc/xml/xmlnamespaces.hxx b/framework/inc/xml/xmlnamespaces.hxx
index 42cac853e133..f951ffaf348e 100644
--- a/framework/inc/xml/xmlnamespaces.hxx
+++ b/framework/inc/xml/xmlnamespaces.hxx
@@ -34,11 +34,12 @@
#include <com/sun/star/xml/sax/SAXException.hpp>
#include <map>
+#include <fwedllapi.h>
namespace framework
{
-class XMLNamespaces
+class FWE_DLLPUBLIC XMLNamespaces
{
public:
XMLNamespaces();
diff --git a/framework/prj/build.lst b/framework/prj/build.lst
index b9814037e729..12e597204710 100644
--- a/framework/prj/build.lst
+++ b/framework/prj/build.lst
@@ -1,23 +1,31 @@
fr framework : l10n svtools NULL
fr framework usr1 - all fr_mkout NULL
fr framework\inc nmake - all fr_inc NULL
-fr framework\source\constant nmake - all fr_constant fr_inc NULL
-fr framework\source\threadhelp nmake - all fr_threadhelp fr_constant fr_inc NULL
-fr framework\source\loadenv nmake - all fr_loadenv fr_threadhelp fr_constant fr_inc NULL
+fr framework\source\accelerators nmake - all fr_accelerators fr_threadhelp fr_inc NULL
fr framework\source\classes nmake - all fr_classes fr_threadhelp fr_constant fr_inc NULL
-fr framework\source\jobs nmake - all fr_jobs fr_threadhelp fr_constant fr_inc NULL
-fr framework\source\interaction nmake - all fr_interaction fr_threadhelp fr_constant fr_inc NULL
-fr framework\source\helper nmake - all fr_helper fr_threadhelp fr_constant fr_inc NULL
+fr framework\source\constant nmake - all fr_constant fr_inc NULL
fr framework\source\dispatch nmake - all fr_dispatch fr_threadhelp fr_constant fr_inc NULL
-fr framework\source\services nmake - all fr_services fr_threadhelp fr_constant fr_inc NULL
-fr framework\source\register nmake - all fr_register fr_threadhelp fr_constant fr_inc NULL
-fr framework\source\recording nmake - all fr_recording fr_threadhelp fr_constant fr_inc NULL
-fr framework\source\xml nmake - all fr_xml fr_threadhelp fr_inc NULL
+fr framework\source\fwe\classes nmake - all fr_fweclasses fr_threadhelp fr_constant fr_inc NULL
+fr framework\source\fwe\dispatch nmake - all fr_fwedispatch fr_threadhelp fr_constant fr_inc NULL
+fr framework\source\fwe\helper nmake - all fr_fwehelper fr_threadhelp fr_constant fr_inc NULL
+fr framework\source\fwe\interaction nmake - all fr_fweinteraction fr_threadhelp fr_constant fr_inc NULL
+fr framework\source\fwe\xml nmake - all fr_fwexml fr_threadhelp fr_inc NULL
+fr framework\source\fwi\classes nmake - all fr_fwiclasses fr_threadhelp fr_constant fr_inc NULL
+fr framework\source\fwi\helper nmake - all fr_fwihelper fr_threadhelp fr_constant fr_inc NULL
+fr framework\source\fwi\jobs nmake - all fr_fwijobs fr_threadhelp fr_constant fr_inc NULL
+fr framework\source\fwi\threadhelp nmake - all fr_threadhelp fr_constant fr_inc NULL
+fr framework\source\fwi\uielement nmake - all fr_fwiuielement fr_threadhelp fr_inc NULL
+fr framework\source\helper nmake - all fr_helper fr_threadhelp fr_constant fr_inc NULL
+fr framework\source\interaction nmake - all fr_interaction fr_threadhelp fr_constant fr_inc NULL
+fr framework\source\jobs nmake - all fr_jobs fr_threadhelp fr_constant fr_inc NULL
fr framework\source\layoutmanager nmake - all fr_layoutmanager fr_threadhelp fr_inc NULL
+fr framework\source\loadenv nmake - all fr_loadenv fr_threadhelp fr_constant fr_inc NULL
+fr framework\source\recording nmake - all fr_recording fr_threadhelp fr_constant fr_inc NULL
+fr framework\source\register nmake - all fr_register fr_threadhelp fr_constant fr_inc NULL
+fr framework\source\services nmake - all fr_services fr_threadhelp fr_constant fr_inc NULL
+fr framework\source\tabwin nmake - all fr_tabwin fr_threadhelp fr_inc NULL
+fr framework\source\uiconfiguration nmake - all fr_uiconfiguration fr_threadhelp fr_inc NULL
fr framework\source\uielement nmake - all fr_uielement fr_threadhelp fr_inc NULL
fr framework\source\uifactory nmake - all fr_uifactory fr_threadhelp fr_inc NULL
-fr framework\source\uiconfiguration nmake - all fr_uiconfiguration fr_threadhelp fr_inc NULL
-fr framework\source\accelerators nmake - all fr_accelerators fr_threadhelp fr_inc NULL
-fr framework\source\tabwin nmake - all fr_tabwin fr_threadhelp fr_inc NULL
-fr framework\util nmake - all fr_util fr_constant fr_threadhelp fr_classes fr_loadenv fr_jobs fr_interaction fr_helper fr_dispatch fr_services fr_register fr_recording fr_layoutmanager fr_uielement fr_uifactory fr_xml fr_uiconfiguration fr_accelerators fr_tabwin NULL
-
+fr framework\source\xml nmake - all fr_xml fr_threadhelp fr_inc NULL
+fr framework\util nmake - all fr_util fr_constant fr_threadhelp fr_classes fr_loadenv fr_jobs fr_interaction fr_helper fr_dispatch fr_services fr_register fr_recording fr_layoutmanager fr_uielement fr_uifactory fr_xml fr_uiconfiguration fr_accelerators fr_tabwin fr_fweclasses fr_fwedispatch fr_fwehelper fr_fweinteraction fr_fwexml fr_fwiclasses fr_fwihelper fr_fwijobs fr_fwiuielement NULL
diff --git a/framework/prj/d.lst b/framework/prj/d.lst
index a8640138ba25..bf17da0a7164 100644
--- a/framework/prj/d.lst
+++ b/framework/prj/d.lst
@@ -27,6 +27,9 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar
..\%__SRC%\lib\ifwe.lib %_DEST%\lib%_EXT%\ifwe.lib
..\%__SRC%\lib\ifwi.lib %_DEST%\lib%_EXT%\ifwi.lib
+..\inc\fwedllapi.h %_DEST%\inc%_EXT%\fwedllapi.h
+..\inc\fwidllapi.h %_DEST%\inc%_EXT%\fwidllapi.h
+..\inc\fwkdllapi.h %_DEST%\inc%_EXT%\fwkdllapi.h
..\inc\helper\imageproducer.hxx %_DEST%\inc%_EXT%\framework\imageproducer.hxx
..\inc\helper\acceleratorinfo.hxx %_DEST%\inc%_EXT%\framework\acceleratorinfo.hxx
..\inc\helper\actiontriggerhelper.hxx %_DEST%\inc%_EXT%\framework\actiontriggerhelper.hxx
diff --git a/framework/source/classes/makefile.mk b/framework/source/classes/makefile.mk
index c55af1cdf8e4..1482a2162511 100644
--- a/framework/source/classes/makefile.mk
+++ b/framework/source/classes/makefile.mk
@@ -18,12 +18,12 @@
#
# 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
+# 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
+# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
@@ -36,32 +36,17 @@ ENABLE_EXCEPTIONS= TRUE
# --- Settings -----------------------------------------------------
-.INCLUDE : settings.mk
+.INCLUDE : settings.mk
# --- Generate -----------------------------------------------------
-SLOFILES= \
- $(SLO)$/propertysethelper.obj \
+SLOFILES= \
+ $(SLO)$/droptargetlistener.obj \
$(SLO)$/framecontainer.obj \
- $(SLO)$/taskcreator.obj \
+ $(SLO)$/fwktabwindow.obj \
+ $(SLO)$/fwlresid.obj \
$(SLO)$/menumanager.obj \
- $(SLO)$/bmkmenu.obj \
- $(SLO)$/droptargetlistener.obj \
- $(SLO)$/converter.obj \
- $(SLO)$/actiontriggerpropertyset.obj \
- $(SLO)$/actiontriggerseparatorpropertyset.obj \
- $(SLO)$/actiontriggercontainer.obj \
- $(SLO)$/imagewrapper.obj \
- $(SLO)$/rootactiontriggercontainer.obj \
- $(SLO)$/protocolhandlercache.obj \
- $(SLO)$/addonmenu.obj \
- $(SLO)$/addonsoptions.obj \
- $(SLO)$/fwkresid.obj \
- $(SLO)$/fwlresid.obj \
- $(SLO)$/framelistanalyzer.obj \
- $(SLO)$/sfxhelperfunctions.obj \
- $(SLO)$/menuextensionsupplier.obj \
- $(SLO)$/fwktabwindow.obj
+ $(SLO)$/taskcreator.obj \
SRS1NAME=$(TARGET)
SRC1FILES =\
diff --git a/framework/source/dispatch/makefile.mk b/framework/source/dispatch/makefile.mk
index 352aa66bfda7..38eee4683580 100644
--- a/framework/source/dispatch/makefile.mk
+++ b/framework/source/dispatch/makefile.mk
@@ -50,7 +50,6 @@ SLOFILES=\
$(SLO)$/dispatchinformationprovider.obj \
$(SLO)$/dispatchprovider.obj \
$(SLO)$/helpagentdispatcher.obj \
- $(SLO)$/interaction.obj \
$(SLO)$/interceptionhelper.obj \
$(SLO)$/loaddispatcher.obj \
$(SLO)$/mailtodispatcher.obj \
diff --git a/framework/source/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx
index a2c22b7c0f83..a2c22b7c0f83 100644
--- a/framework/source/classes/actiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/actiontriggercontainer.cxx
diff --git a/framework/source/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
index aafc45601399..dd6d6b3c6415 100644
--- a/framework/source/classes/actiontriggerpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
@@ -44,6 +44,8 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::lang;
using namespace com::sun::star::awt;
+//struct SAL_DLLPUBLIC_IMPORT ::cppu::OBroadcastHelperVar< OMultiTypeInterfaceContainerHelper, OMultiTypeInterfaceContainerHelper::keyType >;
+
// Handles for properties
// (PLEASE SORT THIS FIELD, IF YOU ADD NEW PROPERTIES!)
// We use an enum to define these handles, to use all numbers from 0 to nn and
diff --git a/framework/source/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
index bc07a45eabaa..bc07a45eabaa 100644
--- a/framework/source/classes/actiontriggerseparatorpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
diff --git a/framework/source/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx
index 55c8ba553062..55c8ba553062 100644
--- a/framework/source/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
diff --git a/framework/source/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 730bf0baa32f..730bf0baa32f 100644
--- a/framework/source/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
diff --git a/framework/source/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx
index 44a023d3b70d..44a023d3b70d 100644
--- a/framework/source/classes/bmkmenu.cxx
+++ b/framework/source/fwe/classes/bmkmenu.cxx
diff --git a/framework/source/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx
index 8244d0243d81..8244d0243d81 100644
--- a/framework/source/classes/fwkresid.cxx
+++ b/framework/source/fwe/classes/fwkresid.cxx
diff --git a/framework/source/classes/imagewrapper.cxx b/framework/source/fwe/classes/imagewrapper.cxx
index 4479c9dfe86e..4479c9dfe86e 100644
--- a/framework/source/classes/imagewrapper.cxx
+++ b/framework/source/fwe/classes/imagewrapper.cxx
diff --git a/framework/source/fwe/classes/makefile.mk b/framework/source/fwe/classes/makefile.mk
new file mode 100644
index 000000000000..06f29986340e
--- /dev/null
+++ b/framework/source/fwe/classes/makefile.mk
@@ -0,0 +1,62 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.36.82.1 $
+#
+# 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.
+#
+#*************************************************************************
+PRJ=..$/..$/..
+
+PRJNAME= framework
+TARGET= fwk_fweclasses
+ENABLE_EXCEPTIONS= TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+CDEFS+=-DFWE_DLLIMPLEMENTATION
+
+# --- Generate -----------------------------------------------------
+
+SLOFILES= \
+ $(SLO)$/actiontriggercontainer.obj \
+ $(SLO)$/actiontriggerpropertyset.obj \
+ $(SLO)$/actiontriggerseparatorpropertyset.obj \
+ $(SLO)$/addonmenu.obj \
+ $(SLO)$/addonsoptions.obj \
+ $(SLO)$/bmkmenu.obj \
+ $(SLO)$/fwkresid.obj \
+ $(SLO)$/imagewrapper.obj \
+ $(SLO)$/menuextensionsupplier.obj \
+ $(SLO)$/rootactiontriggercontainer.obj \
+ $(SLO)$/sfxhelperfunctions.obj \
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
+
diff --git a/framework/source/classes/menuextensionsupplier.cxx b/framework/source/fwe/classes/menuextensionsupplier.cxx
index c4abb55f67a6..c4abb55f67a6 100644
--- a/framework/source/classes/menuextensionsupplier.cxx
+++ b/framework/source/fwe/classes/menuextensionsupplier.cxx
diff --git a/framework/source/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
index 09ae494c00f4..09ae494c00f4 100644
--- a/framework/source/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
diff --git a/framework/source/classes/sfxhelperfunctions.cxx b/framework/source/fwe/classes/sfxhelperfunctions.cxx
index c5dfd6c2a6ee..0bb9fa58d7ab 100644
--- a/framework/source/classes/sfxhelperfunctions.cxx
+++ b/framework/source/fwe/classes/sfxhelperfunctions.cxx
@@ -31,9 +31,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_framework.hxx"
-#ifndef __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_CXX_
#include <classes/sfxhelperfunctions.hxx>
-#endif
static pfunc_setToolBoxControllerCreator pToolBoxControllerCreator = NULL;
static pfunc_setStatusBarControllerCreator pStatusBarControllerCreator = NULL;
diff --git a/framework/source/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx
index da03355a5e48..9f86b64e278f 100644
--- a/framework/source/dispatch/interaction.cxx
+++ b/framework/source/fwe/dispatch/interaction.cxx
@@ -51,6 +51,7 @@
namespace framework{
+//template class FWE_DLLEXPORT ContinuationBase<typename com::sun::star::task::XInteractionApprove>;
//_________________________________________________________________________________________________________________
// non exported const
//_________________________________________________________________________________________________________________
diff --git a/framework/source/fwe/dispatch/makefile.mk b/framework/source/fwe/dispatch/makefile.mk
new file mode 100644
index 000000000000..1490555d3432
--- /dev/null
+++ b/framework/source/fwe/dispatch/makefile.mk
@@ -0,0 +1,52 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.17 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+PRJ=..$/..$/..
+
+PRJNAME= framework
+TARGET= fwk_fwedispatch
+ENABLE_EXCEPTIONS= TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- defines ------------------------------------------------------
+
+CDEFS+=-DCOMPMOD_NAMESPACE=framework -DFWE_DLLIMPLEMENTATION
+
+# --- Generate -----------------------------------------------------
+
+SLOFILES=\
+ $(SLO)$/interaction.obj \
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
diff --git a/framework/source/helper/acceleratorinfo.cxx b/framework/source/fwe/helper/acceleratorinfo.cxx
index de9b1bb73f5c..de9b1bb73f5c 100644
--- a/framework/source/helper/acceleratorinfo.cxx
+++ b/framework/source/fwe/helper/acceleratorinfo.cxx
diff --git a/framework/source/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx
index dae7002d08ff..dae7002d08ff 100644
--- a/framework/source/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
diff --git a/framework/source/helper/configimporter.cxx b/framework/source/fwe/helper/configimporter.cxx
index 0f9705ec156e..0f9705ec156e 100644
--- a/framework/source/helper/configimporter.cxx
+++ b/framework/source/fwe/helper/configimporter.cxx
diff --git a/framework/source/helper/imageproducer.cxx b/framework/source/fwe/helper/imageproducer.cxx
index 76f1238efd31..76f1238efd31 100644
--- a/framework/source/helper/imageproducer.cxx
+++ b/framework/source/fwe/helper/imageproducer.cxx
diff --git a/framework/source/fwe/helper/makefile.mk b/framework/source/fwe/helper/makefile.mk
new file mode 100644
index 000000000000..af762a055bcc
--- /dev/null
+++ b/framework/source/fwe/helper/makefile.mk
@@ -0,0 +1,59 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.34.82.1 $
+#
+# 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.
+#
+#*************************************************************************
+PRJ=..$/..$/..
+
+PRJNAME= framework
+TARGET= fwk_fwehelper
+ENABLE_EXCEPTIONS= TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- defines ------------------------------------------------------
+
+CDEFS+=-DCOMPMOD_NAMESPACE=framework -DFWE_DLLIMPLEMENTATION
+
+# --- Generate -----------------------------------------------------
+
+SLOFILES=\
+$(SLO)$/acceleratorinfo.obj \
+$(SLO)$/actiontriggerhelper.obj \
+$(SLO)$/configimporter.obj \
+$(SLO)$/imageproducer.obj \
+$(SLO)$/propertysetcontainer.obj \
+$(SLO)$/titlehelper.obj \
+$(SLO)$/uiconfigelementwrapperbase.obj \
+$(SLO)$/uielementwrapperbase.obj \
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
diff --git a/framework/source/helper/propertysetcontainer.cxx b/framework/source/fwe/helper/propertysetcontainer.cxx
index d2e0915235bf..d2e0915235bf 100644
--- a/framework/source/helper/propertysetcontainer.cxx
+++ b/framework/source/fwe/helper/propertysetcontainer.cxx
diff --git a/framework/source/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index b021d4f4de9d..b021d4f4de9d 100644
--- a/framework/source/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/fwe/helper/uiconfigelementwrapperbase.cxx
index 1f93e356f290..1f93e356f290 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/fwe/helper/uiconfigelementwrapperbase.cxx
diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/fwe/helper/uielementwrapperbase.cxx
index e406e19df81b..e406e19df81b 100644
--- a/framework/source/helper/uielementwrapperbase.cxx
+++ b/framework/source/fwe/helper/uielementwrapperbase.cxx
diff --git a/framework/source/fwe/interaction/makefile.mk b/framework/source/fwe/interaction/makefile.mk
new file mode 100644
index 000000000000..206c2ab46806
--- /dev/null
+++ b/framework/source/fwe/interaction/makefile.mk
@@ -0,0 +1,52 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.5.82.1 $
+#
+# 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.
+#
+#*************************************************************************
+PRJ=..$/..$/..
+
+PRJNAME= framework
+TARGET= fwk_fweinteraction
+ENABLE_EXCEPTIONS= TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- defines ------------------------------------------------------
+
+CDEFS+=-DCOMPMOD_NAMESPACE=framework -DFWE_DLLIMPLEMENTATION
+
+# --- Generate -----------------------------------------------------
+
+SLOFILES= \
+ $(SLO)$/preventduplicateinteraction.obj
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
diff --git a/framework/source/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
index 4e30da90e25b..4e30da90e25b 100644
--- a/framework/source/interaction/preventduplicateinteraction.cxx
+++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
diff --git a/framework/source/xml/eventsconfiguration.cxx b/framework/source/fwe/xml/eventsconfiguration.cxx
index beebd7963dfe..beebd7963dfe 100644
--- a/framework/source/xml/eventsconfiguration.cxx
+++ b/framework/source/fwe/xml/eventsconfiguration.cxx
diff --git a/framework/source/xml/eventsdocumenthandler.cxx b/framework/source/fwe/xml/eventsdocumenthandler.cxx
index a741b2096e86..27627428bf5f 100644
--- a/framework/source/xml/eventsdocumenthandler.cxx
+++ b/framework/source/fwe/xml/eventsdocumenthandler.cxx
@@ -31,6 +31,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_framework.hxx"
+#include <fwedllapi.h>
#include <stdio.h>
//_________________________________________________________________________________________________________________
diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/fwe/xml/imagesconfiguration.cxx
index 9f35a522677c..9f35a522677c 100644
--- a/framework/source/xml/imagesconfiguration.cxx
+++ b/framework/source/fwe/xml/imagesconfiguration.cxx
diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/fwe/xml/imagesdocumenthandler.cxx
index eff0a1f45ab5..eff0a1f45ab5 100644
--- a/framework/source/xml/imagesdocumenthandler.cxx
+++ b/framework/source/fwe/xml/imagesdocumenthandler.cxx
diff --git a/framework/source/fwe/xml/makefile.mk b/framework/source/fwe/xml/makefile.mk
new file mode 100644
index 000000000000..6f7f104b2a77
--- /dev/null
+++ b/framework/source/fwe/xml/makefile.mk
@@ -0,0 +1,63 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.7 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+PRJ=..$/..$/..
+
+PRJNAME= framework
+TARGET= fwk_fwexml
+ENABLE_EXCEPTIONS= TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+CDEFS += -DFWE_DLLIMPLEMENTATION
+
+# --- Generate -----------------------------------------------------
+
+SLOFILES= \
+ $(SLO)$/eventsconfiguration.obj \
+ $(SLO)$/eventsdocumenthandler.obj \
+ $(SLO)$/imagesconfiguration.obj \
+ $(SLO)$/imagesdocumenthandler.obj \
+ $(SLO)$/menuconfiguration.obj \
+ $(SLO)$/menudocumenthandler.obj \
+ $(SLO)$/saxnamespacefilter.obj \
+ $(SLO)$/statusbarconfiguration.obj \
+ $(SLO)$/statusbardocumenthandler.obj \
+ $(SLO)$/toolboxconfiguration.obj \
+ $(SLO)$/toolboxdocumenthandler.obj \
+ $(SLO)$/toolboxlayoutdocumenthandler.obj \
+ $(SLO)$/xmlnamespaces.obj \
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
+
diff --git a/framework/source/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx
index dcaf354891f6..dcaf354891f6 100644
--- a/framework/source/xml/menuconfiguration.cxx
+++ b/framework/source/fwe/xml/menuconfiguration.cxx
diff --git a/framework/source/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index 2422d516d0ac..2422d516d0ac 100644
--- a/framework/source/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
diff --git a/framework/source/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx
index 46c69fb750ea..46c69fb750ea 100644
--- a/framework/source/xml/saxnamespacefilter.cxx
+++ b/framework/source/fwe/xml/saxnamespacefilter.cxx
diff --git a/framework/source/xml/statusbarconfiguration.cxx b/framework/source/fwe/xml/statusbarconfiguration.cxx
index 352f17e21fbf..352f17e21fbf 100644
--- a/framework/source/xml/statusbarconfiguration.cxx
+++ b/framework/source/fwe/xml/statusbarconfiguration.cxx
diff --git a/framework/source/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index cf5793a80903..cf5793a80903 100644
--- a/framework/source/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
diff --git a/framework/source/xml/toolboxconfiguration.cxx b/framework/source/fwe/xml/toolboxconfiguration.cxx
index 1c6ba1e1cfab..1c6ba1e1cfab 100644
--- a/framework/source/xml/toolboxconfiguration.cxx
+++ b/framework/source/fwe/xml/toolboxconfiguration.cxx
diff --git a/framework/source/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index 78d6f8158413..78d6f8158413 100644
--- a/framework/source/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
diff --git a/framework/source/xml/toolboxlayoutdocumenthandler.cxx b/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
index 5fb9d7677a83..5fb9d7677a83 100644
--- a/framework/source/xml/toolboxlayoutdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
diff --git a/framework/source/xml/xmlnamespaces.cxx b/framework/source/fwe/xml/xmlnamespaces.cxx
index ba4c6b8ede9b..ba4c6b8ede9b 100644
--- a/framework/source/xml/xmlnamespaces.cxx
+++ b/framework/source/fwe/xml/xmlnamespaces.cxx
diff --git a/framework/source/classes/converter.cxx b/framework/source/fwi/classes/converter.cxx
index 415944cdcadf..415944cdcadf 100644
--- a/framework/source/classes/converter.cxx
+++ b/framework/source/fwi/classes/converter.cxx
diff --git a/framework/source/classes/framelistanalyzer.cxx b/framework/source/fwi/classes/framelistanalyzer.cxx
index 5fbea7d9fcb7..5fbea7d9fcb7 100644
--- a/framework/source/classes/framelistanalyzer.cxx
+++ b/framework/source/fwi/classes/framelistanalyzer.cxx
diff --git a/framework/source/fwi/classes/makefile.mk b/framework/source/fwi/classes/makefile.mk
new file mode 100644
index 000000000000..8a4479fd54a0
--- /dev/null
+++ b/framework/source/fwi/classes/makefile.mk
@@ -0,0 +1,54 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.36.82.1 $
+#
+# 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.
+#
+#*************************************************************************
+PRJ=..$/..$/..
+
+PRJNAME= framework
+TARGET= fwk_fwiclasses
+ENABLE_EXCEPTIONS= TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+CDEFS+=-DFWI_DLLIMPLEMENTATION
+
+# --- Generate -----------------------------------------------------
+
+SLOFILES= \
+ $(SLO)$/converter.obj \
+ $(SLO)$/framelistanalyzer.obj \
+ $(SLO)$/propertysethelper.obj \
+ $(SLO)$/protocolhandlercache.obj \
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
+
diff --git a/framework/source/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx
index decda29fa46b..decda29fa46b 100644
--- a/framework/source/classes/propertysethelper.cxx
+++ b/framework/source/fwi/classes/propertysethelper.cxx
diff --git a/framework/source/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx
index f426eb530c90..918347a22f4c 100644
--- a/framework/source/classes/protocolhandlercache.cxx
+++ b/framework/source/fwi/classes/protocolhandlercache.cxx
@@ -335,7 +335,7 @@ void HandlerCFGAccess::read( HandlerHash** ppHandler ,
(**ppPattern)[*pItem] = lNames[nSource];
}
- // �nsert the handler info into the normal handler cache
+ // ï¿œnsert the handler info into the normal handler cache
(**ppHandler)[lNames[nSource]] = aHandler;
++nSource;
}
diff --git a/framework/source/fwi/helper/makefile.mk b/framework/source/fwi/helper/makefile.mk
new file mode 100644
index 000000000000..b688c3807355
--- /dev/null
+++ b/framework/source/fwi/helper/makefile.mk
@@ -0,0 +1,55 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.34.82.1 $
+#
+# 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.
+#
+#*************************************************************************
+PRJ=..$/..$/..
+
+PRJNAME= framework
+TARGET= fwk_fwihelper
+ENABLE_EXCEPTIONS= TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- defines ------------------------------------------------------
+
+CDEFS+=-DCOMPMOD_NAMESPACE=framework -DFWI_DLLIMPLEMENTATION
+
+# --- Generate -----------------------------------------------------
+
+SLOFILES= \
+ $(SLO)$/mischelper.obj \
+ $(SLO)$/networkdomain.obj \
+ $(SLO)$/popupmenucontrollerbase.obj \
+ $(SLO)$/shareablemutex.obj \
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
diff --git a/framework/source/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx
index 8e0f79b2607c..2c6f4b0073f9 100644
--- a/framework/source/helper/mischelper.cxx
+++ b/framework/source/fwi/helper/mischelper.cxx
@@ -1,76 +1,76 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: langselectionstatusbarcontroller.cxx,v $
- * $Revision: 1.6.40.1 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_framework.hxx"
-
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: langselectionstatusbarcontroller.cxx,v $
+ * $Revision: 1.6.40.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/frame/XModuleManager.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
-
-#include <tools/debug.hxx>
-#include <comphelper/processfactory.hxx>
-#include <helper/mischelper.hxx>
-#include <services.h>
-
-
-using namespace ::com::sun::star;
+
+#include <tools/debug.hxx>
+#include <comphelper/processfactory.hxx>
+#include <helper/mischelper.hxx>
+#include <services.h>
+
+
+using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
-
-namespace framework
-{
-
-uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGuesser() const
-{
- if (!m_xLanguageGuesser.is())
- {
- try
- {
- m_xLanguageGuesser = uno::Reference< linguistic2::XLanguageGuessing >(
- m_xServiceManager->createInstance(
- rtl::OUString::createFromAscii( "com.sun.star.linguistic2.LanguageGuessing" ) ),
- uno::UNO_QUERY );
- }
- catch (uno::Exception &r)
- {
- (void) r;
- DBG_ASSERT( 0, "failed to get language guessing component" );
- }
- }
- return m_xLanguageGuesser;
-}
-
+
+namespace framework
+{
+
+uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGuesser() const
+{
+ if (!m_xLanguageGuesser.is())
+ {
+ try
+ {
+ m_xLanguageGuesser = uno::Reference< linguistic2::XLanguageGuessing >(
+ m_xServiceManager->createInstance(
+ rtl::OUString::createFromAscii( "com.sun.star.linguistic2.LanguageGuessing" ) ),
+ uno::UNO_QUERY );
+ }
+ catch (uno::Exception &r)
+ {
+ (void) r;
+ DBG_ASSERT( 0, "failed to get language guessing component" );
+ }
+ }
+ return m_xLanguageGuesser;
+}
+
::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL
,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory
,::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xUICommandLabels
@@ -139,7 +139,7 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues
}
return aLabel;
-}
-
-} // namespace framework
-
+}
+
+} // namespace framework
+
diff --git a/framework/source/helper/networkdomain.cxx b/framework/source/fwi/helper/networkdomain.cxx
index caef0daa897d..caef0daa897d 100644
--- a/framework/source/helper/networkdomain.cxx
+++ b/framework/source/fwi/helper/networkdomain.cxx
diff --git a/framework/source/helper/popupmenucontrollerbase.cxx b/framework/source/fwi/helper/popupmenucontrollerbase.cxx
index af46386edb35..af46386edb35 100644
--- a/framework/source/helper/popupmenucontrollerbase.cxx
+++ b/framework/source/fwi/helper/popupmenucontrollerbase.cxx
diff --git a/framework/source/helper/shareablemutex.cxx b/framework/source/fwi/helper/shareablemutex.cxx
index 7e9c8138cfab..7e9c8138cfab 100644
--- a/framework/source/helper/shareablemutex.cxx
+++ b/framework/source/fwi/helper/shareablemutex.cxx
diff --git a/framework/source/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx
index 497ab1200e21..497ab1200e21 100644
--- a/framework/source/jobs/configaccess.cxx
+++ b/framework/source/fwi/jobs/configaccess.cxx
diff --git a/framework/source/jobs/jobconst.cxx b/framework/source/fwi/jobs/jobconst.cxx
index d4dc5a24c693..d4dc5a24c693 100644
--- a/framework/source/jobs/jobconst.cxx
+++ b/framework/source/fwi/jobs/jobconst.cxx
diff --git a/framework/source/fwi/jobs/makefile.mk b/framework/source/fwi/jobs/makefile.mk
new file mode 100644
index 000000000000..844153d55593
--- /dev/null
+++ b/framework/source/fwi/jobs/makefile.mk
@@ -0,0 +1,52 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.8 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+PRJ=..$/..$/..
+
+PRJNAME= framework
+TARGET= fwk_fwijobs
+ENABLE_EXCEPTIONS= TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+CDEFS += -DFWI_DLLIMPLEMENTATION
+
+# --- Generate -----------------------------------------------------
+
+SLOFILES= \
+ $(SLO)$/jobconst.obj \
+ $(SLO)$/configaccess.obj
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
+
diff --git a/framework/source/threadhelp/lockhelper.cxx b/framework/source/fwi/threadhelp/lockhelper.cxx
index c14d26d5fe82..c14d26d5fe82 100644
--- a/framework/source/threadhelp/lockhelper.cxx
+++ b/framework/source/fwi/threadhelp/lockhelper.cxx
diff --git a/framework/source/threadhelp/makefile.mk b/framework/source/fwi/threadhelp/makefile.mk
index aa89ce09cda0..e22ed613734a 100644
--- a/framework/source/threadhelp/makefile.mk
+++ b/framework/source/fwi/threadhelp/makefile.mk
@@ -28,17 +28,17 @@
# for a copy of the LGPLv3 License.
#
#*************************************************************************
-PRJ=..$/..
+PRJ=..$/..$/..
PRJNAME= framework
TARGET= fwk_threadhelp
-USE_DEFFILE= TRUE
ENABLE_EXCEPTIONS= TRUE
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
+CDEFS += -DFWI_DLLIMPLEMENTATION
# --- Generate -----------------------------------------------------
SLOFILES= $(SLO)$/lockhelper.obj \
diff --git a/framework/source/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx
index 031e64b1d4b7..b06dcd35bbce 100644
--- a/framework/source/threadhelp/transactionmanager.cxx
+++ b/framework/source/fwi/threadhelp/transactionmanager.cxx
@@ -39,6 +39,7 @@
#include <macros/debug.hxx>
#include <macros/generic.hxx>
+#include <fwidllapi.h>
//_________________________________________________________________________________________________________________
// interface includes
@@ -183,7 +184,7 @@ void TransactionManager::setWorkingMode( EWorkingMode eMode )
// Make member access threadsafe!
ResetableGuard aGuard( m_aMutex );
- // Check working mode again .. because anoz�ther instance could be faster.
+ // Check working mode again .. because anozï¿œther instance could be faster.
// (It's possible to set this guard at first of this method too!)
if( m_aTransactionManager.getWorkingMode() == E_INIT )
{
diff --git a/framework/source/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx
index 959f91776db0..959f91776db0 100644
--- a/framework/source/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
diff --git a/framework/source/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx
index b42930159924..b42930159924 100644
--- a/framework/source/uielement/itemcontainer.cxx
+++ b/framework/source/fwi/uielement/itemcontainer.cxx
diff --git a/framework/source/fwi/uielement/makefile.mk b/framework/source/fwi/uielement/makefile.mk
new file mode 100644
index 000000000000..2a18cf47e11d
--- /dev/null
+++ b/framework/source/fwi/uielement/makefile.mk
@@ -0,0 +1,52 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.17 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+PRJ=..$/..$/..
+
+PRJNAME= framework
+TARGET= fwk_fwiuielement
+ENABLE_EXCEPTIONS= TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+CDEFS += -DFWI_DLLIMPLEMENTATION
+
+# --- Generate -----------------------------------------------------
+
+SLOFILES= \
+ $(SLO)$/constitemcontainer.obj \
+ $(SLO)$/itemcontainer.obj \
+ $(SLO)$/rootitemcontainer.obj \
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
diff --git a/framework/source/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx
index e560a95d7923..e560a95d7923 100644
--- a/framework/source/uielement/rootitemcontainer.cxx
+++ b/framework/source/fwi/uielement/rootitemcontainer.cxx
diff --git a/framework/source/helper/makefile.mk b/framework/source/helper/makefile.mk
index 7a2fc1816869..8f96dc95e70c 100644
--- a/framework/source/helper/makefile.mk
+++ b/framework/source/helper/makefile.mk
@@ -45,29 +45,18 @@ CDEFS+=-DCOMPMOD_NAMESPACE=framework
# --- Generate -----------------------------------------------------
-SLOFILES= $(SLO)$/ocomponentaccess.obj \
- $(SLO)$/ocomponentenumeration.obj \
- $(SLO)$/oframes.obj \
- $(SLO)$/statusindicatorfactory.obj \
- $(SLO)$/statusindicator.obj \
- $(SLO)$/imageproducer.obj \
- $(SLO)$/propertysetcontainer.obj \
- $(SLO)$/actiontriggerhelper.obj \
- $(SLO)$/persistentwindowstate.obj \
- $(SLO)$/networkdomain.obj \
- $(SLO)$/acceleratorinfo.obj \
- $(SLO)$/uielementwrapperbase.obj \
- $(SLO)$/popupmenucontrollerbase.obj \
- $(SLO)$/dockingareadefaultacceptor.obj \
- $(SLO)$/uiconfigelementwrapperbase.obj \
- $(SLO)$/shareablemutex.obj \
- $(SLO)$/vclstatusindicator.obj \
- $(SLO)$/wakeupthread.obj \
- $(SLO)$/configimporter.obj \
- $(SLO)$/tagwindowasmodified.obj \
- $(SLO)$/titlebarupdate.obj \
- $(SLO)$/titlehelper.obj \
- $(SLO)$/mischelper.obj
+SLOFILES=\
+ $(SLO)$/dockingareadefaultacceptor.obj \
+ $(SLO)$/ocomponentaccess.obj \
+ $(SLO)$/ocomponentenumeration.obj \
+ $(SLO)$/oframes.obj \
+ $(SLO)$/persistentwindowstate.obj \
+ $(SLO)$/statusindicator.obj \
+ $(SLO)$/statusindicatorfactory.obj \
+ $(SLO)$/tagwindowasmodified.obj \
+ $(SLO)$/titlebarupdate.obj \
+ $(SLO)$/vclstatusindicator.obj \
+ $(SLO)$/wakeupthread.obj \
# --- Targets ------------------------------------------------------
diff --git a/framework/source/interaction/makefile.mk b/framework/source/interaction/makefile.mk
index 4ae3564c21f7..b109082906b3 100644
--- a/framework/source/interaction/makefile.mk
+++ b/framework/source/interaction/makefile.mk
@@ -45,8 +45,7 @@ CDEFS+=-DCOMPMOD_NAMESPACE=framework
# --- Generate -----------------------------------------------------
-SLOFILES= $(SLO)$/quietinteraction.obj \
- $(SLO)$/preventduplicateinteraction.obj
+SLOFILES= $(SLO)$/quietinteraction.obj
# --- Targets ------------------------------------------------------
diff --git a/framework/source/jobs/makefile.mk b/framework/source/jobs/makefile.mk
index 090bc3dbfc0f..cbb91da31a3b 100644
--- a/framework/source/jobs/makefile.mk
+++ b/framework/source/jobs/makefile.mk
@@ -46,10 +46,8 @@ SLOFILES= $(SLO)$/jobexecutor.obj \
$(SLO)$/jobdata.obj \
$(SLO)$/jobresult.obj \
$(SLO)$/joburl.obj \
- $(SLO)$/jobconst.obj \
$(SLO)$/helponstartup.obj \
$(SLO)$/shelljob.obj \
- $(SLO)$/configaccess.obj
# --- Targets ------------------------------------------------------
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 9b19503f887e..4b72a1023a91 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -31,6 +31,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_framework.hxx"
+
#include "services/autorecovery.hxx"
//_______________________________________________
@@ -95,6 +96,8 @@
#include <tools/urlobj.hxx>
+#include <fwkdllapi.h>
+
//_______________________________________________
// namespaces
@@ -104,6 +107,7 @@ namespace css = ::com::sun::star;
namespace fpf = ::framework::pattern::frame;
+
namespace framework
{
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 62361d619df3..6fa9f2717d72 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -104,6 +104,8 @@
#endif
#include <comphelper/extract.hxx>
+#include <fwkdllapi.h>
+
//_________________________________________________________________________________________________________________
// namespace
//_________________________________________________________________________________________________________________
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index bb3a18548b42..c64ca1e952ca 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -60,6 +60,8 @@
#include <comphelper/configurationhelper.hxx>
#include <unotools/configpathes.hxx>
+#include <fwkdllapi.h>
+
// ______________________________________________
// non exported const
diff --git a/framework/source/uielement/makefile.mk b/framework/source/uielement/makefile.mk
index 568be10c0d0b..367b5c63e64a 100644
--- a/framework/source/uielement/makefile.mk
+++ b/framework/source/uielement/makefile.mk
@@ -47,7 +47,6 @@ SLOFILES= \
$(SLO)$/buttontoolbarcontroller.obj \
$(SLO)$/comboboxtoolbarcontroller.obj \
$(SLO)$/complextoolbarcontroller.obj \
- $(SLO)$/constitemcontainer.obj \
$(SLO)$/controlmenucontroller.obj \
$(SLO)$/dropdownboxtoolbarcontroller.obj \
$(SLO)$/edittoolbarcontroller.obj \
@@ -57,7 +56,6 @@ SLOFILES= \
$(SLO)$/generictoolbarcontroller.obj \
$(SLO)$/headermenucontroller.obj \
$(SLO)$/imagebuttontoolbarcontroller.obj \
- $(SLO)$/itemcontainer.obj \
$(SLO)$/langselectionmenucontroller.obj \
$(SLO)$/langselectionstatusbarcontroller.obj \
$(SLO)$/logoimagestatusbarcontroller.obj \
@@ -70,7 +68,6 @@ SLOFILES= \
$(SLO)$/objectmenucontroller.obj \
$(SLO)$/progressbarwrapper.obj \
$(SLO)$/recentfilesmenucontroller.obj \
- $(SLO)$/rootitemcontainer.obj \
$(SLO)$/simpletextstatusbarcontroller.obj \
$(SLO)$/spinfieldtoolbarcontroller.obj \
$(SLO)$/statusbar.obj \
diff --git a/framework/source/xml/makefile.mk b/framework/source/xml/makefile.mk
index 2d610ca0f3d9..4f37b22f40fc 100644
--- a/framework/source/xml/makefile.mk
+++ b/framework/source/xml/makefile.mk
@@ -41,21 +41,8 @@ ENABLE_EXCEPTIONS= TRUE
# --- Generate -----------------------------------------------------
SLOFILES= \
- $(SLO)$/eventsconfiguration.obj \
- $(SLO)$/eventsdocumenthandler.obj \
- $(SLO)$/imagesconfiguration.obj \
- $(SLO)$/imagesdocumenthandler.obj \
- $(SLO)$/menuconfiguration.obj \
- $(SLO)$/menudocumenthandler.obj \
- $(SLO)$/statusbarconfiguration.obj \
- $(SLO)$/statusbardocumenthandler.obj \
- $(SLO)$/toolboxconfiguration.obj \
- $(SLO)$/toolboxdocumenthandler.obj \
- $(SLO)$/toolboxlayoutdocumenthandler.obj \
- $(SLO)$/saxnamespacefilter.obj \
- $(SLO)$/xmlnamespaces.obj \
- $(SLO)$/acceleratorconfigurationreader.obj \
- $(SLO)$/acceleratorconfigurationwriter.obj
+ $(SLO)$/acceleratorconfigurationreader.obj \
+ $(SLO)$/acceleratorconfigurationwriter.obj \
# --- Targets ------------------------------------------------------
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
index 0a07f3cf137d..f4ef36b5335b 100644
--- a/framework/util/makefile.mk
+++ b/framework/util/makefile.mk
@@ -33,7 +33,6 @@ PRJ=..
PRJNAME= framework
TARGET= framework
-USE_DEFFILE= TRUE
ENABLE_EXCEPTIONS= TRUE
NO_BSYMBOLIC= TRUE
GEN_HID= TRUE
@@ -43,10 +42,17 @@ GEN_HID_OTHER= TRUE
.INCLUDE : settings.mk
+USE_DEFFILE=
+SHL1USE_EXPORTS=name
+SHL2USE_EXPORTS=name
+SHL3USE_EXPORTS=name
+SHL4USE_EXPORTS=name
+SHL5USE_EXPORTS=name
+
+
# --- internal import -------------------------------------------------
LIB1TARGET= $(SLB)$/fwiobj.lib
-
LIB1OBJFILES= \
$(SLO)$/converter.obj \
$(SLO)$/lockhelper.obj \
@@ -69,13 +75,11 @@ LIB1OBJFILES= \
# --- export library for sfx2 -------------------------------------------------
LIB2TARGET= $(SLB)$/fweobj.lib
-
LIB2OBJFILES= \
$(SLO)$/bmkmenu.obj \
$(SLO)$/eventsconfiguration.obj \
$(SLO)$/eventsdocumenthandler.obj \
$(SLO)$/imageproducer.obj \
- $(SLO)$/lockhelper.obj \
$(SLO)$/menuconfiguration.obj \
$(SLO)$/menudocumenthandler.obj \
$(SLO)$/saxnamespacefilter.obj \
@@ -110,11 +114,8 @@ LIB2OBJFILES= \
# --- import classes library ---------------------------------------------------
SHL1TARGET= fwi$(DLLPOSTFIX)
-
SHL1IMPLIB= ifwi
-
SHL1LIBS= $(LIB1TARGET)
-
SHL1STDLIBS= \
$(UNOTOOLSLIB) \
$(CPPUHELPERLIB) \
@@ -133,22 +134,11 @@ SHL1STDLIBS+=\
$(KERNEL32LIB)
.ENDIF
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME= $(SHL1TARGET)
-
-DEFLIB1NAME= fwiobj
-DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt
-
-
# --- export classes library ---------------------------------------------------
SHL2TARGET= fwe$(DLLPOSTFIX)
-
SHL2IMPLIB= ifwe
-
SHL2LIBS= $(LIB2TARGET)
-
SHL2STDLIBS= \
$(FWILIB) \
$(VCLLIB) \
@@ -162,20 +152,10 @@ SHL2STDLIBS= \
$(VOSLIB) \
$(SALLIB)
-SHL2DEF= $(MISC)$/$(SHL2TARGET).def
-SHL2DEPN= $(SHL1IMPLIBN) $(SHL1TARGETN)
-
-DEF2NAME= $(SHL2TARGET)
-
-DEFLIB2NAME= fweobj
-DEF2DEPN= $(MISC)$/$(SHL2TARGET).flt
-
# --- light services library ----------------------------------------------------
SHL3TARGET= fwl$(DLLPOSTFIX)
-
SHL3IMPLIB= ifwl
-
SHL3OBJS= $(SLO)$/mediatypedetectionhelper.obj\
$(SLO)$/registertemp.obj \
$(SLO)$/mailtodispatcher.obj \
@@ -218,19 +198,10 @@ SHL3STDLIBS= \
$(VCLLIB) \
$(SALLIB)
-SHL3DEF= $(MISC)$/$(SHL3TARGET).def
-SHL3DEPN= $(SHL1IMPLIBN) $(SHL1TARGETN) $(SHL2TARGETN)
-
-DEF3NAME= $(SHL3TARGET)
-
-SHL3VERSIONMAP= exports.map
-
# --- services library ----------------------------------------------------
SHL4TARGET= fwk$(DLLPOSTFIX)
-
SHL4IMPLIB= ifwk
-
SHL4OBJS= \
$(SLO)$/acceleratorcache.obj \
$(SLO)$/acceleratorconfiguration.obj \
@@ -246,7 +217,6 @@ SHL4OBJS= \
$(SLO)$/closedispatcher.obj \
$(SLO)$/comboboxtoolbarcontroller.obj \
$(SLO)$/complextoolbarcontroller.obj \
- $(SLO)$/configaccess.obj \
$(SLO)$/containerquery.obj \
$(SLO)$/contenthandler.obj \
$(SLO)$/controlmenucontroller.obj \
@@ -360,19 +330,10 @@ SHL4STDLIBS= \
$(UCBHELPERLIB) \
$(I18NISOLANGLIB)
-SHL4DEF= $(MISC)$/$(SHL4TARGET).def
-SHL4DEPN= $(SHL1IMPLIBN) $(SHL1TARGETN) $(SHL2IMPLIBN) $(SHL2TARGETN)
-
-DEF4NAME= $(SHL4TARGET)
-
-SHL4VERSIONMAP= exports.map
-
# --- services library ----------------------------------------------------
SHL5TARGET= fwm$(DLLPOSTFIX)
-
SHL5IMPLIB= ifwm
-
SHL5OBJS= \
$(SLO)$/helponstartup.obj \
$(SLO)$/tabwinfactory.obj \
@@ -391,40 +352,17 @@ SHL5STDLIBS= \
$(CPPULIB) \
$(SALLIB)
-SHL5DEF= $(MISC)$/$(SHL5TARGET).def
-SHL5DEPN= $(SHL1IMPLIBN) $(SHL1TARGETN)
-
-DEF5NAME= $(SHL5TARGET)
-
-SHL5VERSIONMAP= exports.map
-
RESLIB1NAME= fwe
RESLIB1IMAGES= $(PRJ)$/res
RESLIB1SRSFILES= $(SRS)$/fwk_classes.srs \
$(SRS)$/fwk_services.srs \
+SHL2DEPN= $(SHL1IMPLIBN) $(SHL1TARGETN)
+SHL3DEPN= $(SHL1IMPLIBN) $(SHL1TARGETN) $(SHL2TARGETN)
+SHL4DEPN= $(SHL1IMPLIBN) $(SHL1TARGETN) $(SHL2IMPLIBN) $(SHL2TARGETN)
+SHL5DEPN= $(SHL1IMPLIBN) $(SHL1TARGETN)
+
# --- Targets -----------------------------------------------------------------
.INCLUDE : target.mk
-$(MISC)$/$(SHL1TARGET).flt: makefile.mk
- @echo ------------------------------
- @echo Making: $@
- @echo _Impl>$@
- @echo WEP>>$@
- @echo m_pLoader>$@
- @echo _TI2>>$@
- @echo _TI3>>$@
- @echo LIBMAIN>>$@
- @echo LibMain>>$@
- @echo _STL::pair>>$@
-
-$(MISC)$/$(SHL2TARGET).flt: makefile.mk
- @echo ------------------------------
- @echo Making: $@
- @echo _Impl>$@
- @echo WEP>>$@
- @echo m_pLoader>$@
- @echo _TI2>>$@
- @echo LIBMAIN>>$@
- @echo LibMain>>$@