diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-09-18 21:58:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-09-19 13:44:18 +0200 |
| commit | 0c7133e3ac6b0bf21c7c79e3301a530d13534530 (patch) | |
| tree | 28b8d9e716e670c5a00f20c11245d5a0de026805 | |
| parent | d3fbfa4a4b3ef80575ec5f27ca13d937d6f52bf6 (diff) | |
allocate this SfxItemSet on stack
Change-Id: Ifab3b3508de990c42ee5c8c564cbd2d535376813
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122306
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | svx/source/table/tablecontroller.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index ec0d93d3e662..a0f1d36fd92a 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -435,7 +435,7 @@ void SvxTableController::GetState( SfxItemSet& rSet ) SdrTableObj& rTableObj(*mxTableObj); SdrModel& rModel(rTableObj.getSdrModelFromSdrObject()); - std::unique_ptr<SfxItemSet> xSet; + std::optional<SfxItemSet> oSet; bool bVertDone(false); // Iterate over all requested items in the set. @@ -451,16 +451,16 @@ void SvxTableController::GetState( SfxItemSet& rSet ) { if(!bVertDone) { - if (!xSet) + if (!oSet) { - xSet.reset(new SfxItemSet(rModel.GetItemPool())); - MergeAttrFromSelectedCells(*xSet, false); + oSet.emplace(rModel.GetItemPool()); + MergeAttrFromSelectedCells(*oSet, false); } SdrTextVertAdjust eAdj = SDRTEXTVERTADJUST_BLOCK; - if (xSet->GetItemState( SDRATTR_TEXT_VERTADJUST ) != SfxItemState::DONTCARE) - eAdj = xSet->Get(SDRATTR_TEXT_VERTADJUST).GetValue(); + if (oSet->GetItemState( SDRATTR_TEXT_VERTADJUST ) != SfxItemState::DONTCARE) + eAdj = oSet->Get(SDRATTR_TEXT_VERTADJUST).GetValue(); rSet.Put(SfxBoolItem(SID_TABLE_VERT_BOTTOM, eAdj == SDRTEXTVERTADJUST_BOTTOM)); rSet.Put(SfxBoolItem(SID_TABLE_VERT_CENTER, eAdj == SDRTEXTVERTADJUST_CENTER)); |