diff options
author | David Tardon <dtardon@redhat.com> | 2015-04-16 10:01:37 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2015-04-16 10:02:17 +0200 |
commit | 565716b0abca281dfc1291aedf4497f55611b6b1 (patch) | |
tree | 7aa0296c20fcc596216f47415621bfa257d08971 /sw/inc | |
parent | cfaccff5aa7be7e240e51c6661ee09812b1aa113 (diff) |
Revert "make more classes dllpublic"
This reverts commit add2ca7b3ab10ed9d18e60d8e50020168d922836.
It causes too much breakage on windows. It is better to start again from
scratch.
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/authfld.hxx | 2 | ||||
-rw-r--r-- | sw/inc/dcontact.hxx | 2 | ||||
-rw-r--r-- | sw/inc/docufld.hxx | 20 | ||||
-rw-r--r-- | sw/inc/expfld.hxx | 4 | ||||
-rw-r--r-- | sw/inc/flddat.hxx | 2 | ||||
-rw-r--r-- | sw/inc/flddropdown.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtautofmt.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtflcnt.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtrfmrk.hxx | 2 | ||||
-rw-r--r-- | sw/inc/modcfg.hxx | 10 | ||||
-rw-r--r-- | sw/inc/node.hxx | 4 | ||||
-rw-r--r-- | sw/inc/reffld.hxx | 2 | ||||
-rw-r--r-- | sw/inc/swatrset.hxx | 2 | ||||
-rw-r--r-- | sw/inc/txatbase.hxx | 2 | ||||
-rw-r--r-- | sw/inc/txtfld.hxx | 2 | ||||
-rw-r--r-- | sw/inc/txttxmrk.hxx | 2 | ||||
-rw-r--r-- | sw/inc/unocrsr.hxx | 2 | ||||
-rw-r--r-- | sw/inc/unotbl.hxx | 2 | ||||
-rw-r--r-- | sw/inc/viscrs.hxx | 2 |
19 files changed, 34 insertions, 34 deletions
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. |