summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xediteng/Library_editeng.mk14
-rw-r--r--framework/Library_fwe.mk14
-rw-r--r--framework/Library_fwi.mk11
-rw-r--r--framework/Library_fwk.mk12
-rw-r--r--framework/Library_fwl.mk10
-rw-r--r--framework/Library_fwm.mk10
-rw-r--r--framework/inc/helper/uiconfigelementwrapperbase.hxx61
-rw-r--r--framework/inc/helper/uielementwrapperbase.hxx45
-rw-r--r--framework/source/helper/uiconfigelementwrapperbase.cxx (renamed from framework/source/fwe/helper/uiconfigelementwrapperbase.cxx)2
-rw-r--r--framework/source/helper/uielementwrapperbase.cxx (renamed from framework/source/fwe/helper/uielementwrapperbase.cxx)2
-rwxr-xr-xsfx2/CppunitTest_sfx2_metadatable.mk2
-rwxr-xr-xsfx2/Library_qstart.mk7
-rwxr-xr-xsfx2/Library_sfx.mk9
-rw-r--r--svx/Library_svx.mk7
-rw-r--r--svx/Library_svxcore.mk10
-rw-r--r--svx/Library_textconversiondlgs.mk11
-rwxr-xr-xvbahelper/Library_msforms.mk20
-rwxr-xr-xvbahelper/Library_vbahelper.mk20
-rw-r--r--xmloff/Library_xo.mk11
-rw-r--r--xmloff/Library_xof.mk11
20 files changed, 77 insertions, 212 deletions
diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index 293270b9a47c..9213abedd3b1 100755
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -31,10 +31,6 @@ $(eval $(call gb_Library_add_package_headers,editeng,editeng_inc))
$(eval $(call gb_Library_add_precompiled_header,editeng,$(SRCDIR)/editeng/inc/pch/precompiled_editeng))
-# in case UNO services are exported: declare location of component file
-#$(eval $(call gb_Library_set_componentfile,editeng,editeng/COMPONENT_FILE))
-
-# add any additional include paths for this library here
$(eval $(call gb_Library_set_include,editeng,\
$$(INCLUDE) \
-I$(SRCDIR)/editeng/inc/pch \
@@ -164,16 +160,8 @@ $(eval $(call gb_Library_add_linked_libs,editeng,\
icuuc \
i18nisolang1 \
i18npaper \
- $(gb_StdLibs) \
+ $(gb_STDLIBS) \
))
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,editeng,\
- dl \
- m \
- pthread \
-))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 63ff8cbb9897..0b44b82632d1 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -55,7 +55,7 @@ $(eval $(call gb_Library_add_linked_libs,fwe,\
utl \
vcl \
vos3 \
- $(gb_StdLibs) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,fwe,\
@@ -78,8 +78,6 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\
framework/source/fwe/helper/imageproducer \
framework/source/fwe/helper/propertysetcontainer \
framework/source/fwe/helper/titlehelper \
- framework/source/fwe/helper/uiconfigelementwrapperbase \
- framework/source/fwe/helper/uielementwrapperbase \
framework/source/fwe/interaction/preventduplicateinteraction \
framework/source/fwe/xml/eventsconfiguration \
framework/source/fwe/xml/eventsdocumenthandler \
@@ -95,15 +93,9 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\
framework/source/fwe/xml/xmlnamespaces \
))
+#todo: ImageListDescriptor can't be exported completely without exporting everything
ifeq ($(OS),LINUX)
-
$(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(CXXFLAGS))))
-
-$(eval $(call gb_Library_add_linked_libs,fwe,\
- dl \
- m \
- pthread \
-))
endif
ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
@@ -119,5 +111,5 @@ $(eval $(call gb_Library_add_linked_libs,fwe,\
))
endif
endif
-# TODO: visibility
+
# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index e510768700be..fc60fdf15564 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -58,7 +58,7 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\
utl \
vcl \
vos3 \
- $(gb_StdLibs) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,fwi,\
@@ -77,13 +77,6 @@ $(eval $(call gb_Library_add_exception_objects,fwi,\
framework/source/fwi/uielement/rootitemcontainer \
))
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,fwi,\
- dl \
- m \
- pthread \
-))
-endif
ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
$(eval $(call gb_Library_add_linked_libs,fwi,\
@@ -103,5 +96,5 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\
))
endif
endif
-# TODO: visibility
+
# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 80a0ea120d1f..27e3d924774c 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -58,7 +58,7 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\
ucbhelper \
utl \
vcl \
- $(gb_StdLibs) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,fwk,\
@@ -96,6 +96,8 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/helper/statusindicatorfactory \
framework/source/helper/tagwindowasmodified \
framework/source/helper/titlebarupdate \
+ framework/source/helper/uiconfigelementwrapperbase \
+ framework/source/helper/uielementwrapperbase \
framework/source/helper/vclstatusindicator \
framework/source/helper/wakeupthread \
framework/source/interaction/quietinteraction \
@@ -183,13 +185,6 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/xml/acceleratorconfigurationwriter \
))
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,fwk,\
- dl \
- m \
- pthread \
-))
-endif
ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
$(eval $(call gb_Library_add_linked_libs,fwk,\
@@ -204,4 +199,5 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\
))
endif
endif
+
# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index 86325804e513..cbf4a7b9a901 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -54,7 +54,7 @@ $(eval $(call gb_Library_add_linked_libs,fwl,\
tl \
utl \
vcl \
- $(gb_StdLibs) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,fwl,\
@@ -83,13 +83,7 @@ $(eval $(call gb_Library_add_exception_objects,fwl,\
framework/source/uielement/simpletextstatusbarcontroller \
framework/source/uielement/toolbarsmenucontroller \
))
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,fwl,\
- dl \
- m \
- pthread \
-))
-endif
+
ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
$(eval $(call gb_Library_add_linked_libs,fwl,\
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
index f441f4d78d56..c242ecc8e12f 100644
--- a/framework/Library_fwm.mk
+++ b/framework/Library_fwm.mk
@@ -53,7 +53,7 @@ $(eval $(call gb_Library_add_linked_libs,fwm,\
utl \
vcl \
vos3 \
- $(gb_StdLibs) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,fwm,\
@@ -65,13 +65,6 @@ $(eval $(call gb_Library_add_exception_objects,fwm,\
framework/source/tabwin/tabwinfactory \
))
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,fwm,\
- dl \
- m \
- pthread \
-))
-endif
ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
$(eval $(call gb_Library_add_linked_libs,fwm,\
@@ -86,4 +79,5 @@ $(eval $(call gb_Library_add_linked_libs,fwm,\
))
endif
endif
+
# vim: set noet sw=4 ts=4:
diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx
index a815e7ac544d..d2df4bc541b3 100644
--- a/framework/inc/helper/uiconfigelementwrapperbase.hxx
+++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx
@@ -58,7 +58,6 @@
#include <cppuhelper/propshlp.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/weak.hxx>
-#include <framework/fwedllapi.h>
namespace framework
{
@@ -79,48 +78,48 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
// public methods
//-------------------------------------------------------------------------------------------------------------
public:
- FWE_DLLPUBLIC UIConfigElementWrapperBase( sal_Int16 nType,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory );
- virtual FWE_DLLPUBLIC ~UIConfigElementWrapperBase();
+ UIConfigElementWrapperBase( sal_Int16 nType,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory );
+ virtual ~UIConfigElementWrapperBase();
// XInterface
- virtual FWE_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException );
- virtual FWE_DLLPUBLIC void SAL_CALL acquire() throw();
- virtual FWE_DLLPUBLIC void SAL_CALL release() throw();
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL acquire() throw();
+ virtual void SAL_CALL release() throw();
// XTypeProvider
- virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException );
- virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException );
// XComponent
- virtual FWE_DLLPUBLIC void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0;
- virtual FWE_DLLPUBLIC void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
- virtual FWE_DLLPUBLIC void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0;
+ virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
// XInitialization
- virtual FWE_DLLPUBLIC void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
// XUIElementSettings
- virtual FWE_DLLPUBLIC void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException) = 0;
- virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException);
- virtual FWE_DLLPUBLIC void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException) = 0;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException);
// XUIElement
- virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException);
- virtual FWE_DLLPUBLIC ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException);
- virtual FWE_DLLPUBLIC ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException);
- virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException);
+ virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0;
// XUpdatable
- virtual FWE_DLLPUBLIC void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException);
// XUIConfigurationListener
- virtual FWE_DLLPUBLIC void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
- virtual FWE_DLLPUBLIC void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
- virtual FWE_DLLPUBLIC void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
// XEventListener
using cppu::OPropertySetHelper::disposing;
- virtual FWE_DLLPUBLIC void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException);
//-------------------------------------------------------------------------------------------------------------
// protected methods
@@ -128,21 +127,21 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
protected:
// OPropertySetHelper
- virtual FWE_DLLPUBLIC sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue ,
+ virtual sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue ,
com::sun::star::uno::Any& aOldValue ,
sal_Int32 nHandle ,
const com::sun::star::uno::Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException );
- virtual FWE_DLLPUBLIC void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle ,
+ virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle ,
const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception );
using cppu::OPropertySetHelper::getFastPropertyValue;
- virtual FWE_DLLPUBLIC void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue ,
+ virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue ,
sal_Int32 nHandle ) const;
- virtual FWE_DLLPUBLIC ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
- virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException);
+ virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
+ virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException);
- virtual FWE_DLLPUBLIC void impl_fillNewData();
+ virtual void impl_fillNewData();
- static FWE_DLLPUBLIC const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
+ static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
sal_Int16 m_nType;
bool m_bPersistent : 1,
diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx
index daa574c9411e..667af7d7f97b 100644
--- a/framework/inc/helper/uielementwrapperbase.hxx
+++ b/framework/inc/helper/uielementwrapperbase.hxx
@@ -53,7 +53,6 @@
#include <cppuhelper/propshlp.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/weak.hxx>
-#include <framework/fwedllapi.h>
namespace framework
{
@@ -72,34 +71,34 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
// public methods
//-------------------------------------------------------------------------------------------------------------
public:
- FWE_DLLPUBLIC UIElementWrapperBase( sal_Int16 nType );
- virtual FWE_DLLPUBLIC ~UIElementWrapperBase();
+ UIElementWrapperBase( sal_Int16 nType );
+ virtual ~UIElementWrapperBase();
// XInterface
- virtual FWE_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException );
- virtual FWE_DLLPUBLIC void SAL_CALL acquire() throw();
- virtual FWE_DLLPUBLIC void SAL_CALL release() throw();
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL acquire() throw();
+ virtual void SAL_CALL release() throw();
// XTypeProvider
- virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException );
- virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException );
// XComponent
- virtual FWE_DLLPUBLIC void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0;
- virtual FWE_DLLPUBLIC void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
- virtual FWE_DLLPUBLIC void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0;
+ virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
// XInitialization
- virtual FWE_DLLPUBLIC void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
// XUpdatable
- virtual FWE_DLLPUBLIC void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException);
// XUIElement
- virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException);
- virtual FWE_DLLPUBLIC ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException);
- virtual FWE_DLLPUBLIC ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException);
- virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException);
+ virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0;
//-------------------------------------------------------------------------------------------------------------
// protected methods
@@ -107,19 +106,19 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
protected:
// OPropertySetHelper
- virtual FWE_DLLPUBLIC sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue ,
+ virtual sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue ,
com::sun::star::uno::Any& aOldValue ,
sal_Int32 nHandle ,
const com::sun::star::uno::Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException );
- virtual FWE_DLLPUBLIC void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle ,
+ virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle ,
const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception );
using cppu::OPropertySetHelper::getFastPropertyValue;
- virtual FWE_DLLPUBLIC void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue ,
+ virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue ,
sal_Int32 nHandle ) const;
- virtual FWE_DLLPUBLIC ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
- virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException);
+ virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
+ virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException);
- static FWE_DLLPUBLIC const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
+ static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener
rtl::OUString m_aResourceURL;
diff --git a/framework/source/fwe/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index 030ec5bf8cf6..f820d5719b85 100644
--- a/framework/source/fwe/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -70,7 +70,7 @@ const rtl::OUString UIELEMENT_PROPNAME_TYPE( RTL_CONSTASCII_USTRINGPARAM( "Type"
const rtl::OUString UIELEMENT_PROPNAME_XMENUBAR( RTL_CONSTASCII_USTRINGPARAM( "XMenuBar" ));
const rtl::OUString UIELEMENT_PROPNAME_NOCLOSE( RTL_CONSTASCII_USTRINGPARAM( "NoClose" ));
-using namespace rtl;
+//using namespace rtl;
using namespace com::sun::star::beans;
using namespace com::sun::star::uno;
using namespace com::sun::star::frame;
diff --git a/framework/source/fwe/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx
index 6329f94b3063..38724e077326 100644
--- a/framework/source/fwe/helper/uielementwrapperbase.cxx
+++ b/framework/source/helper/uielementwrapperbase.cxx
@@ -57,7 +57,7 @@ const rtl::OUString UIELEMENT_PROPNAME_RESOURCEURL( RTL_CONSTASCII_USTRINGPARAM(
const rtl::OUString UIELEMENT_PROPNAME_TYPE( RTL_CONSTASCII_USTRINGPARAM( "Type" ));
const rtl::OUString UIELEMENT_PROPNAME_FRAME( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
-using namespace rtl;
+//using namespace rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk
index d2a31b624d0d..67d5a7f43869 100755
--- a/sfx2/CppunitTest_sfx2_metadatable.mk
+++ b/sfx2/CppunitTest_sfx2_metadatable.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sfx2_metadatable, \
sal \
sfx \
stl \
- $(gb_StdLibs) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index 2843524b1dc1..2344d79746c4 100755
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -78,13 +78,6 @@ $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\
sfx \
))
-$(eval $(call gb_Library_add_linked_system_libs,qstart_gtk,\
- dl \
- icuuc \
- m \
- pthread \
-))
-
$(eval $(call gb_Library_add_exception_objects,qstart_gtk,\
sfx2/source/appl/shutdowniconunx \
))
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 9ce73f2369ef..4cfd5da93bb6 100755
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -76,14 +76,7 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\
vcl \
vos3 \
xml2 \
- $(gb_StdLibs) \
-))
-
-$(eval $(call gb_Library_add_linked_system_libs,sfx,\
- icuuc \
- dl \
- m \
- pthread \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,sfx,\
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 97cde827eb56..b549adeb9030 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -68,7 +68,7 @@ $(eval $(call gb_Library_add_linked_libs,svx,\
vos3 \
xo \
xcr \
- $(gb_StdLibs) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,svx,\
@@ -218,11 +218,6 @@ ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/dialog/sendreportunx \
))
-$(eval $(call gb_Library_add_linked_libs,svx,\
- dl \
- m \
- pthread \
-))
else
ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_linked_libs,svx,\
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 6e811cead2a9..5b7546d2d1c7 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -83,7 +83,7 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\
vcl \
vos3 \
xo \
- $(gb_StdLibs) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,svxcore,\
@@ -448,14 +448,6 @@ $(eval $(call gb_Library_add_cxxobjects,svxcore,\
))
endif
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,svxcore,\
- dl \
- m \
- pthread \
-))
-endif
-
$(eval $(call gb_SdiTarget_SdiTarget,svx/sdi/svxslots,svx/sdi/svx))
$(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\
diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk
index 2e0880aced18..c2ddae4fe131 100644
--- a/svx/Library_textconversiondlgs.mk
+++ b/svx/Library_textconversiondlgs.mk
@@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\
tl \
utl \
vcl \
- $(gb_StdLibs) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,textconversiondlgs,\
@@ -63,13 +63,4 @@ $(eval $(call gb_Library_add_exception_objects,textconversiondlgs,\
svx/source/unodialogs/textconversiondlgs/resid \
))
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\
- dl \
- m \
- pthread \
- stl \
-))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk
index 6bd335f9e210..3e23c492f32b 100755
--- a/vbahelper/Library_msforms.mk
+++ b/vbahelper/Library_msforms.mk
@@ -61,27 +61,9 @@ $(eval $(call gb_Library_add_linked_libs,msforms,\
tk \
sb \
stl \
+ $(gb_STDLIBS) \
))
-# this code usually will be platform specific; these libraries are also defined in Repository.mk
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,msforms,\
- dl \
- m \
- pthread \
-))
-endif
-
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,msforms,\
- kernel32 \
- msvcrt \
- oldnames \
- user32 \
- uwinapi \
-))
-endif
-
# add all source files that shall be compiled with exceptions enabled
# the name is relative to $(SRCROOT) and must not contain an extension
$(eval $(call gb_Library_add_exception_objects,msforms,\
diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk
index 01d144cc4897..722b66d709a1 100755
--- a/vbahelper/Library_vbahelper.mk
+++ b/vbahelper/Library_vbahelper.mk
@@ -63,27 +63,9 @@ $(eval $(call gb_Library_add_linked_libs,vbahelper,\
svl \
msfilter \
tk \
+ $(gb_STDLIBS) \
))
-# this code usually will be platform specific; these libraries are also defined in Repository.mk
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,vbahelper,\
- dl \
- m \
- pthread \
-))
-endif
-
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,vbahelper,\
- kernel32 \
- msvcrt \
- oldnames \
- user32 \
- uwinapi \
-))
-endif
-
# add all source files that shall be compiled with exceptions enabled
# the name is relative to $(SRCROOT) and must not contain an extension
$(eval $(call gb_Library_add_exception_objects,vbahelper,\
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 1aa8b6407eae..71afa085d2cd 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -59,7 +59,7 @@ $(eval $(call gb_Library_add_linked_libs,xo,\
tl \
utl \
vos3 \
- $(gb_StdLibs) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,xo,\
@@ -379,15 +379,6 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/xforms/xformsimport \
))
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,xo,\
- dl \
- icuuc \
- m \
- pthread \
-))
-endif
-
ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
$(eval $(call gb_Library_add_linked_libs,xo,\
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk
index 55e3fbdd66ee..dca8b3901874 100644
--- a/xmloff/Library_xof.mk
+++ b/xmloff/Library_xof.mk
@@ -45,7 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,xof,\
salhelper \
stl \
xo \
- $(gb_StdLibs) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,xof,\
@@ -90,15 +90,6 @@ $(eval $(call gb_Library_add_exception_objects,xof,\
xmloff/source/transform/XMLFilterRegistration \
))
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,xof,\
- icuuc \
- dl \
- m \
- pthread \
-))
-endif
-
ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
$(eval $(call gb_Library_add_linked_libs,xof,\
generated by cgit (git 2.34.1) at 2025-03-07 07:49:38 +0000