6 files changed, 8 insertions, 25 deletions
diff --git a/cui/source/dialogs/winpluginlib.cpp b/cui/source/dialogs/winpluginlib.cpp
index 0b1fced85b40..6f9104bfc29f 100644
--- a/cui/source/dialogs/winpluginlib.cpp
+++ b/cui/source/dialogs/winpluginlib.cpp
@@ -28,10 +28,6 @@
  *
  ************************************************************************/
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #endif
diff --git a/cui/source/inc/optimprove.hxx b/cui/source/inc/optimprove.hxx
index 61f184239e88..16ea0de5b78c 100644
--- a/cui/source/inc/optimprove.hxx
+++ b/cui/source/inc/optimprove.hxx
@@ -32,8 +32,6 @@
 
 // include ---------------------------------------------------------------
 
-#include "svx/svxdllapi.h"
-
 #include <vcl/tabpage.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 6c2a0a7ac528..72e147fa9f69 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -43,7 +43,6 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include "svx/svxdllapi.h"
 
 namespace com{namespace sun{namespace star{
 namespace beans{
@@ -110,7 +109,7 @@ public:
 
 // class SvxLinguTabPage -------------------------------------------------
 
-class SVX_DLLPUBLIC SvxLinguTabPage : public SfxTabPage
+class SvxLinguTabPage : public SfxTabPage
 {
 private:
     FixedLine           aLinguisticFL;
@@ -152,11 +151,11 @@ private:
 
     SvxLinguData_Impl*  pLinguData;
 
-    SVX_DLLPRIVATE SvxLinguTabPage( Window* pParent, const SfxItemSet& rCoreSet );
-    SVX_DLLPRIVATE SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol);
+    SvxLinguTabPage( Window* pParent, const SfxItemSet& rCoreSet );
+    SvLBoxEntry*    CreateEntry(String& rTxt, USHORT nCol);
 
-    SVX_DLLPRIVATE void    AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx );
-    SVX_DLLPRIVATE ULONG   GetDicUserData( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx );
+    void    AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx );
+    ULONG   GetDicUserData( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx );
 
 #ifdef _SVX_OPTLINGU_CXX
     DECL_LINK( SelectHdl_Impl, SvxCheckListBox * );
@@ -166,8 +165,8 @@ private:
     DECL_LINK( PostDblClickHdl_Impl, SvTreeListBox * );
     DECL_LINK( OpenURLHdl_Impl, svt::FixedHyperlink* );
 
-    SVX_DLLPRIVATE void                UpdateModulesBox_Impl();
-    SVX_DLLPRIVATE void                UpdateDicBox_Impl();
+    void                UpdateModulesBox_Impl();
+    void                UpdateDicBox_Impl();
 #endif
 
 public:
diff --git a/cui/source/inc/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx
index a0477d25b262..fb1fc582f09e 100644
--- a/cui/source/inc/radiobtnbox.hxx
+++ b/cui/source/inc/radiobtnbox.hxx
@@ -33,13 +33,12 @@
 // include ---------------------------------------------------------------
 
 #include <svx/simptabl.hxx>
-#include "svx/svxdllapi.h"
 
 namespace svx {
 
 // class SvxRadioButtonListBox -------------------------------------------
 
-class SVX_DLLPUBLIC SvxRadioButtonListBox : public SvxSimpleTable
+class SvxRadioButtonListBox : public SvxSimpleTable
 {
     using SvxSimpleTable::SetTabs;
 
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index fd195b18a7e3..3d6b4280cefc 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -31,18 +31,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include "connpooloptions.hxx"
-#ifndef _OFFAPP_CONNPOOLOPTIONS_HRC_
 #include "connpooloptions.hrc"
-#endif
 #include <svtools/editbrowsebox.hxx>
 #include <vcl/field.hxx>
 #include "connpoolsettings.hxx"
 #include <svl/eitem.hxx>
-
 #include <cuires.hrc>
 #include "helpid.hrc"
 #include <dialmgr.hxx>
diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx
index 03951a4ee271..3d18e50795c3 100644
--- a/cui/source/options/connpoolsettings.cxx
+++ b/cui/source/options/connpoolsettings.cxx
@@ -31,9 +31,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include "connpoolsettings.hxx"
 
 //........................................................................