diff options
| author | Arkadiy Illarionov <qarkai@gmail.com> | 2019-05-07 10:21:38 +0300 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-05-07 10:39:01 +0200 |
| commit | 6934a55ebe724a2011179473bb4b762d1834b9ce (patch) | |
| tree | 0bf26e946e5d25f6f7d9916ae90093c560277df9 /xmloff | |
| parent | 772fb80cc5eae10f0262d3119cd73f768166b734 (diff) | |
Get properties from both sets
Fix copypaste typo
Change-Id: I59fe87a8739b968404012b41796f1092dc0e0f7f
Reviewed-on: https://gerrit.libreoffice.org/71890
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/core/PropertySetMerger.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xmloff/source/core/PropertySetMerger.cxx b/xmloff/source/core/PropertySetMerger.cxx index ad059a2b95d1..356d6d14f83f 100644 --- a/xmloff/source/core/PropertySetMerger.cxx +++ b/xmloff/source/core/PropertySetMerger.cxx @@ -201,7 +201,7 @@ Any SAL_CALL PropertySetMergerImpl::getPropertyDefault( const OUString& aPropert Sequence< Property > SAL_CALL PropertySetMergerImpl::getProperties() { Sequence< Property > aProps1( mxPropSet1Info->getProperties() ); - Sequence< Property > aProps2( mxPropSet1Info->getProperties() ); + Sequence< Property > aProps2( mxPropSet2Info->getProperties() ); return comphelper::concatSequences(aProps1, aProps2); } |