diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2018-11-23 01:21:29 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-11-23 10:35:18 +0100 |
| commit | b3af23568f9b9b444ae09f2a1ab4a61d212b422a (patch) | |
| tree | 65a4ecf2a01b56335ed26d113f9107ad5abaa366 /svx | |
| parent | 8bc69c4a45d1fc4fe73dd579bc5dc828aaa9b1e7 (diff) | |
tdf#114836, only set changed SfxItemSet properties
By always setting all existing properties again the calls started
to differ between XMultiPropertySet::setPropertyValues and
XPropertySet::setPropertyValue. This patch reduces the changes in
the called methods. We can not avoid slight differences but at least
the risk is minimized that something is unexpectedly changed.
Change-Id: I5866db7be2829e6aba930f620f45db655df4e3f7
Reviewed-on: https://gerrit.libreoffice.org/63854
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 80cf278d365a2d357c70b8c28947c91fa97e7a99)
Reviewed-on: https://gerrit.libreoffice.org/63857
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/unodraw/unoshape.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index f2bfa4f94bd8..1a187f773d64 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -1687,7 +1687,11 @@ void SvxShape::_setPropertyValue( const OUString& rPropertyName, const uno::Any& { if( mpImpl->mpItemSet == nullptr ) { - mpImpl->mpItemSet = GetSdrObject()->GetMergedItemSet().Clone(); + mpImpl->mpItemSet.reset(new SfxItemSet( GetSdrObject()->getSdrModelFromSdrObject().GetItemPool(), {{pMap->nWID, pMap->nWID}})); + } + else + { + mpImpl->mpItemSet->MergeRange(pMap->nWID, pMap->nWID); } pSet = mpImpl->mpItemSet.get(); } |