diff options
| author | Noel Grandin <noel@peralex.com> | 2014-07-04 10:31:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-07-04 11:49:09 +0200 |
| commit | dfeef9e970a69c5736a54619b96607899c57e9a1 (patch) | |
| tree | 1ba1ea08de763d23e08bd967387ca6633fc79875 /sw/inc | |
| parent | da36ded02c67bb7481cd4378ce5f7d779c1a3533 (diff) | |
remove unnecessary header macro wizardry
using the #define SW_DECL_SWSERVEROBJECT_DEFINED to turn typedefs
on and off. Rather just use SvRef<T> everywhere, like we do for
other reference types.
Change-Id: Id939c46c5861cd7440b66c5a84122f900ddb882c
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/section.hxx | 7 | ||||
| -rw-r--r-- | sw/inc/swserv.hxx | 5 | ||||
| -rw-r--r-- | sw/inc/swtable.hxx | 7 |
3 files changed, 2 insertions, 17 deletions
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index c87563812418..ba343599dd99 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -40,12 +40,7 @@ class SwDoc; class SwSection; class SwSectionNode; class SwTOXBase; - -#ifndef SW_DECL_SWSERVEROBJECT_DEFINED -#define SW_DECL_SWSERVEROBJECT_DEFINED class SwServerObject; -typedef tools::SvRef<SwServerObject> SwServerObjectRef; -#endif typedef std::vector<SwSection*> SwSections; @@ -154,7 +149,7 @@ class SW_DLLPUBLIC SwSection private: mutable SwSectionData m_Data; - SwServerObjectRef m_RefObj; // Set if DataServer. + tools::SvRef<SwServerObject> m_RefObj; // Set if DataServer. ::sfx2::SvBaseLinkRef m_RefLink; SAL_DLLPRIVATE void ImplSetHiddenFlag( diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx index fa74018084d9..f483342ade5d 100644 --- a/sw/inc/swserv.hxx +++ b/sw/inc/swserv.hxx @@ -76,11 +76,6 @@ public: void SetDdeBookmark( ::sw::mark::IMark& rBookmark); }; -#ifndef SW_DECL_SWSERVEROBJECT_DEFINED -#define SW_DECL_SWSERVEROBJECT_DEFINED -typedef tools::SvRef<SwServerObject> SwServerObjectRef; -#endif - #endif // INCLUDED_SW_INC_SWSERV_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index cda293b94632..6ac05e0af07e 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -58,12 +58,7 @@ class SwUndoTblCpyTbl; class SwBoxSelection; struct SwSaveRowSpan; struct Parm; - -#ifndef SW_DECL_SWSERVEROBJECT_DEFINED -#define SW_DECL_SWSERVEROBJECT_DEFINED class SwServerObject; -typedef tools::SvRef<SwServerObject> SwServerObjectRef; -#endif class SwTableLines : public std::vector<SwTableLine*> { public: @@ -99,7 +94,7 @@ class SW_DLLPUBLIC SwTable: public SwClient //Client of FrmFmt. protected: SwTableLines aLines; SwTableSortBoxes m_TabSortContentBoxes; - SwServerObjectRef refObj; // In case DataServer -> pointer is set. + tools::SvRef<SwServerObject> refObj; // In case DataServer -> pointer is set. SwHTMLTableLayout *pHTMLLayout; |