Kaydet (Commit) 810e664d authored tarafından Jochen Nitschke's avatar Jochen Nitschke Kaydeden (comit) Markus Mohrhard

use initializer list ...

... for default pool item arrays and item infos

Change-Id: I79db1b4e4a78471d81409dd976a912eeccf1065b
Reviewed-on: https://gerrit.libreoffice.org/29540Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMarkus Mohrhard <markus.mohrhard@googlemail.com>
üst 99e3cf1c
...@@ -37,13 +37,13 @@ namespace chart ...@@ -37,13 +37,13 @@ namespace chart
{ {
ChartItemPool::ChartItemPool(): ChartItemPool::ChartItemPool():
SfxItemPool( "ChartItemPool" , SCHATTR_START, SCHATTR_END, nullptr, nullptr ) SfxItemPool( "ChartItemPool" , SCHATTR_START, SCHATTR_END, nullptr, nullptr ),
pItemInfos(new SfxItemInfo[SCHATTR_END - SCHATTR_START + 1])
{ {
/************************************************************************** /**************************************************************************
* PoolDefaults * PoolDefaults
**************************************************************************/ **************************************************************************/
SfxPoolItem** ppPoolDefaults = new SfxPoolItem*[SCHATTR_END - SCHATTR_START + 1]; SfxPoolItem** ppPoolDefaults = new SfxPoolItem*[SCHATTR_END - SCHATTR_START + 1];
ppPoolDefaults[SCHATTR_DATADESCR_SHOW_NUMBER - SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_SHOW_NUMBER); ppPoolDefaults[SCHATTR_DATADESCR_SHOW_NUMBER - SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_SHOW_NUMBER);
ppPoolDefaults[SCHATTR_DATADESCR_SHOW_PERCENTAGE- SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_SHOW_PERCENTAGE); ppPoolDefaults[SCHATTR_DATADESCR_SHOW_PERCENTAGE- SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_SHOW_PERCENTAGE);
ppPoolDefaults[SCHATTR_DATADESCR_SHOW_CATEGORY - SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_SHOW_CATEGORY); ppPoolDefaults[SCHATTR_DATADESCR_SHOW_CATEGORY - SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_SHOW_CATEGORY);
...@@ -164,8 +164,6 @@ ChartItemPool::ChartItemPool(): ...@@ -164,8 +164,6 @@ ChartItemPool::ChartItemPool():
/************************************************************************** /**************************************************************************
* ItemInfos * ItemInfos
**************************************************************************/ **************************************************************************/
pItemInfos = new SfxItemInfo[SCHATTR_END - SCHATTR_START + 1];
const sal_uInt16 nMax = SCHATTR_END - SCHATTR_START + 1; const sal_uInt16 nMax = SCHATTR_END - SCHATTR_START + 1;
for( sal_uInt16 i = 0; i < nMax; i++ ) for( sal_uInt16 i = 0; i < nMax; i++ )
{ {
......
...@@ -55,10 +55,11 @@ ScMessagePool::ScMessagePool() ...@@ -55,10 +55,11 @@ ScMessagePool::ScMessagePool()
aGlobalUserListItem ( ScUserListItem ( SCITEM_USERLIST ) ), aGlobalUserListItem ( ScUserListItem ( SCITEM_USERLIST ) ),
aPrintWarnItem ( SfxBoolItem ( SCITEM_PRINTWARN, false ) ), aPrintWarnItem ( SfxBoolItem ( SCITEM_PRINTWARN, false ) ),
aCondFormatDlgItem ( ScCondFormatDlgItem ( nullptr, -1, false ) ) aCondFormatDlgItem ( ScCondFormatDlgItem ( nullptr, -1, false ) ),
{
ppPoolDefaults = new SfxPoolItem*[MSGPOOL_END - MSGPOOL_START + 1];
ppPoolDefaults(new SfxPoolItem*[MSGPOOL_END - MSGPOOL_START + 1]),
pDocPool(new ScDocumentPool)
{
ppPoolDefaults[SCITEM_STRING - MSGPOOL_START] = &aGlobalStringItem; ppPoolDefaults[SCITEM_STRING - MSGPOOL_START] = &aGlobalStringItem;
ppPoolDefaults[SCITEM_SEARCHDATA - MSGPOOL_START] = &aGlobalSearchItem; ppPoolDefaults[SCITEM_SEARCHDATA - MSGPOOL_START] = &aGlobalSearchItem;
ppPoolDefaults[SCITEM_SORTDATA - MSGPOOL_START] = &aGlobalSortItem; ppPoolDefaults[SCITEM_SORTDATA - MSGPOOL_START] = &aGlobalSortItem;
...@@ -73,8 +74,6 @@ ScMessagePool::ScMessagePool() ...@@ -73,8 +74,6 @@ ScMessagePool::ScMessagePool()
SetDefaults( ppPoolDefaults ); SetDefaults( ppPoolDefaults );
pDocPool = new ScDocumentPool;
SetSecondaryPool( pDocPool ); SetSecondaryPool( pDocPool );
} }
......
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
#include <svx/svxids.hrc> #include <svx/svxids.hrc>
#include <svl/itemset.hxx> #include <svl/itemset.hxx>
XOutdevItemPool::XOutdevItemPool( XOutdevItemPool::XOutdevItemPool(SfxItemPool* _pMaster, bool bLoadRefCounts)
SfxItemPool* _pMaster, : SfxItemPool("XOutdevItemPool", SDRATTR_START, SDRATTR_END, nullptr, nullptr, bLoadRefCounts)
bool bLoadRefCounts) , mppLocalPoolDefaults(new SfxPoolItem*[SDRATTR_END - SDRATTR_START + 1])
: SfxItemPool("XOutdevItemPool", SDRATTR_START, SDRATTR_END, nullptr, nullptr, bLoadRefCounts) , mpLocalItemInfos(new SfxItemInfo[SDRATTR_END - SDRATTR_START + 1])
{ {
// prepare some defaults // prepare some defaults
const OUString aNullStr; const OUString aNullStr;
...@@ -58,8 +58,6 @@ XOutdevItemPool::XOutdevItemPool( ...@@ -58,8 +58,6 @@ XOutdevItemPool::XOutdevItemPool(
} }
// prepare PoolDefaults // prepare PoolDefaults
mppLocalPoolDefaults = new SfxPoolItem*[GetLastWhich() - GetFirstWhich() + 1];
mppLocalPoolDefaults[XATTR_LINESTYLE -XATTR_START] = new XLineStyleItem; mppLocalPoolDefaults[XATTR_LINESTYLE -XATTR_START] = new XLineStyleItem;
mppLocalPoolDefaults[XATTR_LINEDASH -XATTR_START] = new XLineDashItem(this,aNullDash); mppLocalPoolDefaults[XATTR_LINEDASH -XATTR_START] = new XLineDashItem(this,aNullDash);
mppLocalPoolDefaults[XATTR_LINEWIDTH -XATTR_START] = new XLineWidthItem; mppLocalPoolDefaults[XATTR_LINEWIDTH -XATTR_START] = new XLineWidthItem;
...@@ -113,7 +111,6 @@ XOutdevItemPool::XOutdevItemPool( ...@@ -113,7 +111,6 @@ XOutdevItemPool::XOutdevItemPool(
mppLocalPoolDefaults[XATTRSET_FILL - XATTR_START] = new XFillAttrSetItem(pSet); mppLocalPoolDefaults[XATTRSET_FILL - XATTR_START] = new XFillAttrSetItem(pSet);
// create ItemInfos // create ItemInfos
mpLocalItemInfos = new SfxItemInfo[GetLastWhich() - GetFirstWhich() + 1];
for(sal_uInt16 i(GetFirstWhich()); i <= GetLastWhich(); i++) for(sal_uInt16 i(GetFirstWhich()); i <= GetLastWhich(); i++)
{ {
mpLocalItemInfos[i - XATTR_START]._nSID = 0; mpLocalItemInfos[i - XATTR_START]._nSID = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment