Revert "make more classes dllpublic"

This reverts commit add2ca7b3ab10ed9d18e60d8e50020168d922836.

It causes too much breakage on windows. It is better to start again from
scratch.

49 files changed, 106 insertions, 108 deletions

diff --git a/include/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx
index d482799c6dd2..8d41deee87f5 100644
--- a/include/oox/core/fastparser.hxx
+++ b/include/oox/core/fastparser.hxx
@@ -23,8 +23,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/xml/sax/XFastParser.hpp>
 
-#include <oox/dllapi.h>
-
 namespace oox {
     struct NamespaceMap;
     class StorageBase;
@@ -42,7 +40,7 @@ namespace core {
 /** Wrapper for a fast SAX parser that works on automatically generated OOXML
     token and namespace identifiers.
  */
-class OOX_DLLPUBLIC FastParser
+class FastParser
 {
 public:
     explicit            FastParser(
diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index a9d506e321df..6cc180cbdc21 100644
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -114,7 +114,7 @@ struct OOX_DLLPUBLIC ShapeTypeModel
 
 /** A shape template contains all formatting properties of shapes and can serve
     as templates for several shapes in a drawing. */
-class OOX_DLLPUBLIC ShapeType
+class ShapeType
 {
 public:
     explicit            ShapeType( Drawing& rDrawing );
diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx
index f7543e66269d..e19cf1499101 100644
--- a/include/svx/AccessibleControlShape.hxx
+++ b/include/svx/AccessibleControlShape.hxx
@@ -48,7 +48,7 @@ namespace accessibility {
                                 >   AccessibleControlShape_Base;
 /** @descr
 */
-class SVX_DLLPUBLIC AccessibleControlShape
+class AccessibleControlShape
         :public AccessibleShape
         ,public AccessibleControlShape_Base
 {
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index ff8f83b4d4fa..e50c6e5fe878 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -61,7 +61,7 @@ enum GridRowStatus
 // DbGridRow, description of rows
 
 
-class SVX_DLLPUBLIC DbGridRow : public SvRefBase
+class DbGridRow : public SvRefBase
 {
     ::com::sun::star::uno::Any  m_aBookmark;        // Bookmark of the row, can be set
     DbDataColumns               m_aVariants;
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 4cc4662ff419..15d221bcd773 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -111,7 +111,7 @@ public:
     <SvxSearchItem><SID_ATTR_SEARCH>
 */
 
-class SVX_DLLPUBLIC SvxSearchDialog : public SfxModelessDialog
+class SvxSearchDialog : public SfxModelessDialog
 {
 friend class SvxSearchController;
 friend class SvxSearchDialogWrapper;
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx
index 9bebe6860582..1985154b0f6e 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -219,7 +219,7 @@ protected:
 
 //  class VCLXCheckBox
 
-class TOOLKIT_DLLPUBLIC VCLXCheckBox :    public ::com::sun::star::awt::XCheckBox,
+class VCLXCheckBox :    public ::com::sun::star::awt::XCheckBox,
                         public ::com::sun::star::awt::XButton,
                         public VCLXGraphicControl
 {
@@ -277,7 +277,7 @@ public:
 
 //  class VCLXRadioButton
 
-class TOOLKIT_DLLPUBLIC VCLXRadioButton : public ::com::sun::star::awt::XRadioButton,
+class VCLXRadioButton : public ::com::sun::star::awt::XRadioButton,
                         public ::com::sun::star::awt::XButton,
                         public VCLXGraphicControl
 {
@@ -622,7 +622,7 @@ public:
 
 //  class VCLXScrollBar
 
-class TOOLKIT_DLLPUBLIC VCLXScrollBar :   public ::com::sun::star::awt::XScrollBar,
+class VCLXScrollBar :   public ::com::sun::star::awt::XScrollBar,
                         public VCLXWindow
 {
 private:
@@ -930,7 +930,7 @@ public:
 
 //  class VCLXFormattedSpinField
 
-class TOOLKIT_DLLPUBLIC VCLXFormattedSpinField : public VCLXSpinField
+class VCLXFormattedSpinField : public VCLXSpinField
 {
 private:
     FormatterBase*  mpFormatter;
diff --git a/include/tools/errinf.hxx b/include/tools/errinf.hxx
index caaa1a351d9c..a16b56a179f4 100644
--- a/include/tools/errinf.hxx
+++ b/include/tools/errinf.hxx
@@ -32,7 +32,7 @@ class EDcr_Impl;
 class ErrHdl_Impl;
 namespace vcl { class Window; }
 
-class TOOLS_DLLPUBLIC ErrorInfo
+class ErrorInfo
 {
 private:
     sal_uIntPtr             lUserId;
diff --git a/include/tools/inetstrm.hxx b/include/tools/inetstrm.hxx
index 9d9f5d862ecd..ea6be1f9c0fe 100644
--- a/include/tools/inetstrm.hxx
+++ b/include/tools/inetstrm.hxx
@@ -47,7 +47,7 @@ enum INetMessageStreamState
 };
 
 /// Message Generator Interface.
-class TOOLS_DLLPUBLIC INetMessageIStream
+class INetMessageIStream
 {
     INetMIMEMessage *pSourceMsg;
     bool            bHeaderGenerated;
@@ -72,7 +72,7 @@ public:
     INetMessageIStream (sal_uIntPtr nBufferSize = 2048);
     virtual ~INetMessageIStream();
 
-    int Read (sal_Char *pData, sal_uIntPtr nSize);
+    TOOLS_DLLPUBLIC int Read (sal_Char *pData, sal_uIntPtr nSize);
 
     INetMIMEMessage *GetSourceMessage() const { return pSourceMsg; }
     void SetSourceMessage (INetMIMEMessage *pMsg) { pSourceMsg = pMsg; }
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index 84ecc708aa34..6599d841b95a 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -214,7 +214,7 @@ class ScChangeActionIns;
 class ScChangeActionDel;
 class ScChangeActionContent;
 
-class SC_DLLPUBLIC ScChangeAction
+class ScChangeAction
 {
     friend class ScChangeTrack;
     friend class ScChangeActionIns;
@@ -415,7 +415,7 @@ public:
 };
 
 //  ScChangeActionIns
-class SC_DLLPUBLIC ScChangeActionIns : public ScChangeAction
+class ScChangeActionIns : public ScChangeAction
 {
     friend class ScChangeTrack;
 
@@ -560,7 +560,7 @@ public:
 };
 
 //  ScChangeActionMove
-class SC_DLLPUBLIC ScChangeActionMove : public ScChangeAction
+class ScChangeActionMove : public ScChangeAction
 {
     friend class ScChangeTrack;
     friend class ScChangeActionDel;
@@ -661,7 +661,7 @@ enum ScChangeActionContentCellType
     SC_CACCT_MATREF
 };
 
-class SC_DLLPUBLIC ScChangeActionContent : public ScChangeAction
+class ScChangeActionContent : public ScChangeAction
 {
     friend class ScChangeTrack;
 
@@ -893,7 +893,7 @@ enum ScChangeTrackMergeState
 // and are decremented, to keep values in a table separated from "normal" actions.
 #define SC_CHGTRACK_GENERATED_START ((sal_uInt32) 0xfffffff0)
 
-class SC_DLLPUBLIC ScChangeTrack : public utl::ConfigurationListener
+class ScChangeTrack : public utl::ConfigurationListener
 {
     friend void ScChangeAction::RejectRestoreContents( ScChangeTrack*, SCsCOL, SCsROW );
     friend bool ScChangeActionDel::Reject( ScDocument* pDoc );
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index 6a8e4d528ed6..3052b3760a65 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -150,7 +150,7 @@ public:
 };
 
 //  ScDataPilotDescriptorBase is never instantiated directly
-class SC_DLLPUBLIC ScDataPilotDescriptorBase : public com::sun::star::sheet::XDataPilotDescriptor,
+class ScDataPilotDescriptorBase : public com::sun::star::sheet::XDataPilotDescriptor,
                                   public com::sun::star::beans::XPropertySet,
                                   public com::sun::star::sheet::XDataPilotDataLayoutFieldSupplier,
                                   public com::sun::star::lang::XServiceInfo,
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index b23927591976..708bd858c628 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -35,7 +35,7 @@ struct ScQueryParam;
 struct ScSubTotalParam;
 struct ScImportParam;
 
-class SC_DLLPUBLIC ScDBData : public ScRefreshTimer
+class ScDBData : public ScRefreshTimer
 {
 private:
     boost::scoped_ptr<ScSortParam> mpSortParam;
@@ -76,7 +76,7 @@ public:
         bool operator() (const ScDBData& left, const ScDBData& right) const;
     };
 
-    ScDBData(const OUString& rName,
+    SC_DLLPUBLIC ScDBData(const OUString& rName,
              SCTAB nTab,
              SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
              bool bByR = true, bool bHasH = true);
@@ -91,7 +91,7 @@ public:
     const OUString& GetName() const { return aName; }
     const OUString& GetUpperName() const { return aUpper; }
     void        GetArea(SCTAB& rTab, SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2, SCROW& rRow2) const;
-    void GetArea(ScRange& rRange) const;
+    SC_DLLPUBLIC void GetArea(ScRange& rRange) const;
     void        SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
     void        MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
     bool        IsByRow() const                 { return bByRow; }
@@ -115,10 +115,10 @@ public:
     void        GetSortParam(ScSortParam& rSortParam) const;
     void        SetSortParam(const ScSortParam& rSortParam);
 
-    void       GetQueryParam(ScQueryParam& rQueryParam) const;
-    void       SetQueryParam(const ScQueryParam& rQueryParam);
-    bool       GetAdvancedQuerySource(ScRange& rSource) const;
-    void       SetAdvancedQuerySource(const ScRange* pSource);
+    SC_DLLPUBLIC void       GetQueryParam(ScQueryParam& rQueryParam) const;
+    SC_DLLPUBLIC void       SetQueryParam(const ScQueryParam& rQueryParam);
+    SC_DLLPUBLIC bool       GetAdvancedQuerySource(ScRange& rSource) const;
+    SC_DLLPUBLIC void       SetAdvancedQuerySource(const ScRange* pSource);
 
     void        GetSubTotalParam(ScSubTotalParam& rSubTotalParam) const;
     void        SetSubTotalParam(const ScSubTotalParam& rSubTotalParam);
@@ -130,7 +130,7 @@ public:
     bool        IsDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const;
 
     bool        HasImportParam() const;
-    bool HasQueryParam() const;
+    SC_DLLPUBLIC bool HasQueryParam() const;
     bool        HasSortParam() const;
     bool        HasSubTotalParam() const;
 
diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx
index 7e610cd47756..867b15d880f8 100644
--- a/sc/inc/queryparam.hxx
+++ b/sc/inc/queryparam.hxx
@@ -36,7 +36,7 @@ class SharedStringPool;
 
 }
 
-struct SC_DLLPUBLIC ScQueryParamBase
+struct ScQueryParamBase
 {
     bool            bHasHeader;
     bool            bByRow;
@@ -50,12 +50,12 @@ struct SC_DLLPUBLIC ScQueryParamBase
 
     virtual bool IsValidFieldIndex() const;
 
-    SCSIZE GetEntryCount() const;
-    const ScQueryEntry& GetEntry(SCSIZE n) const;
-    ScQueryEntry& GetEntry(SCSIZE n);
-    ScQueryEntry& AppendEntry();
+    SC_DLLPUBLIC SCSIZE GetEntryCount() const;
+    SC_DLLPUBLIC const ScQueryEntry& GetEntry(SCSIZE n) const;
+    SC_DLLPUBLIC ScQueryEntry& GetEntry(SCSIZE n);
+    SC_DLLPUBLIC ScQueryEntry& AppendEntry();
     ScQueryEntry* FindEntryByField(SCCOLROW nField, bool bNew);
-    void RemoveEntryByField(SCCOLROW nField);
+    SC_DLLPUBLIC void RemoveEntryByField(SCCOLROW nField);
     void Resize(size_t nNew);
     void FillInExcelSyntax( svl::SharedStringPool& rPool, const OUString& aCellStr, SCSIZE nIndex,
                             SvNumberFormatter* pFormatter );
@@ -76,7 +76,7 @@ protected:
     EntriesType maEntries;
 };
 
-struct SC_DLLPUBLIC ScQueryParamTable
+struct ScQueryParamTable
 {
     SCCOL           nCol1;
     SCROW           nRow1;
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 4059eb70582d..2673e2f1ad7d 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -80,7 +80,7 @@ class ScAnyRefModalDlg;
 #define SC_DROP_NAVIGATOR       1
 #define SC_DROP_TABLE           2
 
-class SC_DLLPUBLIC ScModule: public SfxModule, public SfxListener, utl::ConfigurationListener
+class ScModule: public SfxModule, public SfxListener, utl::ConfigurationListener
 {
     Timer               aIdleTimer;
     Idle                aSpellIdle;
@@ -171,18 +171,18 @@ public:
 
     // Options:
     const ScViewOptions&    GetViewOptions  ();
-    const ScDocOptions&     GetDocOptions   ();
-    const ScAppOptions&     GetAppOptions   ();
-    const ScDefaultsOptions&   GetDefaultsOptions ();
-    const ScFormulaOptions&   GetFormulaOptions ();
-    const ScInputOptions& GetInputOptions ();
-    const ScPrintOptions&   GetPrintOptions ();
+SC_DLLPUBLIC    const ScDocOptions&     GetDocOptions   ();
+SC_DLLPUBLIC    const ScAppOptions&     GetAppOptions   ();
+SC_DLLPUBLIC    const ScDefaultsOptions&   GetDefaultsOptions ();
+    SC_DLLPUBLIC const ScFormulaOptions&   GetFormulaOptions ();
+    SC_DLLPUBLIC const ScInputOptions& GetInputOptions ();
+SC_DLLPUBLIC    const ScPrintOptions&   GetPrintOptions ();
     void                    SetViewOptions  ( const ScViewOptions& rOpt );
-    void                    SetDocOptions   ( const ScDocOptions& rOpt );
-    void                    SetAppOptions   ( const ScAppOptions& rOpt );
+SC_DLLPUBLIC    void                    SetDocOptions   ( const ScDocOptions& rOpt );
+SC_DLLPUBLIC    void                    SetAppOptions   ( const ScAppOptions& rOpt );
     void                    SetDefaultsOptions ( const ScDefaultsOptions& rOpt );
-    void                    SetFormulaOptions ( const ScFormulaOptions& rOpt );
-    void   SetInputOptions ( const ScInputOptions& rOpt );
+    SC_DLLPUBLIC void                    SetFormulaOptions ( const ScFormulaOptions& rOpt );
+    SC_DLLPUBLIC void   SetInputOptions ( const ScInputOptions& rOpt );
     void                    SetPrintOptions ( const ScPrintOptions& rOpt );
     void                    InsertEntryToLRUList(sal_uInt16 nFIndex);
     void                    RecentFunctionsChanged();
@@ -199,7 +199,7 @@ public:
     svtools::ColorConfig&   GetColorConfig();
     SvtAccessibilityOptions& GetAccessOptions();
     SvtCTLOptions&      GetCTLOptions();
-    SvtUserOptions& GetUserOptions();
+    SC_DLLPUBLIC SvtUserOptions& GetUserOptions();
 
     void                ModifyOptions( const SfxItemSet& rOptSet );
 
@@ -208,7 +208,7 @@ public:
     bool                IsInputMode();  // also for SC_INPUT_TYPE
     void SetInputMode( ScInputMode eMode, const OUString* pInitText = NULL );
     bool                InputKeyEvent( const KeyEvent& rKEvt, bool bStartEdit = false );
-    void                InputEnterHandler( sal_uInt8 nBlockMode = 0 );
+    SC_DLLPUBLIC void                InputEnterHandler( sal_uInt8 nBlockMode = 0 );
     void                InputCancelHandler();
     void                InputSelection( EditView* pView );
     void                InputChanged( EditView* pView );
@@ -233,7 +233,7 @@ public:
     ScFormEditData*     GetFormEditData()       { return pFormEditData; }
 
     // input of reference:
-    void               SetRefDialog( sal_uInt16 nId, bool bVis, SfxViewFrame* pViewFrm = NULL );
+    SC_DLLPUBLIC void               SetRefDialog( sal_uInt16 nId, bool bVis, SfxViewFrame* pViewFrm = NULL );
     bool                IsModalMode(SfxObjectShell* pDocSh = NULL);
     bool                IsFormulaMode();
     bool                IsRefDialogOpen();
@@ -254,9 +254,9 @@ public:
     void                SetInSharedDocSaving( bool bNew )   { mbIsInSharedDocSaving = bNew; }
     bool                IsInSharedDocSaving() const         { return mbIsInSharedDocSaving; }
 
-    bool   RegisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd );
-    bool   UnregisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd );
-    vcl::Window * Find1RefWindow( sal_uInt16 nSlotId, vcl::Window *pWndAncestor );
+    SC_DLLPUBLIC bool   RegisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd );
+    SC_DLLPUBLIC bool   UnregisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd );
+    SC_DLLPUBLIC vcl::Window * Find1RefWindow( sal_uInt16 nSlotId, vcl::Window *pWndAncestor );
 
     ScAnyRefModalDlg* GetCurrentAnyRefDlg();
     void PushNewAnyRefDlg( ScAnyRefModalDlg* pDlg );
diff --git a/sc/inc/stlpool.hxx b/sc/inc/stlpool.hxx
index 640c65802d61..e83aef029727 100644
--- a/sc/inc/stlpool.hxx
+++ b/sc/inc/stlpool.hxx
@@ -25,7 +25,7 @@
 class ScStyleSheet;
 class ScDocument;
 
-class SC_DLLPUBLIC ScStyleSheetPool : public SfxStyleSheetPool
+class ScStyleSheetPool : public SfxStyleSheetPool
 {
 public:
                         ScStyleSheetPool( SfxItemPool&  rPool,
diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx
index 85f42f900de6..cb65a01028bb 100644
--- a/sc/inc/stlsheet.hxx
+++ b/sc/inc/stlsheet.hxx
@@ -26,7 +26,7 @@
 
 class ScStyleSheetPool;
 
-class SC_DLLPUBLIC ScStyleSheet : public SfxStyleSheet
+class ScStyleSheet : public SfxStyleSheet
 {
 friend class ScStyleSheetPool;
 
diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx
index 4a87aaccceee..5083c989a105 100644
--- a/sc/inc/userdat.hxx
+++ b/sc/inc/userdat.hxx
@@ -75,7 +75,7 @@ public:
     const ImageMap& GetImageMap() const             { return aImageMap; }
 };
 
-class SC_DLLPUBLIC ScMacroInfo : public SdrObjUserData
+class ScMacroInfo : public SdrObjUserData
 {
 public:
                     ScMacroInfo();
diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx
index 181376c9cfa2..6f6d2c0c7d04 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -92,7 +92,7 @@ public:
     DECL_LINK( ColFormatTypeHdl, ListBox*);
 };
 
-class SC_DLLPUBLIC ScCondFormatDlg : public ScAnyRefModalDlg
+class ScCondFormatDlg : public ScAnyRefModalDlg
 {
 private:
     PushButton* mpBtnAdd;
diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx
index 7ae49cf9695e..207fdbfdbce9 100644
--- a/sc/source/ui/inc/dbfunc.hxx
+++ b/sc/source/ui/inc/dbfunc.hxx
@@ -36,7 +36,7 @@ class ScDPSaveData;
 struct ScDPNumGroupInfo;
 struct ScSubTotalParam;
 
-class SC_DLLPUBLIC ScDBFunc : public ScViewFunc
+class ScDBFunc : public ScViewFunc
 {
 private:
     void GetSelectedMemberList(ScDPUniqueStringSet& rEntries, long& rDimension);
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 8b22bb9f3870..0221e601b8ae 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -81,7 +81,7 @@ struct SpellCallbackInfo;
 // predefines
 namespace sdr { namespace overlay { class OverlayObjectList; }}
 
-class SC_DLLPUBLIC ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSourceHelper
+class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSourceHelper
 {
     // ScFilterListBox is always used for selection list
     friend class ScFilterListBox;
diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx
index b8b266c6c219..bcf4fbc66d15 100644
--- a/sc/source/ui/inc/preview.hxx
+++ b/sc/source/ui/inc/preview.hxx
@@ -29,7 +29,7 @@ class ScDocShell;
 class ScPreviewShell;
 class FmFormView;
 
-class SC_DLLPUBLIC ScPreview : public vcl::Window
+class ScPreview : public vcl::Window
 {
 private:
     ScMarkData::MarkedTabsType maSelectedTabs;
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index 93e43a2454b1..d8bec53db738 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -36,7 +36,7 @@ struct ScHeaderFieldData;
 class ScPreviewLocationData;
 class CommandEvent;
 
-class SC_DLLPUBLIC ScPreviewShell: public SfxViewShell
+class ScPreviewShell: public SfxViewShell
 {
     ScDocShell*     pDocShell;
 
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 17e7ebc72b1f..81e800450180 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -89,7 +89,7 @@ enum ObjectSelectionType
     OST_Media
 };
 
-class SC_DLLPUBLIC ScTabViewShell: public SfxViewShell, public ScDBFunc
+class ScTabViewShell: public SfxViewShell, public ScDBFunc
 {
 private:
     static sal_uInt16           nInsertCtrlState;
diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx
index 4d2b85c97c8d..57d8ea6f8954 100644
--- a/sc/source/ui/inc/transobj.hxx
+++ b/sc/source/ui/inc/transobj.hxx
@@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star {
 
 #include <sfx2/objsh.hxx>
 
-class SC_DLLPUBLIC ScTransferObj : public TransferableHelper
+class ScTransferObj : public TransferableHelper
 {
 private:
     ScDocument*                     pDoc;
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index 8e4b62836db0..e415989c979f 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -379,7 +379,7 @@ private:
 typedef boost::shared_ptr< InteractiveSequence > InteractiveSequencePtr;
 typedef std::list< InteractiveSequencePtr > InteractiveSequenceList;
 
-class SD_DLLPUBLIC MainSequence : public EffectSequenceHelper, public ISequenceListener
+class MainSequence : public EffectSequenceHelper, public ISequenceListener
 {
     friend class UndoAnimation;
     friend class MainSequenceRebuildGuard;
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index a080caa0381c..5ad63fd081ee 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -75,7 +75,7 @@ typedef std::map< sal_uInt32, css::uno::Sequence< css::uno::Type> > SdTypesCache
 
 */
 
-class SD_DLLPUBLIC SdModule : public SfxModule, public SfxListener
+class SdModule : public SfxModule, public SfxListener
 {
 public:
                             TYPEINFO_OVERRIDE();
@@ -98,7 +98,7 @@ public:
     void                    GetState(SfxItemSet&);
 
     SdOptions*              GetSdOptions(DocumentType eDocType);
-    SvStorageStreamRef     GetOptionStream( const OUString& rOptionName, SdOptionStreamMode eMode );
+    SD_DLLPUBLIC SvStorageStreamRef     GetOptionStream( const OUString& rOptionName, SdOptionStreamMode eMode );
 
     bool                    GetWaterCan() const { return bWaterCan; }
     void                    SetWaterCan( bool bWC ) { bWaterCan = bWC; }
@@ -120,7 +120,7 @@ public:
     */
     OutputDevice* GetRefDevice (::sd::DrawDocShell& rDocShell);
 
-    SvNumberFormatter*     GetNumberFormatter();
+    SD_DLLPUBLIC SvNumberFormatter*     GetNumberFormatter();
 
     // virtual methods for the option dialog
     virtual SfxItemSet*  CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE;
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
index 4138c977522a..5a22993fd36f 100644
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
@@ -52,7 +52,7 @@ typedef ::cppu::ImplInheritanceHelper4< SfxStyleSheetPool,
                                         ::com::sun::star::container::XNameAccess,
                                         ::com::sun::star::lang::XComponent > SdStyleSheetPoolBase;
 
-class SD_DLLPUBLIC SdStyleSheetPool : public SdStyleSheetPoolBase, public SfxListener
+class SdStyleSheetPool : public SdStyleSheetPoolBase, public SfxListener
 {
     friend class SdDrawDocument;
 public:
@@ -74,7 +74,7 @@ public:
                             had to be created. This is used to assert errors in documents
                             when styles are missing.
     */
-    void                CreateLayoutStyleSheets(const OUString& rLayoutName, bool bCheck = false );
+    SD_DLLPUBLIC void                CreateLayoutStyleSheets(const OUString& rLayoutName, bool bCheck = false );
     void                CreateLayoutSheetNames(const OUString& rLayoutName, std::vector<OUString> &aNameList) const;
     void                CreateLayoutSheetList(const OUString& rLayoutName, SdStyleSheetVector& rLayoutSheets);
     void                CopyLayoutSheets(const OUString& rLayoutName, SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets );
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 264a65c38252..1b22016d93e2 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -82,7 +82,7 @@ public:
     void End();
 };
 
-class SD_DLLPUBLIC View : public FmFormView
+class View : public FmFormView
 {
 public:
     TYPEINFO_OVERRIDE();
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index fc96c1a92fd1..1b46129e1087 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -79,7 +79,7 @@ class ZoomList;
 
     <p>This class replaces the former ViewShell class.</p>
 */
-class SD_DLLPUBLIC ViewShell
+class ViewShell
     : public SfxShell
 {
 public:
@@ -149,11 +149,11 @@ public:
 
     inline ::sd::View* GetView() const { return mpView; }
     inline SdrView* GetDrawView() const;
-    DrawDocShell* GetDocSh() const;
+    SD_DLLPUBLIC DrawDocShell* GetDocSh() const;
 
     SdDrawDocument*  GetDoc() const;
 
-    SfxViewFrame* GetViewFrame() const;
+    SD_DLLPUBLIC SfxViewFrame* GetViewFrame() const;
 
     /** The active window is usually the mpContentWindow.  When there is a
         show running then the active window is a ShowWindow.
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index 3e127e66907c..6e3926b72b73 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -141,7 +141,7 @@ public:
 
 };
 
-class SW_DLLPUBLIC SwAuthorityField : public SwField
+class SwAuthorityField : public SwField
 {
     sal_IntPtr          m_nHandle;
     mutable sal_IntPtr  m_nTempSequencePos;
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 1b79e01f5bab..f49c491cb52e 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -66,7 +66,7 @@ SwContact* GetUserCall( const SdrObject* );
 bool IsMarqueeTextObj( const SdrObject& rObj );
 
 /// Base class for the following contact objects (frame + draw objects).
-class SW_DLLPUBLIC SwContact : public SdrObjUserCall, public SwClient
+class SwContact : public SdrObjUserCall, public SwClient
 {
     /** boolean, indicating destruction of contact object
      important note: boolean has to be set at the beginning of each destructor
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 93bad7840629..d9f82942ab88 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -129,7 +129,7 @@ enum SwJumpEditFormat
     JE_FMT_OLE
 };
 
-class SW_DLLPUBLIC SwPageNumberFieldType : public SwFieldType
+class SwPageNumberFieldType : public SwFieldType
 {
     sal_Int16   nNumberingType;
     bool            bVirtuell;
@@ -203,7 +203,7 @@ public:
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
 
-class SW_DLLPUBLIC SwFileNameFieldType : public SwFieldType
+class SwFileNameFieldType : public SwFieldType
 {
     SwDoc *pDoc;
 public:
@@ -230,7 +230,7 @@ public:
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
 
-class SW_DLLPUBLIC SwTemplNameFieldType : public SwFieldType
+class SwTemplNameFieldType : public SwFieldType
 {
     SwDoc *pDoc;
 public:
@@ -252,7 +252,7 @@ public:
 };
 
 // Document statistics
-class SW_DLLPUBLIC SwDocStatFieldType : public SwFieldType
+class SwDocStatFieldType : public SwFieldType
 {
     SwDoc*          pDoc;
     sal_Int16       nNumberingType; ///< com::sun::star::style::NumberingType
@@ -378,7 +378,7 @@ public:
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
 
-class SW_DLLPUBLIC SwMacroFieldType : public SwFieldType
+class SwMacroFieldType : public SwFieldType
 {
     SwDoc* pDoc;
 
@@ -426,7 +426,7 @@ public:
     static bool isScriptURL( const OUString& str );
 };
 
-class SW_DLLPUBLIC SwPostItFieldType : public SwFieldType
+class SwPostItFieldType : public SwFieldType
 {
 private:
     SwDoc* mpDoc;
@@ -489,7 +489,7 @@ public:
     virtual OUString    GetDescription() const SAL_OVERRIDE;
 };
 
-class SW_DLLPUBLIC SwDocInfoFieldType : public SwValueFieldType
+class SwDocInfoFieldType : public SwValueFieldType
 {
 public:
     SwDocInfoFieldType(SwDoc* pDc);
@@ -569,7 +569,7 @@ protected:
 };
 
 // Relative page numbering.
-class SW_DLLPUBLIC SwRefPageSetField : public SwField
+class SwRefPageSetField : public SwField
 {
     short   nOffset;
     bool    bOn;
@@ -672,7 +672,7 @@ public:
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
 };
 
-class SW_DLLPUBLIC SwScriptField : public SwField
+class SwScriptField : public SwField
 {
     OUString sType;  ///< Type of Code (Java/VBScript/...)
     OUString sCode;  /**< Code as text.
@@ -703,7 +703,7 @@ public:
 };
 
 // Combined Character Fieldtype
-class SW_DLLPUBLIC SwCombinedCharFieldType : public SwFieldType
+class SwCombinedCharFieldType : public SwFieldType
 {
 public:
     SwCombinedCharFieldType();
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index a1ad125c0cff..e58953cc7380 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -70,7 +70,7 @@ public:
     void Clear() { maData.clear(); }
 };
 
-class SW_DLLPUBLIC SwGetExpFieldType : public SwValueFieldType
+class SwGetExpFieldType : public SwValueFieldType
 {
 public:
         SwGetExpFieldType(SwDoc* pDoc);
@@ -280,7 +280,7 @@ inline bool SwSetExpField::GetInputFlag() const
 inline bool SwSetExpField::IsSequenceFld() const
     { return 0 != (nsSwGetSetExpType::GSE_SEQ & static_cast<SwSetExpFieldType*>(GetTyp())->GetType()); }
 
-class SW_DLLPUBLIC SwInputFieldType : public SwFieldType
+class SwInputFieldType : public SwFieldType
 {
     SwDoc* pDoc;
 public:
diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx
index 4dbcdf1bc872..2bfbec12cc6f 100644
--- a/sw/inc/flddat.hxx
+++ b/sw/inc/flddat.hxx
@@ -80,7 +80,7 @@ enum SwDateSubFormat
     DATE_VAR
 };
 
-class SW_DLLPUBLIC SwDateTimeFieldType : public SwValueFieldType
+class SwDateTimeFieldType : public SwValueFieldType
 {
 public:
         SwDateTimeFieldType(SwDoc* pDoc);
diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx
index 3032140302c9..4992d1e639e0 100644
--- a/sw/inc/flddropdown.hxx
+++ b/sw/inc/flddropdown.hxx
@@ -28,7 +28,7 @@
 /**
     Field type for dropdown boxes.
 */
-class SW_DLLPUBLIC SwDropDownFieldType : public SwFieldType
+class SwDropDownFieldType : public SwFieldType
 {
 public:
     /**
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index 16be2235539c..e7816237226c 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -23,7 +23,7 @@
 #include <format.hxx>
 #include <memory>
 
-class SW_DLLPUBLIC SwFmtAutoFmt: public SfxPoolItem
+class SwFmtAutoFmt: public SfxPoolItem
 {
     std::shared_ptr<SfxItemSet> mpHandle;
 
diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx
index 260b66067555..136038d69209 100644
--- a/sw/inc/fmtflcnt.hxx
+++ b/sw/inc/fmtflcnt.hxx
@@ -29,7 +29,7 @@ class SwTxtFlyCnt;
  *
  * A pool item that is attached to the placeholder character of an as-character frame. (TextFrame, etc.)
  */
-class SW_DLLPUBLIC SwFmtFlyCnt : public SfxPoolItem
+class SwFmtFlyCnt : public SfxPoolItem
 {
     friend class SwTxtFlyCnt;
     SwTxtFlyCnt* pTxtAttr;
diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index 0b30dddf3285..cfa8efd67d8f 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.hxx
@@ -33,7 +33,7 @@ class SwTxtRefMark;
 
 // ATT_REFMARK
 
-class SW_DLLPUBLIC SwFmtRefMark
+class SwFmtRefMark
     : public SfxPoolItem
     , public SwModify
 {
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index 9ab20dc54043..e79c23689211 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -60,7 +60,7 @@ public:
     void Insert(InsCaptionOpt* pObj);
 };
 
-class SW_DLLPUBLIC SwRevisionConfig : public utl::ConfigItem
+class SwRevisionConfig : public utl::ConfigItem
 {
     friend class SwModuleOptions;
 
@@ -86,7 +86,7 @@ public:
     void                    SetModified(){ConfigItem::SetModified();}
 };
 
-class SW_DLLPUBLIC SwCompareConfig : public utl::ConfigItem
+class SwCompareConfig : public utl::ConfigItem
 {
     friend class SwModuleOptions;
 
@@ -110,7 +110,7 @@ public:
     void            SetModified() {ConfigItem::SetModified(); }
 };
 
-class SW_DLLPUBLIC SwInsertConfig : public utl::ConfigItem
+class SwInsertConfig : public utl::ConfigItem
 {
     friend class SwModuleOptions;
 
@@ -138,7 +138,7 @@ public:
     void                    SetModified(){ConfigItem::SetModified();}
 };
 
-class SW_DLLPUBLIC SwTableConfig : public utl::ConfigItem
+class SwTableConfig : public utl::ConfigItem
 {
     friend class SwModuleOptions;
 
@@ -165,7 +165,7 @@ public:
     void                    SetModified(){ConfigItem::SetModified();}
 };
 
-class SW_DLLPUBLIC SwMiscConfig : public utl::ConfigItem
+class SwMiscConfig : public utl::ConfigItem
 {
     friend class SwModuleOptions;
 
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 78e5ab17aa82..843daebc5af5 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -291,7 +291,7 @@ private:
 };
 
 /// Starts a section of nodes in the document model.
-class SW_DLLPUBLIC SwStartNode: public SwNode
+class SwStartNode: public SwNode
 {
     friend class SwNode;
     friend class SwNodes;
@@ -521,7 +521,7 @@ private:
     SwTableNode & operator= ( const SwTableNode & rNode ) SAL_DELETED_FUNCTION;
 };
 
-class SW_DLLPUBLIC SwSectionNode
+class SwSectionNode
     : public SwStartNode
 {
     friend class SwNodes;
diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx
index 9e0e0df41ffe..740a561f6ba0 100644
--- a/sw/inc/reffld.hxx
+++ b/sw/inc/reffld.hxx
@@ -60,7 +60,7 @@ enum REFERENCEMARK
 
 /// Get reference.
 
-class SW_DLLPUBLIC SwGetRefFieldType : public SwFieldType
+class SwGetRefFieldType : public SwFieldType
 {
     SwDoc* pDoc;
 protected:
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index 639249400dce..867f269e2d7a 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -135,7 +135,7 @@ class SwTblBoxNumFormat;
 class SwTblBoxFormula;
 class SwTblBoxValue;
 
-class SW_DLLPUBLIC SwAttrPool : public SfxItemPool
+class SwAttrPool : public SfxItemPool
 {
 private:
     //UUUU helpers to add/rmove DrawingLayer ItemPool, used in constructor
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index 257540db315f..d8ccb02eded6 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -38,7 +38,7 @@
 class SfxItemPool;
 class SvXMLAttrContainerItem;
 
-class SW_DLLPUBLIC SwTxtAttr : private boost::noncopyable
+class SwTxtAttr : private boost::noncopyable
 {
 private:
     SfxPoolItem * const m_pAttr;
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index 9a53eb49ae02..fa40f76090d3 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -28,7 +28,7 @@
 class SwPaM;
 class SwTxtNode;
 
-class SW_DLLPUBLIC SwTxtFld : public virtual SwTxtAttr
+class SwTxtFld : public virtual SwTxtAttr
 {
     mutable OUString m_aExpand; // only used to determine, if field content is changing in <ExpandTxtFld()>
     SwTxtNode * m_pTxtNode;
diff --git a/sw/inc/txttxmrk.hxx b/sw/inc/txttxmrk.hxx
index a63aeaefbba8..6436b859f342 100644
--- a/sw/inc/txttxmrk.hxx
+++ b/sw/inc/txttxmrk.hxx
@@ -25,7 +25,7 @@ class SwTxtNode;
 class SwDoc;
 
 // Attribute for indices/tables of contents.
-class SW_DLLPUBLIC SwTxtTOXMark : public SwTxtAttrEnd
+class SwTxtTOXMark : public SwTxtAttrEnd
 {
     SwTxtNode * m_pTxtNode;
     sal_Int32 * m_pEnd;   // 0 if SwTOXMark without AlternativeText
diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx
index 2cdedef1150d..66aa05ab7c5f 100644
--- a/sw/inc/unocrsr.hxx
+++ b/sw/inc/unocrsr.hxx
@@ -22,7 +22,7 @@
 #include <swcrsr.hxx>
 #include <calbck.hxx>
 
-class SW_DLLPUBLIC SwUnoCrsr : public virtual SwCursor, public SwModify
+class SwUnoCrsr : public virtual SwCursor, public SwModify
 {
 private:
     bool m_bRemainInSection : 1;
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 602516ea98af..20c94039808a 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -289,7 +289,7 @@ struct SwRangeDescriptor
 };
 
 class SwTableProperties_Impl;
-class SW_DLLPUBLIC SwXTextTable : public cppu::WeakImplHelper
+class SwXTextTable : public cppu::WeakImplHelper
 <
     ::com::sun::star::text::XTextTable,
     ::com::sun::star::lang::XServiceInfo,
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index a673530b2a82..a96d366c596e 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -112,7 +112,7 @@ public:
                                     long* pX = 0, long* pY = 0 );
 };
 
-class SW_DLLPUBLIC SwShellCrsr : public virtual SwCursor, public SwSelPaintRects
+class SwShellCrsr : public virtual SwCursor, public SwSelPaintRects
 {
 private:
     // Document positions of start/end characters of a SSelection.
diff --git a/sw/source/uibase/inc/chldwrap.hxx b/sw/source/uibase/inc/chldwrap.hxx
index c705d419debb..d9b6574b099c 100644
--- a/sw/source/uibase/inc/chldwrap.hxx
+++ b/sw/source/uibase/inc/chldwrap.hxx
@@ -24,7 +24,7 @@
 
 class SwDocShell;
 
-class SW_DLLPUBLIC SwChildWinWrapper : public SfxChildWindow
+class SwChildWinWrapper : public SfxChildWindow
 {
     Timer       m_aUpdateTimer;
     SwDocShell* m_pDocSh;
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index 800f553ce4d5..b33a4518b625 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -43,7 +43,7 @@ class SvtAccessibilityOptions;
 class SwPagePreviewLayout;
 
 // Delete member <mnVirtPage> and its accessor
-class SW_DLLPUBLIC SwPagePreviewWin : public vcl::Window
+class SwPagePreviewWin : public vcl::Window
 {
     SwViewShell*          mpViewShell;
     sal_uInt16              mnSttPage;