[Libreoffice-commits] core.git: xmloff/source

[Arkadiy Illarionov (via logerrit)]

 xmloff/source/core/PropertySetMerger.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6934a55ebe724a2011179473bb4b762d1834b9ce
Author:     Arkadiy Illarionov <qarkai at gmail.com>
AuthorDate: Tue May 7 10:21:38 2019 +0300
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Tue May 7 10:39:01 2019 +0200

    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 at cib.de>

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);
 }