summaryrefslogtreecommitdiffstats
path: root/svx
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2016-10-05 15:26:43 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-10-15 02:57:40 +0000
commit810e664de088721b6452016d83fb3ef3e6ca5eb1 (patch)
treea3f69d5acea6065c085d88c52e61c5642a2d08e0 /svx
parentavoid exception (diff)
downloadcore-810e664de088721b6452016d83fb3ef3e6ca5eb1.tar.gz
core-810e664de088721b6452016d83fb3ef3e6ca5eb1.zip
use initializer list ...
... for default pool item arrays and item infos Change-Id: I79db1b4e4a78471d81409dd976a912eeccf1065b Reviewed-on: https://gerrit.libreoffice.org/29540 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/xoutdev/xpool.cxx11
1 files changed, 4 insertions, 7 deletions
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index d427aa07e164..a0bab6876ed8 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -24,10 +24,10 @@
#include <svx/svxids.hrc>
#include <svl/itemset.hxx>
-XOutdevItemPool::XOutdevItemPool(
- SfxItemPool* _pMaster,
- bool bLoadRefCounts)
-: SfxItemPool("XOutdevItemPool", SDRATTR_START, SDRATTR_END, nullptr, nullptr, bLoadRefCounts)
+XOutdevItemPool::XOutdevItemPool(SfxItemPool* _pMaster, bool bLoadRefCounts)
+ : SfxItemPool("XOutdevItemPool", SDRATTR_START, SDRATTR_END, nullptr, nullptr, bLoadRefCounts)
+ , mppLocalPoolDefaults(new SfxPoolItem*[SDRATTR_END - SDRATTR_START + 1])
+ , mpLocalItemInfos(new SfxItemInfo[SDRATTR_END - SDRATTR_START + 1])
{
// prepare some defaults
const OUString aNullStr;
@@ -58,8 +58,6 @@ XOutdevItemPool::XOutdevItemPool(
}
// prepare PoolDefaults
- mppLocalPoolDefaults = new SfxPoolItem*[GetLastWhich() - GetFirstWhich() + 1];
-
mppLocalPoolDefaults[XATTR_LINESTYLE -XATTR_START] = new XLineStyleItem;
mppLocalPoolDefaults[XATTR_LINEDASH -XATTR_START] = new XLineDashItem(this,aNullDash);
mppLocalPoolDefaults[XATTR_LINEWIDTH -XATTR_START] = new XLineWidthItem;
@@ -113,7 +111,6 @@ XOutdevItemPool::XOutdevItemPool(
mppLocalPoolDefaults[XATTRSET_FILL - XATTR_START] = new XFillAttrSetItem(pSet);
// create ItemInfos
- mpLocalItemInfos = new SfxItemInfo[GetLastWhich() - GetFirstWhich() + 1];
for(sal_uInt16 i(GetFirstWhich()); i <= GetLastWhich(); i++)
{
mpLocalItemInfos[i - XATTR_START]._nSID = 0;