diff options
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/dbmgr.hxx | 2 | ||||
-rw-r--r-- | sw/inc/doc.hxx | 2 | ||||
-rw-r--r-- | sw/inc/docary.hxx | 27 | ||||
-rw-r--r-- | sw/inc/edglbldc.hxx | 2 | ||||
-rw-r--r-- | sw/inc/edimp.hxx | 2 | ||||
-rw-r--r-- | sw/inc/editsh.hxx | 2 | ||||
-rw-r--r-- | sw/inc/expfld.hxx | 4 | ||||
-rw-r--r-- | sw/inc/flypos.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtclds.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtcol.hxx | 6 | ||||
-rw-r--r-- | sw/inc/ftnidx.hxx | 4 | ||||
-rw-r--r-- | sw/inc/modcfg.hxx | 2 | ||||
-rw-r--r-- | sw/inc/ndarr.hxx | 2 | ||||
-rw-r--r-- | sw/inc/ndhints.hxx | 4 | ||||
-rw-r--r-- | sw/inc/rubylist.hxx | 2 | ||||
-rw-r--r-- | sw/inc/section.hxx | 2 | ||||
-rw-r--r-- | sw/inc/sortopt.hxx | 2 | ||||
-rw-r--r-- | sw/inc/swregion.hxx | 5 | ||||
-rw-r--r-- | sw/inc/swtable.hxx | 6 | ||||
-rw-r--r-- | sw/inc/tblafmt.hxx | 2 | ||||
-rw-r--r-- | sw/inc/tblsel.hxx | 12 | ||||
-rw-r--r-- | sw/inc/tox.hxx | 2 | ||||
-rw-r--r-- | sw/inc/unoevtlstnr.hxx | 2 | ||||
-rw-r--r-- | sw/inc/unotxdoc.hxx | 2 |
24 files changed, 49 insertions, 51 deletions
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 3c16000c5f89..47da13e48fea 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -145,7 +145,7 @@ struct SwDSParam : public SwDBData } }; typedef SwDSParam* SwDSParamPtr; -SV_DECL_PTRARR_DEL(SwDSParamArr, SwDSParamPtr, 0, 5) +SV_DECL_PTRARR_DEL(SwDSParamArr, SwDSParamPtr, 0) struct SwMergeDescriptor { diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index edf59c301851..8fb1c1b376a6 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -241,7 +241,7 @@ namespace sfx2 { // PageDescriptor-interface, Array because of inlines. typedef SwPageDesc* SwPageDescPtr; -SV_DECL_PTRARR_DEL( SwPageDescs, SwPageDescPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( SwPageDescs, SwPageDescPtr, 4 ) // forward declaration void SetAllScriptItem( SfxItemSet& rSet, const SfxPoolItem& rItem ); diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index 94374909b8e0..ab10e5bfe189 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -49,42 +49,41 @@ namespace com { namespace sun { namespace star { namespace i18n { #include <svl/svarray.hxx> typedef SwFieldType* SwFldTypePtr; -#define GROW_FLDTYPES 16 // PageDescriptor-interface // typedef SwPageDesc * SwPageDescPtr; -// SV_DECL_PTRARR_DEL(SwPageDescs, SwPageDescPtr,1,1); +// SV_DECL_PTRARR_DEL(SwPageDescs, SwPageDescPtr,1); typedef SwFrmFmt* SwFrmFmtPtr; -SV_DECL_PTRARR_DEL(SwFrmFmts,SwFrmFmtPtr,4,4) +SV_DECL_PTRARR_DEL(SwFrmFmts,SwFrmFmtPtr,4) // Specific frame formats (frames, DrawObjects). -SV_DECL_PTRARR_DEL(SwSpzFrmFmts,SwFrmFmtPtr,0,4) +SV_DECL_PTRARR_DEL(SwSpzFrmFmts,SwFrmFmtPtr,0) typedef SwCharFmt* SwCharFmtPtr; -SV_DECL_PTRARR_DEL(SwCharFmts,SwCharFmtPtr,4,4) +SV_DECL_PTRARR_DEL(SwCharFmts,SwCharFmtPtr,4) -SV_DECL_PTRARR_DEL( SwFldTypes, SwFldTypePtr, INIT_FLDTYPES, GROW_FLDTYPES ) +SV_DECL_PTRARR_DEL( SwFldTypes, SwFldTypePtr, INIT_FLDTYPES ) typedef SwTOXType* SwTOXTypePtr; -SV_DECL_PTRARR_DEL( SwTOXTypes, SwTOXTypePtr, 0, 1 ) +SV_DECL_PTRARR_DEL( SwTOXTypes, SwTOXTypePtr, 0 ) // Array of Undo-history. typedef SwSectionFmt* SwSectionFmtPtr; -SV_DECL_PTRARR_DEL(SwSectionFmts,SwSectionFmtPtr,0,4) +SV_DECL_PTRARR_DEL(SwSectionFmts,SwSectionFmtPtr,0) typedef SwNumRule* SwNumRulePtr; -SV_DECL_PTRARR_DEL_VISIBILITY( SwNumRuleTbl, SwNumRulePtr, 0, 5, SW_DLLPUBLIC ) +SV_DECL_PTRARR_DEL_VISIBILITY( SwNumRuleTbl, SwNumRulePtr, 0, SW_DLLPUBLIC ) typedef SwRedline* SwRedlinePtr; -SV_DECL_PTRARR_SORT_DEL( _SwRedlineTbl, SwRedlinePtr, 0, 16 ) +SV_DECL_PTRARR_SORT_DEL( _SwRedlineTbl, SwRedlinePtr, 0 ) class SwRedlineTbl : private _SwRedlineTbl { public: - SwRedlineTbl( sal_uInt8 nSize = 0, sal_uInt8 nG = 16 ) - : _SwRedlineTbl( nSize, nG ) {} + SwRedlineTbl( sal_uInt8 nSize = 0 ) + : _SwRedlineTbl( nSize ) {} ~SwRedlineTbl() {} sal_Bool SavePtrInArr( SwRedlinePtr p ) { return _SwRedlineTbl::Insert( p ); } @@ -114,10 +113,10 @@ public: }; typedef SwUnoCrsr* SwUnoCrsrPtr; -SV_DECL_PTRARR_DEL( SwUnoCrsrTbl, SwUnoCrsrPtr, 0, 4 ) +SV_DECL_PTRARR_DEL( SwUnoCrsrTbl, SwUnoCrsrPtr, 0 ) typedef SwOLENode* SwOLENodePtr; -SV_DECL_PTRARR(SwOLENodes,SwOLENodePtr,16,16) +SV_DECL_PTRARR(SwOLENodes,SwOLENodePtr,16) #endif //_DOCARY_HXX diff --git a/sw/inc/edglbldc.hxx b/sw/inc/edglbldc.hxx index ef46ae19bb42..3ebf359d8814 100644 --- a/sw/inc/edglbldc.hxx +++ b/sw/inc/edglbldc.hxx @@ -71,7 +71,7 @@ public: typedef SwGlblDocContent* SwGlblDocContentPtr; -SV_DECL_PTRARR_SORT_DEL( SwGlblDocContents, SwGlblDocContentPtr, 10, 10 ) +SV_DECL_PTRARR_SORT_DEL( SwGlblDocContents, SwGlblDocContentPtr, 10 ) diff --git a/sw/inc/edimp.hxx b/sw/inc/edimp.hxx index 8fc4f8fe2f20..18c21067f14a 100644 --- a/sw/inc/edimp.hxx +++ b/sw/inc/edimp.hxx @@ -62,7 +62,7 @@ struct SwPamRange { return nStart < rRg.nStart ? sal_True : sal_False; } }; -SV_DECL_VARARR_SORT( _SwPamRanges, SwPamRange, 0, 1 ) +SV_DECL_VARARR_SORT( _SwPamRanges, SwPamRange, 0 ) class SwPamRanges : private _SwPamRanges { diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index f374987dba9d..a16330a8f6f4 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -139,7 +139,7 @@ struct SwGetINetAttr : sText( rTxt ), rINetAttr( rAttr ) {} }; -SV_DECL_PTRARR_DEL( SwGetINetAttrs, SwGetINetAttr*, 0, 5 ) +SV_DECL_PTRARR_DEL( SwGetINetAttrs, SwGetINetAttr*, 0 ) // Types of forms of content. #define CNT_TXT 0x0001 diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index a565244b89ba..d3679e84ef18 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -58,12 +58,12 @@ struct _SeqFldLstElem : sDlgEntry( rStr ), nSeqNo( nNo ) {} }; -SV_DECL_PTRARR_DEL( _SwSeqFldList, _SeqFldLstElem*, 10, 10 ) +SV_DECL_PTRARR_DEL( _SwSeqFldList, _SeqFldLstElem*, 10 ) class SW_DLLPUBLIC SwSeqFldList : public _SwSeqFldList { public: - SwSeqFldList() : _SwSeqFldList( 10, 10 ) {} + SwSeqFldList() : _SwSeqFldList( 10 ) {} sal_Bool InsertSort( _SeqFldLstElem* ); sal_Bool SeekEntry( const _SeqFldLstElem& , sal_uInt16* pPos = 0 ); diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx index 9640afb8a675..5e88a69cd1c7 100644 --- a/sw/inc/flypos.hxx +++ b/sw/inc/flypos.hxx @@ -56,7 +56,7 @@ public: }; typedef SwPosFlyFrm* SwPosFlyFrmPtr; -SV_DECL_PTRARR_SORT_VISIBILITY( SwPosFlyFrms, SwPosFlyFrmPtr, 0, 40, SW_DLLPUBLIC ) +SV_DECL_PTRARR_SORT_VISIBILITY( SwPosFlyFrms, SwPosFlyFrmPtr, 0, SW_DLLPUBLIC ) #endif // _FLYPOS_HXX diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index c0cdd0c7279f..7e1cc64eb8e2 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -66,7 +66,7 @@ public: }; typedef SwColumn* SwColumnPtr; -SV_DECL_PTRARR_DEL( SwColumns, SwColumnPtr, 0, 2 ) +SV_DECL_PTRARR_DEL( SwColumns, SwColumnPtr, 0 ) enum SwColLineAdj { diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 95b4af9faf41..16db7c64f1b9 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -154,7 +154,7 @@ public: }; typedef SwTxtFmtColl* SwTxtFmtCollPtr; -SV_DECL_PTRARR(SwTxtFmtColls,SwTxtFmtCollPtr,2,4) +SV_DECL_PTRARR(SwTxtFmtColls,SwTxtFmtCollPtr,2) class SwGrfFmtColl: public SwFmtColl { @@ -177,7 +177,7 @@ public: }; typedef SwGrfFmtColl* SwGrfFmtCollPtr; -SV_DECL_PTRARR(SwGrfFmtColls,SwGrfFmtCollPtr,2,4) +SV_DECL_PTRARR(SwGrfFmtColls,SwGrfFmtCollPtr,2) // FEATURE::CONDCOLL // Conditional styles. @@ -237,7 +237,7 @@ public: }; typedef SwCollCondition* SwCollConditionPtr; -SV_DECL_PTRARR_DEL( SwFmtCollConditions, SwCollConditionPtr, 0, 5 ) +SV_DECL_PTRARR_DEL( SwFmtCollConditions, SwCollConditionPtr, 0 ) class SW_DLLPUBLIC SwConditionTxtFmtColl : public SwTxtFmtColl { diff --git a/sw/inc/ftnidx.hxx b/sw/inc/ftnidx.hxx index d3ae3c8ca764..055d6d54921d 100644 --- a/sw/inc/ftnidx.hxx +++ b/sw/inc/ftnidx.hxx @@ -42,7 +42,7 @@ class SwSectionNode; typedef SwTxtFtn* SwTxtFtnPtr; -SV_DECL_PTRARR_SORT( _SwFtnIdxs, SwTxtFtnPtr, 0, 10 ) +SV_DECL_PTRARR_SORT( _SwFtnIdxs, SwTxtFtnPtr, 0 ) class SwFtnIdxs : public _SwFtnIdxs { @@ -62,7 +62,7 @@ class SwUpdFtnEndNtAtEnd std::vector<sal_uInt16> aFtnNums, aEndNums; public: - SwUpdFtnEndNtAtEnd() : aFtnSects( 0, 4 ), aEndSects( 0, 4 ) {} + SwUpdFtnEndNtAtEnd() : aFtnSects( 0 ), aEndSects( 0 ) {} static const SwSectionNode* FindSectNdWithEndAttr( const SwTxtFtn& rTxtFtn ); diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index b1fb71325b07..37bcc839aca7 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -44,7 +44,7 @@ class SwModuleOptions; class InsCaptionOpt; typedef InsCaptionOpt* InsCaptionOptPtr; -SV_DECL_PTRARR_SORT_DEL(InsCapOptArr, InsCaptionOptPtr, 0, 5) +SV_DECL_PTRARR_SORT_DEL(InsCapOptArr, InsCaptionOptPtr, 0) class InsCaptionOptArr : public InsCapOptArr { diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index d560637b4ae5..22c52ee337be 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -84,7 +84,7 @@ struct SwPosition; typedef SwNode * SwNodePtr; typedef sal_Bool (*FnForEach_SwNodes)( const SwNodePtr&, void* pArgs ); -SV_DECL_PTRARR_SORT( SwOutlineNodes, SwNodePtr, 0, 10 ) +SV_DECL_PTRARR_SORT( SwOutlineNodes, SwNodePtr, 0 ) class SW_DLLPUBLIC SwNodes : private BigPtrArray diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx index 8496aa015e91..6f0d896f7e46 100644 --- a/sw/inc/ndhints.hxx +++ b/sw/inc/ndhints.hxx @@ -72,8 +72,8 @@ MakeRedlineTxtAttr( SwDoc & rDoc, SfxPoolItem& rAttr ); // Class SwpHtStart/End -SV_DECL_PTRARR_SORT(SwpHtStart,SwTxtAttr*,1,1) -SV_DECL_PTRARR_SORT(SwpHtEnd,SwTxtAttr*,1,1) +SV_DECL_PTRARR_SORT(SwpHtStart,SwTxtAttr*,1) +SV_DECL_PTRARR_SORT(SwpHtEnd,SwTxtAttr*,1) // Class SwpHintsArr diff --git a/sw/inc/rubylist.hxx b/sw/inc/rubylist.hxx index baf5faf6cdbf..414d57c8e80d 100644 --- a/sw/inc/rubylist.hxx +++ b/sw/inc/rubylist.hxx @@ -49,7 +49,7 @@ public: }; typedef SwRubyListEntry* SwRubyListEntryPtr; -SV_DECL_PTRARR_DEL( SwRubyList, SwRubyListEntryPtr, 0, 32 ) +SV_DECL_PTRARR_DEL( SwRubyList, SwRubyListEntryPtr, 0 ) #endif //_RUBYLIST_HXX diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index 9a6452a424fd..89bb7423705c 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -59,7 +59,7 @@ class SwTOXBase; SV_DECL_REF( SwServerObject ) #endif -SV_DECL_PTRARR( SwSections, SwSection*, 0, 4 ) +SV_DECL_PTRARR( SwSections, SwSection*, 0 ) enum SectionType { CONTENT_SECTION, TOX_HEADER_SECTION, diff --git a/sw/inc/sortopt.hxx b/sw/inc/sortopt.hxx index 6436e0feaffa..35e5982d52a3 100644 --- a/sw/inc/sortopt.hxx +++ b/sw/inc/sortopt.hxx @@ -49,7 +49,7 @@ struct SW_DLLPUBLIC SwSortKey sal_Bool bIsNumeric; }; -SV_DECL_PTRARR(SwSortKeys, SwSortKey*, 3, 1) +SV_DECL_PTRARR(SwSortKeys, SwSortKey*, 3) struct SW_DLLPUBLIC SwSortOptions { diff --git a/sw/inc/swregion.hxx b/sw/inc/swregion.hxx index 392b9086050e..b0f63f805e74 100644 --- a/sw/inc/swregion.hxx +++ b/sw/inc/swregion.hxx @@ -32,7 +32,7 @@ #include "swrect.hxx" -SV_DECL_VARARR( SwRects, SwRect, 20, 8 ) +SV_DECL_VARARR( SwRects, SwRect, 20 ) class SwRegionRects : public SwRects { @@ -41,8 +41,7 @@ class SwRegionRects : public SwRects inline void InsertRect( const SwRect &rRect, const sal_uInt16 nPos, sal_Bool &rDel); public: - SwRegionRects( const SwRect& rStartRect, sal_uInt16 nInit = 20, - sal_uInt16 nGrow = 8 ); + SwRegionRects( const SwRect& rStartRect, sal_uInt16 nInit = 20 ); // For punching from aOrigin. void operator-=( const SwRect& rRect ); diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index fb1d253b3879..e97de4260cee 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -72,13 +72,13 @@ struct Parm; SV_DECL_REF( SwServerObject ) #endif -SV_DECL_PTRARR_DEL(SwTableLines, SwTableLine*, 10, 20) -SV_DECL_PTRARR_DEL(SwTableBoxes, SwTableBox*, 25, 50) +SV_DECL_PTRARR_DEL(SwTableLines, SwTableLine*, 10) +SV_DECL_PTRARR_DEL(SwTableBoxes, SwTableBox*, 25) // Save content-bearing box-pointers additionally in a sorted array // (for calculation in table). typedef SwTableBox* SwTableBoxPtr; -SV_DECL_PTRARR_SORT( SwTableSortBoxes, SwTableBoxPtr, 25, 50 ) +SV_DECL_PTRARR_SORT( SwTableSortBoxes, SwTableBoxPtr, 25 ) typedef SwTableLine* SwTableLinePtr; class SW_DLLPUBLIC SwTable: public SwClient //Client of FrmFmt. diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx index 574280a652f3..6ab318a27439 100644 --- a/sw/inc/tblafmt.hxx +++ b/sw/inc/tblafmt.hxx @@ -245,7 +245,7 @@ public: }; typedef SwTableAutoFmt* SwTableAutoFmtPtr ; -SV_DECL_PTRARR_DEL( _SwTableAutoFmtTbl, SwTableAutoFmtPtr, 1, 5 ) +SV_DECL_PTRARR_DEL( _SwTableAutoFmtTbl, SwTableAutoFmtPtr, 1 ) class SW_DLLPUBLIC SwTableAutoFmtTbl : public _SwTableAutoFmtTbl { diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx index 668988aff351..5ecc65b8df12 100644 --- a/sw/inc/tblsel.hxx +++ b/sw/inc/tblsel.hxx @@ -49,7 +49,7 @@ class SwTable; class SwUndoTblMerge; class SwCellFrm; -SV_DECL_PTRARR( SwCellFrms, SwCellFrm*, 16, 16 ) +SV_DECL_PTRARR( SwCellFrms, SwCellFrm*, 16 ) class SwSelBoxes : private std::map<sal_uLong, SwTableBox*> @@ -128,8 +128,8 @@ sal_Bool GetAutoSumSel( const SwCrsrShell&, SwCellFrms& ); sal_Bool HasProtectedCells( const SwSelBoxes& rBoxes ); // Check if selection is balanced. -SV_DECL_PTRARR( SwChartBoxes, SwTableBoxPtr, 16, 16) -SV_DECL_PTRARR_DEL( SwChartLines, SwChartBoxes*, 25, 50) +SV_DECL_PTRARR( SwChartBoxes, SwTableBoxPtr, 16) +SV_DECL_PTRARR_DEL( SwChartLines, SwChartBoxes*, 25 ) sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd, SwChartLines* pGetCLines = 0 ); @@ -174,7 +174,7 @@ public: SwTabFrm *GetTable() { return pTable; } }; -SV_DECL_PTRARR_DEL( SwSelUnions, SwSelUnion*, 10, 20 ) +SV_DECL_PTRARR_DEL( SwSelUnions, SwSelUnion*, 10 ) // Gets the tables involved in a table selection and the union-rectangles of the selections // - also for split tables. @@ -192,8 +192,8 @@ void MakeSelUnions( SwSelUnions&, const SwLayoutFrm *pStart, class _FndBox; class _FndLine; -SV_DECL_PTRARR_DEL( _FndBoxes, _FndBox*, 10, 20 ) -SV_DECL_PTRARR_DEL( _FndLines, _FndLine*,10, 20 ) +SV_DECL_PTRARR_DEL( _FndBoxes, _FndBox*, 10 ) +SV_DECL_PTRARR_DEL( _FndLines, _FndLine*,10 ) class _FndBox { diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 1729cb93945d..171ce842f6a2 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -57,7 +57,7 @@ class SwTOXMark; class SwTxtTOXMark; class SwDoc; -SV_DECL_PTRARR(SwTOXMarks, SwTOXMark*, 0, 10) +SV_DECL_PTRARR(SwTOXMarks, SwTOXMark*, 0) /*-------------------------------------------------------------------- Description: Entry of content index, alphabetical index or user defined index diff --git a/sw/inc/unoevtlstnr.hxx b/sw/inc/unoevtlstnr.hxx index fff19f686126..8db97ebe2ec6 100644 --- a/sw/inc/unoevtlstnr.hxx +++ b/sw/inc/unoevtlstnr.hxx @@ -41,7 +41,7 @@ namespace com{namespace sun{namespace star{ // Managing the EventListeners. typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > * XEventListenerPtr; -SV_DECL_PTRARR(SwEvtLstnrArray, XEventListenerPtr, 4, 4) +SV_DECL_PTRARR(SwEvtLstnrArray, XEventListenerPtr, 4) class SwEventListenerContainer { diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 42d646f26b0a..5aef8c46e7c5 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -134,7 +134,7 @@ class SwRenderData; class ViewShell; typedef UnoActionContext* UnoActionContextPtr; -SV_DECL_PTRARR(ActionContextArr, UnoActionContextPtr, 4, 4) +SV_DECL_PTRARR(ActionContextArr, UnoActionContextPtr, 4) /****************************************************************************** |