diff options
Diffstat (limited to 'sw')
119 files changed, 230 insertions, 234 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) /****************************************************************************** diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx index 1eebe328022b..78e296047a69 100644 --- a/sw/source/core/bastyp/swcache.cxx +++ b/sw/source/core/bastyp/swcache.cxx @@ -90,12 +90,12 @@ void SwCache::Check() |*************************************************************************/ -SwCache::SwCache( const sal_uInt16 nInitSize, const sal_uInt16 nGrowSize +SwCache::SwCache( const sal_uInt16 nInitSize #ifdef DBG_UTIL , const rtl::OString &rNm #endif ) : - SwCacheObjArr( (sal_uInt8)nInitSize, (sal_uInt8)nGrowSize ), + SwCacheObjArr( (sal_uInt8)nInitSize ), pRealFirst( 0 ), pFirst( 0 ), pLast( 0 ), diff --git a/sw/source/core/bastyp/swregion.cxx b/sw/source/core/bastyp/swregion.cxx index e6c423cb725c..89b87e292a9c 100644 --- a/sw/source/core/bastyp/swregion.cxx +++ b/sw/source/core/bastyp/swregion.cxx @@ -38,9 +38,8 @@ SV_IMPL_VARARR( SwRects, SwRect ); |* SwRegionRects::SwRegionRects() |*************************************************************************/ -SwRegionRects::SwRegionRects( const SwRect &rStartRect, sal_uInt16 nInit, - sal_uInt16 nGrow ) : - SwRects( (sal_uInt8)nInit, (sal_uInt8)nGrow ), +SwRegionRects::SwRegionRects( const SwRect &rStartRect, sal_uInt16 nInit ) : + SwRects( (sal_uInt8)nInit ), aOrigin( rStartRect ) { Insert( aOrigin, 0 ); diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx index e88eda064ea6..2febc4b23ee0 100644 --- a/sw/source/core/crsr/findattr.cxx +++ b/sw/source/core/crsr/findattr.cxx @@ -57,7 +57,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; -SV_DECL_PTRARR_SORT( SwpFmts, SwFmt*, 0, 4 ) +SV_DECL_PTRARR_SORT( SwpFmts, SwFmt*, 0 ) SV_IMPL_PTRARR_SORT( SwpFmts, SwFmt* ) // Sonderbehandlung fuer SvxFontItem, nur den Namen vergleichen: diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx index c9d3aab4716e..79c563c12664 100644 --- a/sw/source/core/doc/acmplwrd.cxx +++ b/sw/source/core/doc/acmplwrd.cxx @@ -228,7 +228,7 @@ sal_Bool SwAutoCompleteString::RemoveDocument(const SwDoc& rDoc) } SwAutoCompleteWord::SwAutoCompleteWord( sal_uInt16 nWords, sal_uInt16 nMWrdLen ) - : aWordLst( 0, 255 ), aLRULst( 0, 255 ), + : aWordLst( 0 ), aLRULst( 0 ), pImpl(new SwAutoCompleteWord_Impl(*this)), nMaxCount( nWords ), nMinWrdLen( nMWrdLen ), diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 2ff6e81c2dd8..26a2ad86f9f6 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -161,7 +161,7 @@ struct _SaveRedline } }; -SV_DECL_PTRARR_DEL( _SaveRedlines, _SaveRedline*, 0, 4 ) +SV_DECL_PTRARR_DEL( _SaveRedlines, _SaveRedline*, 0 ) SV_IMPL_VARARR( _SaveFlyArr, _SaveFly ) SV_IMPL_PTRARR( _SaveRedlines, _SaveRedline* ) @@ -677,7 +677,7 @@ _SaveRedlEndPosForRestore::_SaveRedlEndPosForRestore( const SwNodeIndex& rInsIdx { if( !pSavArr ) { - pSavArr = new SvPtrarr( 2, 2 ); + pSavArr = new SvPtrarr( 2 ); pSavIdx = new SwNodeIndex( rInsIdx, -1 ); } void* p = (void*)pEnd; @@ -881,7 +881,7 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags ) _SaveFlyInRange( rPaM, rPos.nNode, aSaveFlyArr, 0 != ( DOC_MOVEALLFLYS & eMvFlags ) ); // save redlines (if DOC_MOVEREDLINES is used) - _SaveRedlines aSaveRedl( 0, 4 ); + _SaveRedlines aSaveRedl( 0 ); if( DOC_MOVEREDLINES & eMvFlags && GetRedlineTbl().Count() ) { lcl_SaveRedlines( rPaM, aSaveRedl ); @@ -1130,8 +1130,8 @@ bool SwDoc::MoveNodeRange( SwNodeRange& rRange, SwNodeIndex& rPos, GetFtnIdxs(), aTmpFntIdx ); } - _SaveRedlines aSaveRedl( 0, 4 ); - SvPtrarr aSavRedlInsPosArr( 0, 4 ); + _SaveRedlines aSaveRedl( 0 ); + SvPtrarr aSavRedlInsPosArr( 0 ); if( DOC_MOVEREDLINES & eMvFlags && GetRedlineTbl().Count() ) { lcl_SaveRedlines( rRange, aSaveRedl ); diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index cb7aa3780f37..69a8a045b93d 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -2168,7 +2168,7 @@ void SwDocUpdtFld::InsDelFldInFldLst( sal_Bool bIns, const SwTxtFld& rFld ) { if( !bIns ) // if list is present and deleted return; // don't do a thing - pFldSortLst = new _SetGetExpFlds( 64, 16 ); + pFldSortLst = new _SetGetExpFlds( 64 ); } if( bIns ) // insert anew: @@ -2195,7 +2195,7 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode ) { // new version: walk all fields of the attribute pool delete pFldSortLst; - pFldSortLst = new _SetGetExpFlds( 64, 16 ); + pFldSortLst = new _SetGetExpFlds( 64 ); /// consider and unhide sections /// with hide condition, only in mode GETFLD_ALL (<eGetMode == GETFLD_ALL>) diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx index bc7c6a9095d7..be89526e3047 100644 --- a/sw/source/core/doc/docglbl.cxx +++ b/sw/source/core/doc/docglbl.cxx @@ -176,7 +176,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, bool bOutline, c // If it isn't a OutlineNumbering, then use an own array and collect the Nodes. if( pSplitColl->GetAttrOutlineLevel() == 0 )//<-end,zhaojianwei, 0814 { - pOutlNds = new SwOutlineNodes( 8, 8 ); + pOutlNds = new SwOutlineNodes( 8 ); SwIterator<SwTxtNode,SwFmtColl> aIter( *pSplitColl ); for( SwTxtNode* pTNd = aIter.First(); pTNd; pTNd = aIter.Next() ) if( pTNd->GetNodes().IsDocNodes() ) diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index fb78a4ff1f01..17264ca8f92d 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -2048,7 +2048,7 @@ void SwDoc::SetAllUniqueFlyNames() if( 255 < ( n = GetSpzFrmFmts()->Count() )) n = 255; - SwSpzFrmFmts aArr( (sal_Int8)n, 10 ); + SwSpzFrmFmts aArr( (sal_Int8)n ); SwFrmFmtPtr pFlyFmt; sal_Bool bLoadedFlag = sal_True; // something for the Layout diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 21194b148fe3..d3e1ad526c61 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -252,7 +252,7 @@ SwDoc::SwDoc() maListStyleLists(), pRedlineTbl( new SwRedlineTbl ), pAutoFmtRedlnComment( 0 ), - pUnoCrsrTbl( new SwUnoCrsrTbl( 0, 16 ) ), + pUnoCrsrTbl( new SwUnoCrsrTbl( 0 ) ), pPgPViewPrtData( 0 ), pExtInputRing( 0 ), pLayouter( 0 ), diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index 243964c3474f..ae671ba0e066 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -3547,7 +3547,7 @@ void SwRedline::MoveFromSection() { SwDoc* pDoc = GetDoc(); const SwRedlineTbl& rTbl = pDoc->GetRedlineTbl(); - SvPtrarr aBeforeArr( 16, 16 ), aBehindArr( 16, 16 ); + SvPtrarr aBeforeArr( 16 ), aBehindArr( 16 ); sal_uInt16 nMyPos = rTbl.GetPos( this ); OSL_ENSURE( this, "this is not in the array?" ); sal_Bool bBreak = sal_False; diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 1aebb1625a5a..b1c91998e651 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -580,7 +580,7 @@ sal_Bool SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, sal_Bool bDelNodes ) if( !bDelNodes ) { - SwSections aArr( 0, 4 ); + SwSections aArr( 0 ); sal_uInt16 nCnt = pFmt->GetChildSections( aArr, SORTSECT_NOT, sal_False ); for( sal_uInt16 n = 0; n < nCnt; ++n ) { diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index e73a4ba0e8c5..b46220c551b4 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -213,7 +213,7 @@ void lcl_ClearArea( const SwFrm &rFrm, OutputDevice &rOut, const SwRect& rPtArea, const SwRect &rGrfArea ) { - SwRegionRects aRegion( rPtArea, 4, 4 ); + SwRegionRects aRegion( rPtArea, 4 ); aRegion -= rGrfArea; if ( aRegion.Count() ) diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index aa619aa5d40d..e3515990181d 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -78,7 +78,7 @@ using namespace ::com::sun::star; #endif typedef SwTableLine* SwTableLinePtr; -SV_DECL_PTRARR_SORT( SwSortTableLines, SwTableLinePtr, 16, 16 ) +SV_DECL_PTRARR_SORT( SwSortTableLines, SwTableLinePtr, 16 ) SV_IMPL_PTRARR_SORT( SwSortTableLines, SwTableLinePtr ); SV_IMPL_PTRARR( _SwShareBoxFmts, SwShareBoxFmt* ) @@ -277,7 +277,7 @@ _CpyTabFrm& _CpyTabFrm::operator=( const _CpyTabFrm& rCpyTabFrm ) return *this; } -SV_DECL_VARARR_SORT( _CpyTabFrms, _CpyTabFrm, 0, 50 ) +SV_DECL_VARARR_SORT( _CpyTabFrms, _CpyTabFrm, 0 ) SV_IMPL_VARARR_SORT( _CpyTabFrms, _CpyTabFrm ) void lcl_DelCpyTabFrmFmts( _CpyTabFrm& rArr ); @@ -3527,7 +3527,7 @@ sal_Bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType, const SvxLRSpaceItem& rLR = GetFrmFmt()->GetLRSpace(); _FndBox* pFndBox = 0; // fuers Einfuegen/Loeschen - SwTableSortBoxes aTmpLst( 0, 5 ); // fuers Undo + SwTableSortBoxes aTmpLst( 0 ); // fuers Undo sal_Bool bBigger, bRet = sal_False, bLeft = nsTblChgWidthHeightType::WH_COL_LEFT == ( eType & 0xff ) || @@ -4260,7 +4260,7 @@ sal_Bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType, pBaseLine = pBaseLine->GetUpper()->GetUpper(); _FndBox* pFndBox = 0; // fuers Einfuegen/Loeschen - SwTableSortBoxes aTmpLst( 0, 5 ); // fuers Undo + SwTableSortBoxes aTmpLst( 0 ); // fuers Undo sal_Bool bBigger, bRet = sal_False, bTop = nsTblChgWidthHeightType::WH_ROW_TOP == ( eType & 0xff ) || diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx index e3e01083301d..07bf4a4f2024 100644 --- a/sw/source/core/docnode/ndcopy.cxx +++ b/sw/source/core/docnode/ndcopy.cxx @@ -232,7 +232,7 @@ struct _MapTblFrmFmt {} }; -SV_DECL_VARARR( _MapTblFrmFmts, _MapTblFrmFmt, 0, 10 ) +SV_DECL_VARARR( _MapTblFrmFmts, _MapTblFrmFmt, 0 ) SV_IMPL_VARARR( _MapTblFrmFmts, _MapTblFrmFmt ); SwCntntNode* SwTxtNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const @@ -1474,7 +1474,7 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange& rRg, //Alle kopierten (also die neu erzeugten) Rahmen in ein weiteres Array //stopfen. Dort sizten sie passend zu den Originalen, damit hinterher //die Chains entsprechend aufgebaut werden koennen. - SvPtrarr aNewArr( 10, 10 ); + SvPtrarr aNewArr( 10 ); for ( sal_uInt16 n = 0; n < aArr.Count(); ++n ) { diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index ba7581fa0c9d..f759441830c1 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -471,7 +471,7 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts, pNdTbl->SetRowsToRepeat( nRowsToRepeat ); pNdTbl->SetTableModel( bNewModel ); - SvPtrarr aBoxFmtArr( 0, 16 ); + SvPtrarr aBoxFmtArr( 0 ); SwTableBoxFmt* pBoxFmt = 0; if( !bDfltBorders && !pTAFmt ) { @@ -758,7 +758,7 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts, if( pTAFmt || ( rInsTblOpts.mnInsMode & tabopts::DEFAULT_BORDER) ) { sal_uInt8 nBoxArrLen = pTAFmt ? 16 : 4; - SvPtrarr aBoxFmtArr( nBoxArrLen, 0 ); + SvPtrarr aBoxFmtArr( nBoxArrLen ); { for( sal_uInt8 i = 0; i < nBoxArrLen; ++i ) aBoxFmtArr.Insert( (void*)0, i ); @@ -1680,7 +1680,7 @@ sal_Bool SwDoc::InsertCol( const SwSelBoxes& rBoxes, sal_uInt16 nCnt, sal_Bool b if( rTbl.ISA( SwDDETable )) return sal_False; - SwTableSortBoxes aTmpLst( 0, 5 ); + SwTableSortBoxes aTmpLst( 0 ); SwUndoTblNdsChg* pUndo = 0; if (GetIDocumentUndoRedo().DoesUndo()) { @@ -1743,7 +1743,7 @@ sal_Bool SwDoc::InsertRow( const SwSelBoxes& rBoxes, sal_uInt16 nCnt, sal_Bool b if( rTbl.ISA( SwDDETable )) return sal_False; - SwTableSortBoxes aTmpLst( 0, 5 ); + SwTableSortBoxes aTmpLst( 0 ); SwUndoTblNdsChg* pUndo = 0; if (GetIDocumentUndoRedo().DoesUndo()) { @@ -2142,7 +2142,7 @@ sal_Bool SwDoc::SplitTbl( const SwSelBoxes& rBoxes, sal_Bool bVert, sal_uInt16 n return sal_False; std::vector<sal_uLong> aNdsCnts; - SwTableSortBoxes aTmpLst( 0, 5 ); + SwTableSortBoxes aTmpLst( 0 ); SwUndoTblNdsChg* pUndo = 0; if (GetIDocumentUndoRedo().DoesUndo()) { @@ -3265,7 +3265,7 @@ class _SplitTable_Para public: _SplitTable_Para( SwTableNode* pNew, SwTable& rOld ) - : aSrc( 16, 16 ), aDest( 16, 16 ), pNewTblNd( pNew ), rOldTbl( rOld ) + : aSrc( 16 ), aDest( 16 ), pNewTblNd( pNew ), rOldTbl( rOld ) {} sal_uInt16 SrcFmt_GetPos( void* pFmt ) const { return aSrc.GetPos( pFmt ); } diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx index 817b1acdb13f..9e8ea04e1108 100644 --- a/sw/source/core/docnode/ndtbl1.cxx +++ b/sw/source/core/docnode/ndtbl1.cxx @@ -328,7 +328,7 @@ void SwDoc::SetRowSplit( const SwCursor& rCursor, const SwFmtRowSplit &rNew ) SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode(); if( pTblNd ) { - SvPtrarr aRowArr( 25, 50 ); //Zum sammeln Lines. + SvPtrarr aRowArr( 25 ); //Zum sammeln Lines. ::lcl_CollectLines( aRowArr, rCursor, false ); if( aRowArr.Count() ) @@ -338,7 +338,7 @@ void SwDoc::SetRowSplit( const SwCursor& rCursor, const SwFmtRowSplit &rNew ) GetIDocumentUndoRedo().AppendUndo(new SwUndoAttrTbl(*pTblNd)); } - SvPtrarr aFmtCmp( Max( sal_uInt8(255), sal_uInt8(aRowArr.Count()) ), 255 ); + SvPtrarr aFmtCmp( Max( sal_uInt8(255), sal_uInt8(aRowArr.Count()) ) ); for( sal_uInt16 i = 0; i < aRowArr.Count(); ++i ) ::lcl_ProcessRowAttr( aFmtCmp, (SwTableLine*)aRowArr[i], rNew ); @@ -360,7 +360,7 @@ void SwDoc::GetRowSplit( const SwCursor& rCursor, SwFmtRowSplit *& rpSz ) const SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode(); if( pTblNd ) { - SvPtrarr aRowArr( 25, 50 ); //Zum sammeln der Lines. + SvPtrarr aRowArr( 25 ); //Zum sammeln der Lines. ::lcl_CollectLines( aRowArr, rCursor, false ); if( aRowArr.Count() ) @@ -388,7 +388,7 @@ void SwDoc::SetRowHeight( const SwCursor& rCursor, const SwFmtFrmSize &rNew ) SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode(); if( pTblNd ) { - SvPtrarr aRowArr( 25, 50 ); //Zum sammeln Lines. + SvPtrarr aRowArr( 25 ); //Zum sammeln Lines. ::lcl_CollectLines( aRowArr, rCursor, true ); if( aRowArr.Count() ) @@ -398,7 +398,7 @@ void SwDoc::SetRowHeight( const SwCursor& rCursor, const SwFmtFrmSize &rNew ) GetIDocumentUndoRedo().AppendUndo(new SwUndoAttrTbl(*pTblNd)); } - SvPtrarr aFmtCmp( Max( sal_uInt8(255), sal_uInt8(aRowArr.Count()) ), 255 ); + SvPtrarr aFmtCmp( Max( sal_uInt8(255), sal_uInt8(aRowArr.Count()) ) ); for ( sal_uInt16 i = 0; i < aRowArr.Count(); ++i ) ::lcl_ProcessRowSize( aFmtCmp, (SwTableLine*)aRowArr[i], rNew ); SwTblFmtCmp::Delete( aFmtCmp ); @@ -419,7 +419,7 @@ void SwDoc::GetRowHeight( const SwCursor& rCursor, SwFmtFrmSize *& rpSz ) const SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode(); if( pTblNd ) { - SvPtrarr aRowArr( 25, 50 ); //Zum sammeln der Lines. + SvPtrarr aRowArr( 25 ); //Zum sammeln der Lines. ::lcl_CollectLines( aRowArr, rCursor, true ); if( aRowArr.Count() ) @@ -444,7 +444,7 @@ sal_Bool SwDoc::BalanceRowHeight( const SwCursor& rCursor, sal_Bool bTstOnly ) SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode(); if( pTblNd ) { - SvPtrarr aRowArr( 25, 50 ); //Zum sammeln der Lines. + SvPtrarr aRowArr( 25 ); //Zum sammeln der Lines. ::lcl_CollectLines( aRowArr, rCursor, true ); if( 1 < aRowArr.Count() ) @@ -472,7 +472,7 @@ sal_Bool SwDoc::BalanceRowHeight( const SwCursor& rCursor, sal_Bool bTstOnly ) new SwUndoAttrTbl(*pTblNd)); } - SvPtrarr aFmtCmp( Max( sal_uInt8(255), sal_uInt8(aRowArr.Count()) ), 255 ); + SvPtrarr aFmtCmp( Max( sal_uInt8(255), sal_uInt8(aRowArr.Count()) ) ); for( i = 0; i < aRowArr.Count(); ++i ) ::lcl_ProcessRowSize( aFmtCmp, (SwTableLine*)aRowArr[i], aNew ); SwTblFmtCmp::Delete( aFmtCmp ); @@ -493,7 +493,7 @@ void SwDoc::SetRowBackground( const SwCursor& rCursor, const SvxBrushItem &rNew SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode(); if( pTblNd ) { - SvPtrarr aRowArr( 25, 50 ); //Zum sammeln Lines. + SvPtrarr aRowArr( 25 ); //Zum sammeln Lines. ::lcl_CollectLines( aRowArr, rCursor, true ); if( aRowArr.Count() ) @@ -503,7 +503,7 @@ void SwDoc::SetRowBackground( const SwCursor& rCursor, const SvxBrushItem &rNew GetIDocumentUndoRedo().AppendUndo(new SwUndoAttrTbl(*pTblNd)); } - SvPtrarr aFmtCmp( Max( sal_uInt8(255), sal_uInt8(aRowArr.Count()) ), 255 ); + SvPtrarr aFmtCmp( Max( sal_uInt8(255), sal_uInt8(aRowArr.Count()) ) ); for( sal_uInt16 i = 0; i < aRowArr.Count(); ++i ) ::lcl_ProcessRowAttr( aFmtCmp, (SwTableLine*)aRowArr[i], rNew ); @@ -523,7 +523,7 @@ sal_Bool SwDoc::GetRowBackground( const SwCursor& rCursor, SvxBrushItem &rToFill SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode(); if( pTblNd ) { - SvPtrarr aRowArr( 25, 50 ); //Zum sammeln Lines. + SvPtrarr aRowArr( 25 ); //Zum sammeln Lines. ::lcl_CollectLines( aRowArr, rCursor, true ); if( aRowArr.Count() ) @@ -596,7 +596,7 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet ) GetIDocumentUndoRedo().AppendUndo( new SwUndoAttrTbl(*pTblNd) ); } - SvPtrarr aFmtCmp( 255, 255 ); + SvPtrarr aFmtCmp( 255 ); const SvxBoxItem* pSetBox; const SvxBoxInfoItem *pSetBoxInfo; @@ -651,7 +651,7 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet ) const SwRect &rUnion = pUnion->GetUnion(); const sal_Bool bLast = i == aUnions.Count() - 1 ? sal_True : sal_False; - SvPtrarr aCellArr( 255, 255 ); + SvPtrarr aCellArr( 255 ); ::lcl_CollectCells( aCellArr, pUnion->GetUnion(), pTab ); //Alle Zellenkanten, die mit dem UnionRect uebereinstimmen oder @@ -847,7 +847,7 @@ void SwDoc::SetTabLineStyle( const SwCursor& rCursor, { SwSelUnion *pUnion = aUnions[i]; SwTabFrm *pTab = pUnion->GetTable(); - SvPtrarr aCellArr( 255, 255 ); + SvPtrarr aCellArr( 255 ); ::lcl_CollectCells( aCellArr, pUnion->GetUnion(), pTab ); for ( sal_uInt16 j = 0; j < aCellArr.Count(); ++j ) @@ -933,7 +933,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const const sal_Bool bFirst = i == 0 ? sal_True : sal_False; const sal_Bool bLast = i == aUnions.Count() - 1 ? sal_True : sal_False; - SvPtrarr aCellArr( 255, 255 ); + SvPtrarr aCellArr( 255 ); ::lcl_CollectCells( aCellArr, rUnion, (SwTabFrm*)pTab ); for ( sal_uInt16 j = 0; j < aCellArr.Count(); ++j ) @@ -1123,7 +1123,7 @@ void SwDoc::SetBoxAttr( const SwCursor& rCursor, const SfxPoolItem &rNew ) GetIDocumentUndoRedo().AppendUndo( new SwUndoAttrTbl(*pTblNd) ); } - SvPtrarr aFmtCmp( Max( sal_uInt8(255), sal_uInt8(aBoxes.size()) ), 255 ); + SvPtrarr aFmtCmp( Max( sal_uInt8(255), sal_uInt8(aBoxes.size()) ) ); for( SwSelBoxes::const_iterator it = aBoxes.begin(); it != aBoxes.end(); ++it ) { SwTableBox *pBox = it->second; diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx index ab7c0727c0a5..08f475e10b02 100644 --- a/sw/source/core/docnode/node2lay.cxx +++ b/sw/source/core/docnode/node2lay.cxx @@ -261,7 +261,7 @@ SwFrm* SwNode2LayImpl::NextFrm() void SwNode2LayImpl::SaveUpperFrms() { - pUpperFrms = new SvPtrarr( 0, 20 ); + pUpperFrms = new SvPtrarr( 0 ); SwFrm* pFrm; while( 0 != (pFrm = NextFrm()) ) { diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx index dfc0e6f0887e..518de823fd08 100644 --- a/sw/source/core/docnode/nodes.cxx +++ b/sw/source/core/docnode/nodes.cxx @@ -54,7 +54,7 @@ extern sal_Bool CheckNodesRange( const SwNodeIndex& rStt, const SwNodeIndex& rEnd, sal_Bool bChkSection ); -SV_DECL_PTRARR(SwSttNdPtrs,SwStartNode*,2,2) +SV_DECL_PTRARR(SwSttNdPtrs,SwStartNode*,2) // Funktion zum bestimmen des hoechsten Levels innerhalb des Bereiches @@ -472,7 +472,7 @@ sal_Bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, sal_uLong nInsPos = 0; // Cnt fuer das TmpArray // das Array bildet einen Stack, es werden alle StartOfSelction's gesichert - SwSttNdPtrs aSttNdStack( 1, 5 ); + SwSttNdPtrs aSttNdStack( 1 ); // setze den Start-Index SwNodeIndex aIdx( aIndex ); @@ -1102,7 +1102,7 @@ void SwNodes::SectionUpDown( const SwNodeIndex & aStart, const SwNodeIndex & aEn SwNode * pAktNode; SwNodeIndex aTmpIdx( aStart, +1 ); // das Array bildet einen Stack, es werden alle StartOfSelction's gesichert - SwSttNdPtrs aSttNdStack( 1, 5 ); + SwSttNdPtrs aSttNdStack( 1 ); SwStartNode* pTmp = aStart.GetNode().GetStartNode(); aSttNdStack.C40_INSERT( SwStartNode, pTmp, 0 ); diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx index 2a4d66d3d677..d0bed29cf951 100644 --- a/sw/source/core/fields/authfld.cxx +++ b/sw/source/core/fields/authfld.cxx @@ -57,12 +57,12 @@ using rtl::OUString; typedef SwAuthEntry* SwAuthEntryPtr; -SV_DECL_PTRARR_DEL( SwAuthDataArr, SwAuthEntryPtr, 5, 5 ) +SV_DECL_PTRARR_DEL( SwAuthDataArr, SwAuthEntryPtr, 5 ) SV_IMPL_PTRARR( SwAuthDataArr, SwAuthEntryPtr ) typedef SwTOXSortKey* TOXSortKeyPtr; -SV_DECL_PTRARR_DEL( SortKeyArr, TOXSortKeyPtr, 5, 5 ) +SV_DECL_PTRARR_DEL( SortKeyArr, TOXSortKeyPtr, 5 ) SV_IMPL_PTRARR( SortKeyArr, TOXSortKeyPtr ) SwAuthEntry::SwAuthEntry(const SwAuthEntry& rCopy) @@ -84,7 +84,7 @@ SwAuthorityFieldType::SwAuthorityFieldType(SwDoc* pDoc) : SwFieldType( RES_AUTHORITY ), m_pDoc(pDoc), m_pDataArr(new SwAuthDataArr ), - m_pSortKeyArr(new SortKeyArr(3, 3)), + m_pSortKeyArr(new SortKeyArr(3)), m_cPrefix('['), m_cSuffix(']'), m_bIsSequence(sal_False), @@ -96,7 +96,7 @@ SwAuthorityFieldType::SwAuthorityFieldType(SwDoc* pDoc) SwAuthorityFieldType::SwAuthorityFieldType( const SwAuthorityFieldType& rFType) : SwFieldType( RES_AUTHORITY ), m_pDataArr(new SwAuthDataArr ), - m_pSortKeyArr(new SortKeyArr(3, 3)), + m_pSortKeyArr(new SortKeyArr(3)), m_cPrefix(rFType.m_cPrefix), m_cSuffix(rFType.m_cSuffix), m_bIsSequence(rFType.m_bIsSequence), diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 2f588ae0d32a..1da184926fe1 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -2153,7 +2153,7 @@ void SwRefPageGetFieldType::Modify( const SfxPoolItem* pOld, const SfxPoolItem* if( !pNew && !pOld && GetDepends() ) { // sammel erstmal alle SetPageRefFelder ein. - _SetGetExpFlds aTmpLst( 10, 5 ); + _SetGetExpFlds aTmpLst( 10 ); if( MakeSetList( aTmpLst ) ) { SwIterator<SwFmtFld,SwFieldType> aIter( *this ); @@ -2301,7 +2301,7 @@ void SwRefPageGetField::ChangeExpansion( const SwFrm* pFrm, OSL_ENSURE( !pFrm->IsInDocBody(), "Flag ist nicht richtig, Frame steht im DocBody" ); // sammel erstmal alle SetPageRefFelder ein. - _SetGetExpFlds aTmpLst( 10, 5 ); + _SetGetExpFlds aTmpLst( 10 ); if( !pGetType->MakeSetList( aTmpLst ) ) return ; diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index 98111d0850f6..e031700c4407 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -117,7 +117,7 @@ sal_Bool IsFrameBehind( const SwTxtNode& rMyNd, sal_uInt16 nMySttPos, if( !pFrm || !pMyFrm || pFrm == pMyFrm ) return sal_False; - SvPtrarr aRefArr( 10, 10 ), aArr( 10, 10 ); + SvPtrarr aRefArr( 10 ), aArr( 10 ); ::lcl_GetLayTree( pFrm, aRefArr ); ::lcl_GetLayTree( pMyFrm, aArr ); @@ -928,7 +928,7 @@ public: String GetName() { return aName; } }; -SV_DECL_PTRARR_DEL( _RefIdsMaps, _RefIdsMap*, 5, 5 ) +SV_DECL_PTRARR_DEL( _RefIdsMaps, _RefIdsMap*, 5 ) SV_IMPL_PTRARR( _RefIdsMaps, _RefIdsMap* ) /// Get a sorted list of the field IDs from a document. diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index 1729c4e17503..deb79100dcc5 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -103,7 +103,7 @@ struct _CmpLPt }; -SV_DECL_VARARR_SORT( _MergePos, _CmpLPt, 0, 40 ) +SV_DECL_VARARR_SORT( _MergePos, _CmpLPt, 0 ) SV_IMPL_VARARR_SORT( _MergePos, _CmpLPt ) SV_IMPL_PTRARR( _FndBoxes, _FndBox* ) @@ -1576,7 +1576,7 @@ void lcl_FindStartEndRow( const SwLayoutFrm *&rpStart, while ( rpEnd->GetNext() ) rpEnd = (SwLayoutFrm*)rpEnd->GetNext(); - SvPtrarr aSttArr( 8, 8 ), aEndArr( 8, 8 ); + SvPtrarr aSttArr( 8 ), aEndArr( 8 ); const SwLayoutFrm *pTmp; for( pTmp = rpStart; (FRM_CELL|FRM_ROW) & pTmp->GetType(); pTmp = pTmp->GetUpper() ) diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx index 5c08c87532c0..1c1a90d2eda5 100644 --- a/sw/source/core/inc/UndoCore.hxx +++ b/sw/source/core/inc/UndoCore.hxx @@ -50,7 +50,7 @@ namespace sw { typedef SwRedlineSaveData* SwRedlineSaveDataPtr; -SV_DECL_PTRARR_DEL( SwRedlineSaveDatas, SwRedlineSaveDataPtr, 8, 8 ) +SV_DECL_PTRARR_DEL( SwRedlineSaveDatas, SwRedlineSaveDataPtr, 8 ) namespace sw { diff --git a/sw/source/core/inc/UndoSort.hxx b/sw/source/core/inc/UndoSort.hxx index e40bc537951c..03407472e1f1 100644 --- a/sw/source/core/inc/UndoSort.hxx +++ b/sw/source/core/inc/UndoSort.hxx @@ -67,8 +67,8 @@ struct SwSortUndoElement ~SwSortUndoElement(); }; -SV_DECL_PTRARR_DEL(SwSortList, SwSortUndoElement*, 10,30) -SV_DECL_PTRARR(SwUndoSortList, SwNodeIndex*, 10,30) +SV_DECL_PTRARR_DEL(SwSortList, SwSortUndoElement*, 10) +SV_DECL_PTRARR(SwUndoSortList, SwNodeIndex*, 10) class SwUndoSort : public SwUndo, private SwUndRng { diff --git a/sw/source/core/inc/blink.hxx b/sw/source/core/inc/blink.hxx index 1a4b0a9252c0..ea3965e962ac 100644 --- a/sw/source/core/inc/blink.hxx +++ b/sw/source/core/inc/blink.hxx @@ -61,7 +61,7 @@ public: }; typedef SwBlinkPortion* SwBlinkPortionPtr; -SV_DECL_PTRARR_SORT_DEL(SwBlinkList, SwBlinkPortionPtr, 0, 10) +SV_DECL_PTRARR_SORT_DEL(SwBlinkList, SwBlinkPortionPtr, 0) class SwBlink { diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx index 26d19dc4d859..30410b71af44 100644 --- a/sw/source/core/inc/docfld.hxx +++ b/sw/source/core/inc/docfld.hxx @@ -118,7 +118,7 @@ public: }; typedef _SetGetExpFld* _SetGetExpFldPtr; -SV_DECL_PTRARR_SORT_DEL( _SetGetExpFlds, _SetGetExpFldPtr, 0, 10 ) +SV_DECL_PTRARR_SORT_DEL( _SetGetExpFlds, _SetGetExpFldPtr, 0 ) // Struktur zum Speichern der Strings aus SetExp-String-Feldern diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx index aa2d096f3cb8..e3df48b2c1a2 100644 --- a/sw/source/core/inc/docsort.hxx +++ b/sw/source/core/inc/docsort.hxx @@ -56,8 +56,8 @@ typedef const _FndBox* _FndBoxPtr; typedef SwSortElement* SwSortElementPtr; typedef const SwTableBox* SwMovedBoxPtr; -SV_DECL_PTRARR_SORT(SwSortElements, SwSortElementPtr, 0, 1 ) -SV_DECL_PTRARR(SwMovedBoxes, SwMovedBoxPtr, 10, 10 ) +SV_DECL_PTRARR_SORT(SwSortElements, SwSortElementPtr, 0) +SV_DECL_PTRARR(SwMovedBoxes, SwMovedBoxPtr, 10) /*-------------------------------------------------------------------- Beschreibung: Funktionen zum Moven von Boxen diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx index afcdb2c11d4e..5b57925efe73 100644 --- a/sw/source/core/inc/doctxm.hxx +++ b/sw/source/core/inc/doctxm.hxx @@ -43,7 +43,7 @@ struct SwTOXSortTabBase; typedef SwTOXSortTabBase* SwTOXSortTabBasePtr; -SV_DECL_PTRARR(SwTOXSortTabBases, SwTOXSortTabBasePtr, 0, 5 ) +SV_DECL_PTRARR(SwTOXSortTabBases, SwTOXSortTabBasePtr, 0) /*-------------------------------------------------------------------- Beschreibung: Ring der speziellen Verzeichnisse diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx index 606b92eaf043..7087b0626335 100644 --- a/sw/source/core/inc/fntcache.hxx +++ b/sw/source/core/inc/fntcache.hxx @@ -51,7 +51,7 @@ class SwFntCache : public SwCache { public: - inline SwFntCache() : SwCache(50,50 + inline SwFntCache() : SwCache(50 #ifdef DBG_UTIL , rtl::OString(RTL_CONSTASCII_STRINGPARAM("Global Font-Cache pFntCache")) #endif diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx index 0fdac74399fe..6e99ade46633 100644 --- a/sw/source/core/inc/mvsave.hxx +++ b/sw/source/core/inc/mvsave.hxx @@ -111,7 +111,7 @@ struct _SaveFly { } }; -SV_DECL_VARARR( _SaveFlyArr, _SaveFly, 0, 10 ) +SV_DECL_VARARR( _SaveFlyArr, _SaveFly, 0 ) void _RestFlyInRange( _SaveFlyArr& rArr, const SwNodeIndex& rSttIdx, const SwNodeIndex* pInsPos ); @@ -182,7 +182,7 @@ public: const SwFmtAnchor* GetAnchor() const { return pAnchor; } }; -SV_DECL_VARARR_SORT( _ZSortFlys, _ZSortFly, 0, 10 ) +SV_DECL_VARARR_SORT( _ZSortFlys, _ZSortFly, 0 ) class SwTblNumFmtMerge diff --git a/sw/source/core/inc/noteurl.hxx b/sw/source/core/inc/noteurl.hxx index 42db71134c45..095c63e3ec92 100644 --- a/sw/source/core/inc/noteurl.hxx +++ b/sw/source/core/inc/noteurl.hxx @@ -54,7 +54,7 @@ public: }; typedef SwURLNote* SwURLNotePtr; -SV_DECL_PTRARR_DEL(SwURLNoteList, SwURLNotePtr, 0, 5) +SV_DECL_PTRARR_DEL(SwURLNoteList, SwURLNotePtr, 0) class SwNoteURL { diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx index c0187acd06b8..f030c236f422 100644 --- a/sw/source/core/inc/rolbck.hxx +++ b/sw/source/core/inc/rolbck.hxx @@ -354,7 +354,7 @@ public: #endif typedef SwHistoryHint* SwHistoryHintPtr; -SV_DECL_PTRARR_DEL( SwpHstry, SwHistoryHintPtr, 0, 2 ) +SV_DECL_PTRARR_DEL( SwpHstry, SwHistoryHintPtr, 0 ) class SwHistory { @@ -366,7 +366,7 @@ class SwHistory sal_uInt16 m_nEndDiff; public: - SwHistory( sal_uInt16 nInitSz = 0, sal_uInt16 nGrowSz = 2 ); + SwHistory( sal_uInt16 nInitSz = 0 ); ~SwHistory(); // delete History from nStart to array end diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx index bc16e528915a..f9a080513867 100644 --- a/sw/source/core/inc/sectfrm.hxx +++ b/sw/source/core/inc/sectfrm.hxx @@ -154,7 +154,7 @@ public: }; typedef SwSectionFrm* SwSectionFrmPtr; -SV_DECL_PTRARR_SORT( SwDestroyList, SwSectionFrmPtr, 1, 5) +SV_DECL_PTRARR_SORT( SwDestroyList, SwSectionFrmPtr, 1 ) inline const SwSectionFrm *SwSectionFrm::GetFollow() const { diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx index 1ac9455abff7..9a4d2f31612e 100644 --- a/sw/source/core/inc/swblocks.hxx +++ b/sw/source/core/inc/swblocks.hxx @@ -63,7 +63,7 @@ public: int operator< ( const SwBlockName& r ) { return aShort < r.aShort; } }; -SV_DECL_PTRARR_SORT( SwBlockNames, SwBlockName*, 10, 10 ) +SV_DECL_PTRARR_SORT( SwBlockNames, SwBlockName*, 10 ) class SwImpBlocks diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx index 1341175aedf8..aba30d131f6e 100644 --- a/sw/source/core/inc/swcache.hxx +++ b/sw/source/core/inc/swcache.hxx @@ -61,7 +61,7 @@ class SwCacheObj; -SV_DECL_PTRARR_DEL(SwCacheObjArr,SwCacheObj*,1,1) +SV_DECL_PTRARR_DEL(SwCacheObjArr,SwCacheObj*,1) class SwCache : public SwCacheObjArr { @@ -105,8 +105,7 @@ public: //nur sal_uInt8 hineinstecken!!! #ifdef DBG_UTIL - SwCache( const sal_uInt16 nInitSize, const sal_uInt16 nGrowSize, - const rtl::OString &rNm ); + SwCache( const sal_uInt16 nInitSize, const rtl::OString &rNm ); ~SwCache(); #else SwCache( const sal_uInt16 nInitSize, const sal_uInt16 nGrowSize ); diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx index 06c013b281fe..49b553f94d70 100644 --- a/sw/source/core/inc/swfntcch.hxx +++ b/sw/source/core/inc/swfntcch.hxx @@ -46,7 +46,7 @@ class SwFontCache : public SwCache { public: - inline SwFontCache() : SwCache(50,50 + inline SwFontCache() : SwCache(50 #ifdef DBG_UTIL , "Global AttributSet/Font-Cache pSwFontCache" #endif diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx index 1db055b9b1e1..746fd49467b5 100644 --- a/sw/source/core/inc/tblrwcl.hxx +++ b/sw/source/core/inc/tblrwcl.hxx @@ -183,7 +183,7 @@ class SwShareBoxFmt public: SwShareBoxFmt( const SwFrmFmt& rFmt ) - : pOldFmt( &rFmt ), aNewFmts( 1, 4 ) + : pOldFmt( &rFmt ), aNewFmts( 1 ) {} const SwFrmFmt& GetOldFormat() const { return *pOldFmt; } @@ -196,7 +196,7 @@ public: }; -SV_DECL_PTRARR_DEL( _SwShareBoxFmts, SwShareBoxFmt*, 8, 8 ) +SV_DECL_PTRARR_DEL( _SwShareBoxFmts, SwShareBoxFmt*, 8 ) class SwShareBoxFmts { diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx index 75ad22213c79..5b3e79d3e793 100644 --- a/sw/source/core/inc/txmsrt.hxx +++ b/sw/source/core/inc/txmsrt.hxx @@ -64,7 +64,7 @@ struct SwTOXSource {} }; -SV_DECL_VARARR( SwTOXSources, SwTOXSource, 0, 10 ) +SV_DECL_VARARR( SwTOXSources, SwTOXSource, 0 ) class SwTOXInternational { diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 49a66be6a70e..5c379e56ebc6 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -813,7 +813,7 @@ SwFmtCol::SwFmtCol( const SwFmtCol& rCpy ) aLineColor( rCpy.aLineColor), nLineHeight( rCpy.GetLineHeight() ), eAdj( rCpy.GetLineAdj() ), - aColumns( (sal_Int8)rCpy.GetNumCols(), 1 ), + aColumns( (sal_Int8)rCpy.GetNumCols() ), nWidth( rCpy.GetWishWidth() ), bOrtho( rCpy.IsOrtho() ) { diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index e1cff3cc8e03..9bc3957f674e 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -1156,7 +1156,7 @@ void AppendAllObjs( const SwSpzFrmFmts *pTbl, const SwFrm* pSib ) //uebrigbleiben, weil wir weder zeichengebunde Rahmen verbinden noch //Objecte die in zeichengebundenen verankert sind. - SwSpzFrmFmts aCpy( 255, 255 ); + SwSpzFrmFmts aCpy( 255 ); aCpy.Insert( pTbl, 0 ); sal_uInt16 nOldCnt = USHRT_MAX; diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index d485bc1fb8e4..7d3ea8302ad5 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -2018,7 +2018,7 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm* _pRef, //(der Inhalt zu einem Attribut kann ueber mehrere Seiten verteilt sein) //und ausschneiden. - SvPtrarr aNotFtnArr( 20, 20 ); //Zur Robustheit werden hier die nicht + SvPtrarr aNotFtnArr( 20 ); //Zur Robustheit werden hier die nicht //dazugehoerigen Fussnoten eingetragen. //Wenn eine Fussnote zweimal angefasst wird //ists vorbei! So kommt die Funktion auch @@ -2377,7 +2377,7 @@ void SwFtnBossFrm::MoveFtns( const SwCntntFrm *pSrc, SwCntntFrm *pDest, OSL_ENSURE( pDestBoss, "+SwPageFrm::MoveFtns: no destination boss" ); if( pDestBoss ) // robust { - SvPtrarr aFtnArr( 5, 5 ); + SvPtrarr aFtnArr( 5 ); pDestBoss->_CollectFtns( pDest, pFtn, aFtnArr ); if ( aFtnArr.Count() ) { @@ -2888,7 +2888,7 @@ sal_Bool SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss, if( !pStart ) pStart = ContainsCntnt(); - SvPtrarr aFtnArr( 5, 5 ); + SvPtrarr aFtnArr( 5 ); while ( IsAnLower( pStart ) ) { @@ -2912,7 +2912,7 @@ sal_Bool SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss, if( pStart && pOldBoss->IsInSct() && ( pOldChief = pOldBoss->FindSctFrm() ) != ( pNewChief = pNewBoss->FindSctFrm() ) ) { - pFtnArr = new SvPtrarr( 5, 5 ); + pFtnArr = new SvPtrarr( 5 ); pOldChief = pOldBoss->FindFtnBossFrm( sal_True ); pNewChief = pNewBoss->FindFtnBossFrm( sal_True ); while( pOldChief->IsAnLower( pStart ) ) diff --git a/sw/source/core/layout/layhelp.hxx b/sw/source/core/layout/layhelp.hxx index 6028735c5fd7..1a6d4cb45184 100644 --- a/sw/source/core/layout/layhelp.hxx +++ b/sw/source/core/layout/layhelp.hxx @@ -57,7 +57,7 @@ class SvStream; class SwFlyCache; typedef SwFlyCache* SwFlyCachePtr; -SV_DECL_PTRARR_DEL( SwPageFlyCache, SwFlyCachePtr, 0, 4 ) +SV_DECL_PTRARR_DEL( SwPageFlyCache, SwFlyCachePtr, 0 ) class SwLayCacheImpl : public std::vector<sal_uLong> { diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx index 3105bce2cc3f..344b388c0656 100644 --- a/sw/source/core/layout/layouter.cxx +++ b/sw/source/core/layout/layouter.cxx @@ -128,7 +128,7 @@ void SwEndnoter::CollectEndnote( SwFtnFrm* pFtn ) } } if( !pEndArr ) - pEndArr = new SvPtrarr( 5, 5 ); // deleted from the SwLayouter + pEndArr = new SvPtrarr( 5 ); // deleted from the SwLayouter pEndArr->Insert( (VoidPtr)pFtn, pEndArr->Count() ); } diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index a1675a9e2ffa..1e9b0e88b27a 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -363,7 +363,7 @@ TYPEINIT1(SwCntntFrm,SwFrm); //rtti fuer SwCntntFrm void _FrmInit() { SwRootFrm::pVout = new SwLayVout(); - SwCache *pNew = new SwCache( 100, 100 + SwCache *pNew = new SwCache( 100 #ifdef DBG_UTIL , "static SwBorderAttrs::pCache" #endif @@ -395,7 +395,7 @@ void _FrmFinit() |*************************************************************************/ typedef CurrShell* CurrShellPtr; -SV_DECL_PTRARR_SORT(SwCurrShells,CurrShellPtr,4,4) +SV_DECL_PTRARR_SORT(SwCurrShells,CurrShellPtr,4) SV_IMPL_PTRARR_SORT(SwCurrShells,CurrShellPtr) CurrShell::CurrShell( ViewShell *pNew ) diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 074a54aad479..e7d16a3969d5 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -195,7 +195,7 @@ public: sal_Bool MakeUnion( const SwRect &rRect ); }; -SV_DECL_VARARR( SwLRects, SwLineRect, 100, 100 ) +SV_DECL_VARARR( SwLRects, SwLineRect, 100 ) class SwLineRects : public SwLRects { @@ -500,7 +500,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut ) static const long nAdd = 20; - SvPtrarr aCheck( 64, 64 ); + SvPtrarr aCheck( 64 ); for ( int i = 0; i < (int)Count(); ++i ) { @@ -3984,7 +3984,7 @@ void SwFrm::PaintShadow( const SwRect& rRect, SwRect& rOutRect, const long nWidth = ::lcl_AlignWidth ( rShadow.GetWidth() ); const long nHeight = ::lcl_AlignHeight( rShadow.GetWidth() ); - SwRects aRegion( 2, 2 ); + SwRects aRegion( 2 ); SwRect aOut( rOutRect ); const sal_Bool bCnt = IsCntntFrm(); @@ -4206,7 +4206,7 @@ void SwFrm::PaintBorderLine( const SwRect& rRect, if ( pPage->GetSortedObjs() ) { - SwRegionRects aRegion( aOut, 4, 1 ); + SwRegionRects aRegion( aOut, 4 ); ::lcl_SubtractFlys( this, pPage, aOut, aRegion ); for ( sal_uInt16 i = 0; i < aRegion.Count(); ++i ) pLines->AddLineRect( aRegion[i], pColor, nStyle, pTab, nSubCol ); diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 575d959dcc0a..580e0452bf89 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -898,7 +898,7 @@ String SwOLEObj::GetDescription() SwOLELRUCache::SwOLELRUCache() - : SvPtrarr( 64, 16 ), + : SvPtrarr( 64 ), utl::ConfigItem(OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Cache"))), nLRU_InitSize( 20 ), bInUnload( sal_False ) diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index c13630d748fc..3c0b4c156542 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -432,7 +432,7 @@ void SwTable::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) void SwTable::AdjustWidths( const long nOld, const long nNew ) { - SvPtrarr aFmtArr( (sal_uInt8)aLines[0]->GetTabBoxes().Count(), 1 ); + SvPtrarr aFmtArr( (sal_uInt8)aLines[0]->GetTabBoxes().Count() ); ::lcl_ModifyLines( aLines, nOld, nNew, aFmtArr, true ); } @@ -699,7 +699,7 @@ struct Parm SwShareBoxFmts aShareFmts; Parm( const SwTabCols &rN, const SwTabCols &rO ) : - rNew( rN ), rOld( rO ), nNewWish(0), nOldWish(0), aBoxArr( 10, 1 ){} + rNew( rN ), rOld( rO ), nNewWish(0), nOldWish(0), aBoxArr( 10 ){} }; inline sal_Bool BoxInArr( SvPtrarr& rArr, SwTableBox* pBox ) { @@ -1555,7 +1555,7 @@ sal_Bool SwTable::IsTblComplex() const SwTableLine::SwTableLine( SwTableLineFmt *pFmt, sal_uInt16 nBoxes, SwTableBox *pUp ) : SwClient( pFmt ), - aBoxes( (sal_uInt8)nBoxes, 1 ), + aBoxes( (sal_uInt8)nBoxes ), pUpper( pUp ) { } @@ -1698,7 +1698,7 @@ SwTwips SwTableLine::GetTableLineHeight( bool& bLayoutAvailable ) const |*************************************************************************/ SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, sal_uInt16 nLines, SwTableLine *pUp ) : SwClient( 0 ), - aLines( (sal_uInt8)nLines, 1 ), + aLines( (sal_uInt8)nLines ), pSttNd( 0 ), pUpper( pUp ), pImpl( 0 ) @@ -1709,7 +1709,7 @@ SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, sal_uInt16 nLines, SwTableLine *pUp SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, const SwNodeIndex &rIdx, SwTableLine *pUp ) : SwClient( 0 ), - aLines( 0, 0 ), + aLines( 0 ), pUpper( pUp ), pImpl( 0 ) { @@ -1728,7 +1728,7 @@ SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, const SwNodeIndex &rIdx, SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, const SwStartNode& rSttNd, SwTableLine *pUp ) : SwClient( 0 ), - aLines( 0, 0 ), + aLines( 0 ), pSttNd( &rSttNd ), pUpper( pUp ), pImpl( 0 ) diff --git a/sw/source/core/text/txtinit.cxx b/sw/source/core/text/txtinit.cxx index 96eecc946e13..187a99694808 100644 --- a/sw/source/core/text/txtinit.cxx +++ b/sw/source/core/text/txtinit.cxx @@ -70,7 +70,7 @@ void _TextInit() { pFntCache = new SwFntCache; // Cache for SwSubFont -> SwFntObj = { Font aFont, Font* pScrFont, Font* pPrtFont, OutputDevice* pPrinter, ... } pSwFontCache = new SwFontCache; // Cache for SwTxtFmtColl -> SwFontObj = { SwFont aSwFont, SfxPoolItem* pDefaultArray } - SwCache *pTxtCache = new SwCache( 250, 100 // Cache for SwTxtFrm -> SwTxtLine = { SwParaPortion* pLine } + SwCache *pTxtCache = new SwCache( 250 // Cache for SwTxtFrm -> SwTxtLine = { SwParaPortion* pLine } #ifdef DBG_UTIL , "static SwTxtFrm::pTxtCache" #endif diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 42220ebce1c5..2691f28adf97 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -94,11 +94,11 @@ using namespace ::com::sun::star; -SV_DECL_PTRARR( TmpHints, SwTxtAttr*, 0, 4 ) +SV_DECL_PTRARR( TmpHints, SwTxtAttr*, 0 ) TYPEINIT1( SwTxtNode, SwCntntNode ) -SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1) +SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1) // Leider ist das SwpHints nicht ganz wasserdicht: // Jeder darf an den Hints rumfummeln, ohne die Sortierreihenfolge diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index 027e95ef003e..cdb85b9fab5c 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -1014,8 +1014,8 @@ void SwHistoryChangeCharFmt::SetInDoc(SwDoc * pDoc, bool ) -SwHistory::SwHistory( sal_uInt16 nInitSz, sal_uInt16 nGrowSz ) - : m_SwpHstry( (sal_uInt8)nInitSz, (sal_uInt8)nGrowSz ) +SwHistory::SwHistory( sal_uInt16 nInitSz ) + : m_SwpHstry( (sal_uInt8)nInitSz ) , m_nEndDiff( 0 ) {} diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx index 353631b13e2b..4267874ef771 100644 --- a/sw/source/core/undo/unnum.cxx +++ b/sw/source/core/undo/unnum.cxx @@ -40,7 +40,7 @@ #include <rolbck.hxx> -SV_DECL_PTRARR_DEL( _SfxPoolItems, SfxPoolItem*, 16, 16 ) +SV_DECL_PTRARR_DEL( _SfxPoolItems, SfxPoolItem*, 16 ) SV_IMPL_PTRARR( _SfxPoolItems, SfxPoolItem* ); diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 96351fb93978..6243bead3f5c 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -85,17 +85,17 @@ extern void ClearFEShellTabCols(); typedef SfxItemSet* SfxItemSetPtr; -SV_DECL_PTRARR_DEL( SfxItemSets, SfxItemSetPtr, 10, 5 ) +SV_DECL_PTRARR_DEL( SfxItemSets, SfxItemSetPtr, 10 ) typedef SwUndoSaveSection* SwUndoSaveSectionPtr; -SV_DECL_PTRARR_DEL( SwUndoSaveSections, SwUndoSaveSectionPtr, 0, 10 ) +SV_DECL_PTRARR_DEL( SwUndoSaveSections, SwUndoSaveSectionPtr, 0 ) typedef SwUndoMove* SwUndoMovePtr; -SV_DECL_PTRARR_DEL( SwUndoMoves, SwUndoMovePtr, 0, 10 ) +SV_DECL_PTRARR_DEL( SwUndoMoves, SwUndoMovePtr, 0 ) struct SwTblToTxtSave; typedef SwTblToTxtSave* SwTblToTxtSavePtr; -SV_DECL_PTRARR_DEL( SwTblToTxtSaves, SwTblToTxtSavePtr, 0, 10 ) +SV_DECL_PTRARR_DEL( SwTblToTxtSaves, SwTblToTxtSavePtr, 0 ) struct _UndoTblCpyTbl_Entry { @@ -110,7 +110,7 @@ struct _UndoTblCpyTbl_Entry ~_UndoTblCpyTbl_Entry(); }; typedef _UndoTblCpyTbl_Entry* _UndoTblCpyTbl_EntryPtr; -SV_DECL_PTRARR_DEL( _UndoTblCpyTbl_Entries, _UndoTblCpyTbl_EntryPtr, 0, 10 ) +SV_DECL_PTRARR_DEL( _UndoTblCpyTbl_Entries, _UndoTblCpyTbl_EntryPtr, 0 ) class _SaveBox; class _SaveLine; @@ -1354,7 +1354,7 @@ void _SaveBox::SaveCntntAttrs( SwDoc* pDoc ) else { sal_uLong nEnd = pDoc->GetNodes()[ nSttNode ]->EndOfSectionIndex(); - Ptrs.pCntntAttrs = new SfxItemSets( (sal_uInt8)(nEnd - nSttNode - 1 ), 5 ); + Ptrs.pCntntAttrs = new SfxItemSets( (sal_uInt8)(nEnd - nSttNode - 1 ) ); for( sal_uLong n = nSttNode + 1; n < nEnd; ++n ) { SwCntntNode* pCNd = pDoc->GetNodes()[ n ]->GetCntntNode(); @@ -1733,7 +1733,7 @@ void SwUndoTblNdsChg::SaveSection( SwStartNode* pSttNd ) { OSL_ENSURE( IsDelBox(), "falsche Action" ); if( pDelSects.get() == NULL ) - pDelSects.reset( new SwUndoSaveSections( 10, 5 ) ); + pDelSects.reset( new SwUndoSaveSections( 10 ) ); SwTableNode* pTblNd = pSttNd->FindTableNode(); SwUndoSaveSection* pSave = new SwUndoSaveSection; @@ -2861,7 +2861,7 @@ sal_Bool SwUndoTblCpyTbl::InsertRow( SwTable& rTbl, const SwSelBoxes& rBoxes, SwTableNode* pTblNd = (SwTableNode*)rTbl.GetTabSortBoxes()[0]-> GetSttNd()->FindTableNode(); - SwTableSortBoxes aTmpLst( 0, 5 ); + SwTableSortBoxes aTmpLst( 0 ); pInsRowUndo = new SwUndoTblNdsChg( UNDO_TABLE_INSROW, rBoxes, *pTblNd, 0, 0, nCnt, sal_True, sal_False ); aTmpLst.Insert( &rTbl.GetTabSortBoxes(), 0, rTbl.GetTabSortBoxes().Count() ); diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 2f88674d8585..c12ac1413fe2 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -730,7 +730,7 @@ SwFieldType* SwXFieldMaster::GetFldType(sal_Bool bDontCreate) const } typedef SwFmtFld* SwFmtFldPtr; -SV_DECL_PTRARR(SwDependentFields, SwFmtFldPtr, 5, 5) +SV_DECL_PTRARR(SwDependentFields, SwFmtFldPtr, 5) SV_IMPL_PTRARR(SwDependentFields, SwFmtFldPtr) uno::Any SwXFieldMaster::getPropertyValue(const OUString& rPropertyName) diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index d347c0cf93c5..12664bde6d34 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -106,7 +106,7 @@ struct PropValData #define API_COL_LINE_DASHED 3 typedef PropValData* PropValDataPtr; -SV_DECL_PTRARR(PropValDataArr, PropValDataPtr, 5, 5 ) +SV_DECL_PTRARR(PropValDataArr, PropValDataPtr, 5) SV_IMPL_PTRARR(PropValDataArr, PropValDataPtr) diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 0babb76e5d6f..2fe88b73baed 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -321,7 +321,7 @@ void StgReader::SetFltName( const String& rFltNm ) SwRelNumRuleSpaces::SwRelNumRuleSpaces( SwDoc& rDoc, sal_Bool bNDoc ) : bNewDoc( bNDoc ) { - pNumRuleTbl = new SwNumRuleTbl( 8, 8 ); + pNumRuleTbl = new SwNumRuleTbl( 8 ); if( !bNDoc ) pNumRuleTbl->Insert( &rDoc.GetNumRuleTbl(), 0 ); } diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 73de8423589c..25b3b1132ff1 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -1208,7 +1208,7 @@ HTMLSttEndPos::~HTMLSttEndPos() } typedef HTMLSttEndPos *HTMLSttEndPosPtr; -SV_DECL_PTRARR( _HTMLEndLst, HTMLSttEndPosPtr, 5, 5 ) +SV_DECL_PTRARR( _HTMLEndLst, HTMLSttEndPosPtr, 5 ) enum HTMLOnOffState { HTML_NOT_SUPPORTED, // nicht unterst. Attribut HTML_REAL_VALUE, // Attribut mit Wert diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index 45dfe8e683c3..e03b1d4d3f1d 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -313,7 +313,7 @@ void SwHTMLWriter::CollectFlyFrms() "number of browser configurations has changed" ); sal_uInt8 nSz = (sal_uInt8)Min( pDoc->GetSpzFrmFmts()->Count(), sal_uInt16(255) ); - SwPosFlyFrms aFlyPos( nSz, nSz ); + SwPosFlyFrms aFlyPos( nSz ); pDoc->GetAllFlyFmts( aFlyPos, bWriteAll ? 0 : pCurPam, sal_True ); for( sal_uInt16 i=0; i< aFlyPos.Count(); i++ ) diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx index ff86a532dc97..5e0d945cfd92 100644 --- a/sw/source/filter/html/htmlfly.hxx +++ b/sw/source/filter/html/htmlfly.hxx @@ -129,7 +129,7 @@ public: }; typedef SwHTMLPosFlyFrm *SwHTMLPosFlyFrmPtr; -SV_DECL_PTRARR_SORT( SwHTMLPosFlyFrms, SwHTMLPosFlyFrmPtr, 10, 10 ) +SV_DECL_PTRARR_SORT( SwHTMLPosFlyFrms, SwHTMLPosFlyFrmPtr, 10 ) #endif diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx index f10de6ebc07e..ba2c5a721c05 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -41,7 +41,7 @@ #include "wrthtml.hxx" typedef SwTxtFtn *SwTxtFtnPtr; -SV_DECL_PTRARR( SwHTMLTxtFtns, SwTxtFtnPtr, 1, 1 ) +SV_DECL_PTRARR( SwHTMLTxtFtns, SwTxtFtnPtr, 1 ) struct SwHTMLFootEndNote_Impl { diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 42eebd5225a0..2612ef575c45 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -278,7 +278,7 @@ public: // Row of a HTML table typedef HTMLTableCell* HTMLTableCellPtr; -SV_DECL_PTRARR_DEL(HTMLTableCells,HTMLTableCellPtr,5,5) +SV_DECL_PTRARR_DEL(HTMLTableCells,HTMLTableCellPtr,5) class HTMLTableRow { @@ -378,12 +378,12 @@ public: // HTML table typedef HTMLTableRow* HTMLTableRowPtr; -SV_DECL_PTRARR_DEL(HTMLTableRows,HTMLTableRowPtr,5,5) +SV_DECL_PTRARR_DEL(HTMLTableRows,HTMLTableRowPtr,5) typedef HTMLTableColumn* HTMLTableColumnPtr; -SV_DECL_PTRARR_DEL(HTMLTableColumns,HTMLTableColumnPtr,5,5) +SV_DECL_PTRARR_DEL(HTMLTableColumns,HTMLTableColumnPtr,5) -SV_DECL_PTRARR(SdrObjects,SdrObject *,1,1) +SV_DECL_PTRARR(SdrObjects,SdrObject *,1) class HTMLTable { diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index b559b74be3a7..887db2500490 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -2589,7 +2589,7 @@ void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable, SwCntntNode* pCNd; sal_uInt16 n; - _HTMLAttrs aFields( 5, 5 ); + _HTMLAttrs aFields( 5 ); for( n = aSetAttrTab.Count(); n; ) { diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index f751719ff423..54a6f0e3073c 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -72,7 +72,7 @@ extern HTMLOptionEnum aHTMLImgVAlignTable[]; class _HTMLAttr; typedef _HTMLAttr *_HTMLAttrPtr; -SV_DECL_PTRARR( _HTMLAttrs, _HTMLAttrPtr, 5, 5 ) +SV_DECL_PTRARR( _HTMLAttrs, _HTMLAttrPtr, 5 ) class _HTMLAttr { @@ -332,16 +332,16 @@ public: }; typedef _HTMLAttrContext *_HTMLAttrContextPtr; -SV_DECL_PTRARR( _HTMLAttrContexts, _HTMLAttrContextPtr, 5, 5 ) +SV_DECL_PTRARR( _HTMLAttrContexts, _HTMLAttrContextPtr, 5 ) class HTMLTable; class SwCSS1Parser; class SwHTMLNumRuleInfo; typedef ImageMap *ImageMapPtr; -SV_DECL_PTRARR_DEL( ImageMaps, ImageMapPtr, 1, 1 ) +SV_DECL_PTRARR_DEL( ImageMaps, ImageMapPtr, 1 ) typedef SwFrmFmt *SwFrmFmtPtr; -SV_DECL_PTRARR( SwHTMLFrmFmts, SwFrmFmtPtr, 2, 2 ) +SV_DECL_PTRARR( SwHTMLFrmFmts, SwFrmFmtPtr, 2 ) #define HTML_CNTXT_PROTECT_STACK 0x0001 #define HTML_CNTXT_STRIP_PARA 0x0002 diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index 633ad33dd1b9..96e2d06ef2ec 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -189,11 +189,11 @@ const sal_uInt32 HTML_FRMOPTS_GENIMG = // der HTML-Writer struct HTMLControl; -SV_DECL_PTRARR_SORT_DEL( HTMLControls, HTMLControl*, 1, 1 ) -SV_DECL_PTRARR( INetFmts, SwFmtINetFmt*, 1, 1 ) +SV_DECL_PTRARR_SORT_DEL( HTMLControls, HTMLControl*, 1 ) +SV_DECL_PTRARR( INetFmts, SwFmtINetFmt*, 1 ) struct SwHTMLFmtInfo; -SV_DECL_PTRARR_SORT_DEL( SwHTMLFmtInfos, SwHTMLFmtInfo*, 1, 1 ) +SV_DECL_PTRARR_SORT_DEL( SwHTMLFmtInfos, SwHTMLFmtInfo*, 1 ) class IDocumentStylePoolAccess; diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index c9b51bc8f189..73245119d527 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -164,7 +164,7 @@ namespace sw } }; - SV_DECL_PTRARR_SORT_DEL(AuthorInfos, AuthorInfo_Ptr,16,16) + SV_DECL_PTRARR_SORT_DEL(AuthorInfos, AuthorInfo_Ptr,16) /** Clips a value to MAX/MIN 16bit value to make it safe for use as a position value to give to writer. i.e. +-57.8cm. Sometimes diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx index 2e5d21ab3ade..86b295a43ff7 100644 --- a/sw/source/filter/inc/wrtswtbl.hxx +++ b/sw/source/filter/inc/wrtswtbl.hxx @@ -106,7 +106,7 @@ public: }; typedef SwWriteTableCell *SwWriteTableCellPtr; -SV_DECL_PTRARR_DEL( SwWriteTableCells, SwWriteTableCellPtr, 5, 5 ) +SV_DECL_PTRARR_DEL( SwWriteTableCells, SwWriteTableCellPtr, 5 ) //----------------------------------------------------------------------- @@ -175,7 +175,7 @@ inline int SwWriteTableRow::operator<( const SwWriteTableRow& rRow ) const } typedef SwWriteTableRow *SwWriteTableRowPtr; -SV_DECL_PTRARR_SORT_DEL( SwWriteTableRows, SwWriteTableRowPtr, 5, 5 ) +SV_DECL_PTRARR_SORT_DEL( SwWriteTableRows, SwWriteTableRowPtr, 5 ) //----------------------------------------------------------------------- @@ -233,7 +233,7 @@ inline int SwWriteTableCol::operator<( const SwWriteTableCol& rCol ) const typedef SwWriteTableCol *SwWriteTableColPtr; -SV_DECL_PTRARR_SORT_DEL( SwWriteTableCols, SwWriteTableColPtr, 5, 5 ) +SV_DECL_PTRARR_SORT_DEL( SwWriteTableCols, SwWriteTableColPtr, 5 ) //----------------------------------------------------------------------- diff --git a/sw/source/filter/rtf/rtftbl.cxx b/sw/source/filter/rtf/rtftbl.cxx index 2fa62f0c370d..b2233bb7c0e4 100644 --- a/sw/source/filter/rtf/rtftbl.cxx +++ b/sw/source/filter/rtf/rtftbl.cxx @@ -50,7 +50,7 @@ using namespace ::com::sun::star; typedef SwTableBoxFmt* SwTableBoxFmtPtr; -SV_DECL_PTRARR( SwBoxFrmFmts, SwTableBoxFmtPtr, 25, 50 ) +SV_DECL_PTRARR( SwBoxFrmFmts, SwTableBoxFmtPtr, 25 ) class SwShareBoxFmts; extern void _DeleteBox( SwTable& rTbl, SwTableBox* pBox, SwUndo* = 0, diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index 5378d07f3bf2..8099617c957e 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -226,7 +226,7 @@ SwRTFParser::SwRTFParser(SwDoc* pD, maCharStyleMapper(*pD), maSegments(*this), maInsertedTables(*pD), - aTblFmts(0, 10), + aTblFmts(0), mpBookmarkStart(0), mpRedlineStack(0), pAuthorInfos(0), diff --git a/sw/source/filter/rtf/swparrtf.hxx b/sw/source/filter/rtf/swparrtf.hxx index b908bf6c46a8..31c2bae865b7 100644 --- a/sw/source/filter/rtf/swparrtf.hxx +++ b/sw/source/filter/rtf/swparrtf.hxx @@ -147,7 +147,7 @@ struct SwListEntry }; typedef SwFlySave* SwFlySavePtr; -SV_DECL_PTRARR_DEL( SwFlySaveArr, SwFlySavePtr, 0, 20 ) +SV_DECL_PTRARR_DEL( SwFlySaveArr, SwFlySavePtr, 0 ) typedef std::deque< SwListEntry > SwListArr; struct DocPageInformation diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index 4f5cac8528d8..d5c19d868c13 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -108,7 +108,7 @@ void Writer_Impl::InsertBkmk(const ::sw::mark::IMark& rBkmk) SvPtrarr* pArr = pBkmkNodePos->Get( nNd ); if( !pArr ) { - pArr = new SvPtrarr( 1, 4 ); + pArr = new SvPtrarr( 1 ); pBkmkNodePos->Insert( nNd, pArr ); } @@ -121,7 +121,7 @@ void Writer_Impl::InsertBkmk(const ::sw::mark::IMark& rBkmk) pArr = pBkmkNodePos->Get( nNd ); if( !pArr ) { - pArr = new SvPtrarr( 1, 4 ); + pArr = new SvPtrarr( 1 ); pBkmkNodePos->Insert( nNd, pArr ); } pArr->Insert( p, pArr->Count() ); @@ -473,7 +473,7 @@ void Writer::_AddFontItem( SfxItemPool& rPool, const SvxFontItem& rFont ) { if (!m_pImpl->pFontRemoveLst) { - m_pImpl->pFontRemoveLst = new SvPtrarr( 0, 10 ); + m_pImpl->pFontRemoveLst = new SvPtrarr( 0 ); } void* p = (void*)pItem; diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 86e9a4a02fe6..93eb6368a898 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -857,7 +857,7 @@ void WW8Export::AppendFlyInFlys(const sw::Frame& rFrmFmt, MSWord_SdrAttrIter::MSWord_SdrAttrIter( MSWordExportBase& rWr, const EditTextObject& rEditObj, sal_uInt8 nTyp ) : MSWordAttrIter( rWr ), pEditObj(&rEditObj), pEditPool(0), - aTxtAtrArr(), aChrTxtAtrArr( 0, 4 ), aChrSetArr( 0, 4 ), + aTxtAtrArr(), aChrTxtAtrArr( 0 ), aChrSetArr( 0 ), mnTyp(nTyp) { NextPara( 0 ); diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 21dc7c71be1c..8f4d6cdea5c1 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -1893,7 +1893,7 @@ void MSWordExportBase::WriteHeaderFooterText( const SwFmt& rFmt, bool bHeader ) // WW8_WrPlcFtnEdn ist die Klasse fuer Fuss- und Endnoten //------------------------------------------------------------------------------ WW8_WrPlcSubDoc::WW8_WrPlcSubDoc() - : aCntnt( 0, 16 ), pTxtPos( 0 ) + : aCntnt( 0 ), pTxtPos( 0 ) { } diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index c5b7afbe0f45..083854f84cca 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -229,7 +229,7 @@ public: SV_IMPL_PTRARR( WW8_WrFkpPtrs, WW8_FkpPtr ) typedef WW8_WrPc* WW8_WrPcPtr; -SV_DECL_PTRARR_DEL( WW8_WrPcPtrs, WW8_WrPcPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( WW8_WrPcPtrs, WW8_WrPcPtr, 4 ) SV_IMPL_PTRARR( WW8_WrPcPtrs, WW8_WrPcPtr ) static void WriteDop( WW8Export& rWrt ) @@ -1377,7 +1377,7 @@ void WW8_WrtBookmarks::MoveFieldMarks(sal_uLong nFrom, sal_uLong nTo) void WW8Export::AppendBookmarks( const SwTxtNode& rNd, xub_StrLen nAktPos, xub_StrLen nLen ) { - SvPtrarr aArr( 8, 8 ); + SvPtrarr aArr( 8 ); sal_uInt16 nCntnt; xub_StrLen nAktEnd = nAktPos + nLen; if( GetWriter().GetBookmarks( rNd, nAktPos, nAktEnd, aArr )) diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index c886e22a9358..a1827bf41264 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -1215,7 +1215,7 @@ public: }; typedef WW8_WrFkp* WW8_FkpPtr; // Plc fuer Chpx und Papx ( incl PN-Plc ) -SV_DECL_PTRARR( WW8_WrFkpPtrs, WW8_FkpPtr, 4, 4 ) +SV_DECL_PTRARR( WW8_WrFkpPtrs, WW8_FkpPtr, 4 ) class WW8_WrPlcPn // Plc fuer Page Numbers { diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 989a5dbba71f..98bd41092fc7 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -148,8 +148,8 @@ typedef WW8LFOInfo* WW8LFOInfo_Ptr; struct WW8OleMap; typedef WW8OleMap* WW8OleMap_Ptr; -SV_DECL_PTRARR_DEL(WW8LFOInfos,WW8LFOInfo_Ptr,16,16) -SV_DECL_PTRARR_SORT_DEL(WW8OleMaps, WW8OleMap_Ptr,16,16) +SV_DECL_PTRARR_DEL(WW8LFOInfos,WW8LFOInfo_Ptr,16) +SV_DECL_PTRARR_SORT_DEL(WW8OleMaps, WW8OleMap_Ptr,16) class WW8Reader : public StgReader { diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index b72fcd55ab51..adb44728a292 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -97,7 +97,7 @@ public: typedef WW8SelBoxInfo* WW8SelBoxInfoPtr; -SV_DECL_PTRARR_DEL(WW8MergeGroups, WW8SelBoxInfoPtr, 16,16) +SV_DECL_PTRARR_DEL(WW8MergeGroups, WW8SelBoxInfoPtr, 16) SV_IMPL_PTRARR(WW8MergeGroups, WW8SelBoxInfoPtr) struct WW8TabBandDesc diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 5e54d6bd8b1b..decfcb8f7151 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -273,7 +273,7 @@ TYPEINIT1( SwXMLConditionContext_Impl, XMLTextStyleContext ); // --------------------------------------------------------------------- typedef SwXMLConditionContext_Impl *SwXMLConditionContextPtr; -SV_DECL_PTRARR( SwXMLConditions_Impl, SwXMLConditionContextPtr, 5, 2 ) +SV_DECL_PTRARR( SwXMLConditions_Impl, SwXMLConditionContextPtr, 5 ) class SwXMLTextStyleContext_Impl : public XMLTextStyleContext { diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index 0a77c1b03c79..64b051f9fadf 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -105,7 +105,7 @@ sal_Int32 SwXMLTableColumnCmpWidth_Impl( const SwXMLTableColumn_Impl& r1, // --------------------------------------------------------------------- typedef SwXMLTableColumn_Impl *SwXMLTableColumnPtr; -SV_DECL_PTRARR_SORT_DEL( SwXMLTableColumns_Impl, SwXMLTableColumnPtr, 5, 5 ) +SV_DECL_PTRARR_SORT_DEL( SwXMLTableColumns_Impl, SwXMLTableColumnPtr, 5 ) SV_IMPL_OP_PTRARR_SORT( SwXMLTableColumns_Impl, SwXMLTableColumnPtr ) DECLARE_CONTAINER_SORT( SwXMLTableColumnsSortByWidth_Impl, diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 43a284b60d14..cda279eca911 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -287,7 +287,7 @@ inline void SwXMLTableCell_Impl::Dispose() // --------------------------------------------------------------------- typedef SwXMLTableCell_Impl* SwXMLTableCellPtr; -SV_DECL_PTRARR_DEL(SwXMLTableCells_Impl,SwXMLTableCellPtr,5,5) +SV_DECL_PTRARR_DEL(SwXMLTableCells_Impl,SwXMLTableCellPtr,5) SV_IMPL_PTRARR(SwXMLTableCells_Impl,SwXMLTableCellPtr) class SwXMLTableRow_Impl @@ -1271,7 +1271,7 @@ public: typedef SwXMLTableRow_Impl* SwXMLTableRowPtr; -SV_DECL_PTRARR_DEL(SwXMLTableRows_Impl,SwXMLTableRowPtr,5,5) +SV_DECL_PTRARR_DEL(SwXMLTableRows_Impl,SwXMLTableRowPtr,5) SV_IMPL_PTRARR(SwXMLTableRows_Impl,SwXMLTableRowPtr) SwXMLTableCell_Impl *SwXMLTableContext::GetCell( sal_uInt32 nRow, diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx index 3cf79b4077cf..87616026c93e 100644 --- a/sw/source/ui/app/appenv.cxx +++ b/sw/source/ui/app/appenv.cxx @@ -336,7 +336,7 @@ void SwModule::InsertEnv( SfxRequest& rReq ) pSh->SetNewDoc(); // Avoid performance problems // Remember Flys of this site - SvPtrarr aFlyArr(0, 5); + SvPtrarr aFlyArr(0); if( ENV_NEWDOC != nMode && !bEnvChange ) pSh->GetPageObjs( aFlyArr ); diff --git a/sw/source/ui/app/mainwn.cxx b/sw/source/ui/app/mainwn.cxx index ba73043798bd..b6b29ab965cf 100644 --- a/sw/source/ui/app/mainwn.cxx +++ b/sw/source/ui/app/mainwn.cxx @@ -70,7 +70,7 @@ void StartProgress( sal_uInt16 nMessResId, long nStartValue, long nEndValue, SwProgress *pProgress = 0; if ( !pProgressContainer ) - pProgressContainer = new SvPtrarr( 2, 2 ); + pProgressContainer = new SvPtrarr( 2 ); else { if ( 0 != (pProgress = lcl_SwFindProgress( pDocShell )) ) diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 5a7f3dcf95da..49104bf098ce 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -176,7 +176,7 @@ struct _DB_Column }; typedef _DB_Column* _DB_ColumnPtr; -SV_DECL_PTRARR_DEL( _DB_Columns, _DB_ColumnPtr, 32, 32 ) +SV_DECL_PTRARR_DEL( _DB_Columns, _DB_ColumnPtr, 32 ) SV_IMPL_PTRARR( _DB_Columns, _DB_ColumnPtr ) SV_IMPL_OP_PTRARR_SORT( SwInsDBColumns, SwInsDBColumnPtr ) @@ -1025,7 +1025,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, ++nRows; // prepare the array for the selected columns - SwInsDBColumns_SAR aColFlds( 255 >= nCols ? (sal_uInt8)nCols : 255, 5 ); + SwInsDBColumns_SAR aColFlds( 255 >= nCols ? (sal_uInt8)nCols : 255 ); for( n = 0; n < nCols; ++n ) { sal_uInt16 nFndPos; diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx index 4e025dd1316b..27faa2a4c587 100644 --- a/sw/source/ui/dbui/dbtree.cxx +++ b/sw/source/ui/dbui/dbtree.cxx @@ -74,7 +74,7 @@ struct SwConnectionData }; typedef SwConnectionData* SwConnectionDataPtr; -SV_DECL_PTRARR_DEL( SwConnectionArr, SwConnectionDataPtr, 32, 32 ) +SV_DECL_PTRARR_DEL( SwConnectionArr, SwConnectionDataPtr, 32 ) SV_IMPL_PTRARR( SwConnectionArr, SwConnectionDataPtr ) class SwDBTreeList_Impl : public cppu::WeakImplHelper1 < XContainerListener > diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 284ee74ed0c8..44a627143654 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -823,7 +823,7 @@ IMPL_LINK( SwEditRegionDlg, OkHdl, CheckBox *, EMPTYARG ) // are copied (ClearRedo!) const SwSectionFmts& rDocFmts = rSh.GetDoc()->GetSections(); - SwSectionFmts aOrigArray( 0, 5 ); + SwSectionFmts aOrigArray( 0 ); aOrigArray.Insert( &rDocFmts, 0 ); rSh.StartAllAction(); @@ -1148,7 +1148,7 @@ IMPL_LINK( SwEditRegionDlg, OptionsHdl, PushButton *, EMPTYARG ) aSet.Put( pSectRepr->GetLRSpace() ); const SwSectionFmts& rDocFmts = rSh.GetDoc()->GetSections(); - SwSectionFmts aOrigArray( 0, 5 ); + SwSectionFmts aOrigArray( 0 ); aOrigArray.Insert( &rDocFmts, 0 ); SwSectionFmt* pFmt = aOrigArray[pSectRepr->GetArrPos()]; diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx index 2fa3c324daeb..b3e81a9e9267 100644 --- a/sw/source/ui/dochdl/gloshdl.cxx +++ b/sw/source/ui/dochdl/gloshdl.cxx @@ -82,7 +82,7 @@ struct TextBlockInfo_Impl String sGroupName; }; typedef TextBlockInfo_Impl* TextBlockInfo_ImplPtr; -SV_DECL_PTRARR_DEL( TextBlockInfoArr, TextBlockInfo_ImplPtr, 0, 4 ) +SV_DECL_PTRARR_DEL( TextBlockInfoArr, TextBlockInfo_ImplPtr, 0 ) SV_IMPL_PTRARR( TextBlockInfoArr, TextBlockInfo_ImplPtr ) SV_IMPL_REF( SwDocShell ) diff --git a/sw/source/ui/envelp/labimp.hxx b/sw/source/ui/envelp/labimp.hxx index 3fdab60bd00b..79dbce3e089c 100644 --- a/sw/source/ui/envelp/labimp.hxx +++ b/sw/source/ui/envelp/labimp.hxx @@ -111,7 +111,7 @@ public: }; -SV_DECL_PTRARR_DEL( SwLabRecs, SwLabRec*, 110, 10 ) +SV_DECL_PTRARR_DEL( SwLabRecs, SwLabRec*, 110 ) #endif diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/ui/inc/dbinsdlg.hxx index 9b7485cf9a62..7b879f9fa99f 100644 --- a/sw/source/ui/inc/dbinsdlg.hxx +++ b/sw/source/ui/inc/dbinsdlg.hxx @@ -86,7 +86,7 @@ struct SwInsDBColumn }; typedef SwInsDBColumn* SwInsDBColumnPtr; -SV_DECL_PTRARR_SORT_DEL( SwInsDBColumns, SwInsDBColumnPtr, 32, 32 ) +SV_DECL_PTRARR_SORT_DEL( SwInsDBColumns, SwInsDBColumnPtr, 32 ) class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem diff --git a/sw/source/ui/inc/gloslst.hxx b/sw/source/ui/inc/gloslst.hxx index 727191d1b068..7cb847327f06 100644 --- a/sw/source/ui/inc/gloslst.hxx +++ b/sw/source/ui/inc/gloslst.hxx @@ -52,7 +52,7 @@ struct AutoTextGroup typedef AutoTextGroup* AutoTextGroupPtr; -SV_DECL_PTRARR(AutoTextGroups, AutoTextGroupPtr, 4, 4) +SV_DECL_PTRARR(AutoTextGroups, AutoTextGroupPtr, 4) class SwGlossaryList : public AutoTimer { diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx index abb955da098c..81d678b20b91 100644 --- a/sw/source/ui/inc/redlndlg.hxx +++ b/sw/source/ui/inc/redlndlg.hxx @@ -63,18 +63,18 @@ struct SwRedlineDataParent }; typedef SwRedlineDataParent* SwRedlineDataParentPtr; -SV_DECL_PTRARR_DEL(SwRedlineDataParentArr, SwRedlineDataParentPtr, 10, 20) +SV_DECL_PTRARR_DEL(SwRedlineDataParentArr, SwRedlineDataParentPtr, 10) -SV_DECL_PTRARR_SORT(SwRedlineDataParentSortArr, SwRedlineDataParentPtr, 10, 20) +SV_DECL_PTRARR_SORT(SwRedlineDataParentSortArr, SwRedlineDataParentPtr, 10) typedef SwRedlineDataChild* SwRedlineDataChildPtr; -SV_DECL_PTRARR_DEL(SwRedlineDataChildArr, SwRedlineDataChildPtr, 4, 4) +SV_DECL_PTRARR_DEL(SwRedlineDataChildArr, SwRedlineDataChildPtr, 4) typedef SvLBoxEntry* SvLBoxEntryPtr; -SV_DECL_PTRARR(SvLBoxEntryArr, SvLBoxEntryPtr, 100, 100) +SV_DECL_PTRARR(SvLBoxEntryArr, SvLBoxEntryPtr, 100) class SW_DLLPUBLIC SwRedlineAcceptDlg { diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx index ca006c2bc940..15103d0b6f49 100644 --- a/sw/source/ui/inc/regionsw.hxx +++ b/sw/source/ui/inc/regionsw.hxx @@ -66,7 +66,7 @@ namespace sfx2 *************************************************************************/ class SectRepr; typedef SectRepr* SectReprPtr; -SV_DECL_PTRARR_SORT( SectReprArr, SectReprPtr, 0, 4 ) +SV_DECL_PTRARR_SORT( SectReprArr, SectReprPtr, 0 ) class SwEditRegionDlg : public SfxModalDialog { diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx index 9788146dde63..d0f718caa5f8 100644 --- a/sw/source/ui/inc/swlbox.hxx +++ b/sw/source/ui/inc/swlbox.hxx @@ -38,7 +38,7 @@ class SwBoxEntry; class Window; -SV_DECL_PTRARR_DEL(SwEntryLst, SwBoxEntry*, 10, 10) +SV_DECL_PTRARR_DEL(SwEntryLst, SwBoxEntry*, 10) /*-------------------------------------------------------------------- Description: SwBoxEntry diff --git a/sw/source/ui/inc/uinums.hxx b/sw/source/ui/inc/uinums.hxx index 5f2f87009da6..cfb846fafc2b 100644 --- a/sw/source/ui/inc/uinums.hxx +++ b/sw/source/ui/inc/uinums.hxx @@ -39,7 +39,7 @@ class SvStream; #define MAX_NUM_RULES 9 typedef SfxPoolItem* SfxPoolItemPtr; -SV_DECL_PTRARR_DEL( _SwNumFmtsAttrs, SfxPoolItemPtr, 5,0 ) +SV_DECL_PTRARR_DEL( _SwNumFmtsAttrs, SfxPoolItemPtr, 5 ) class SW_DLLPUBLIC SwNumRulesWithName { diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx index 0e11b99e946a..5655b6c4fda2 100644 --- a/sw/source/ui/inc/unotxvw.hxx +++ b/sw/source/ui/inc/unotxvw.hxx @@ -56,7 +56,7 @@ class SdrObject; class SwView; typedef ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > * XSelectionChangeListenerPtr; -SV_DECL_PTRARR_DEL( SelectionChangeListenerArr, XSelectionChangeListenerPtr, 4, 4 ) +SV_DECL_PTRARR_DEL( SelectionChangeListenerArr, XSelectionChangeListenerPtr, 4 ) class SwXTextView : public ::com::sun::star::view::XSelectionSupplier, diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index b4fc42aa29e3..61c308b377d9 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -157,7 +157,7 @@ struct AutoMarkEntry bWord(sal_False){} }; typedef AutoMarkEntry* AutoMarkEntryPtr; -SV_DECL_PTRARR_DEL(AutoMarkEntryArr, AutoMarkEntryPtr, 0, 4) +SV_DECL_PTRARR_DEL(AutoMarkEntryArr, AutoMarkEntryPtr, 0) SV_IMPL_PTRARR(AutoMarkEntryArr, AutoMarkEntryPtr); typedef ::svt::EditBrowseBox SwEntryBrowseBox_Base; diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 1fd421c1a105..32a383fb895f 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -105,7 +105,7 @@ using namespace ::com::sun::star::container; #define NAVI_BOOKMARK_DELIM (sal_Unicode)1 typedef SwContent* SwContentPtr; -SV_DECL_PTRARR_SORT_DEL( SwContentArr, SwContentPtr, 0,4) +SV_DECL_PTRARR_SORT_DEL( SwContentArr, SwContentPtr, 0 ) SV_IMPL_OP_PTRARR_SORT(SwContentArr, SwContentPtr) sal_Bool SwContentTree::bIsInDrag = sal_False; diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx index 9ada864e4e3d..485406f3b1cb 100644 --- a/sw/source/ui/utlui/gloslst.cxx +++ b/sw/source/ui/utlui/gloslst.cxx @@ -305,7 +305,7 @@ void SwGlossaryList::Update() { std::vector<String> aFoundGroupNames; std::vector<String*> aFiles; - SvPtrarr aDateTimeArr( 16, 16 ); + SvPtrarr aDateTimeArr( 16 ); SWUnoHelper::UCB_GetFileListOfFolder( *(*pPathArr)[nPath], aFiles, &sExt, &aDateTimeArr ); |