diff options
author | David Tardon <dtardon@redhat.com> | 2013-07-15 12:23:40 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2013-11-05 11:34:24 +0100 |
commit | 9e660185f64e7bf75868f75b1db39b424785f98f (patch) | |
tree | efe978e2189877c4fa28906d5447e2b73d569c2d /svx | |
parent | c0079f102edc2e574bb72840253139bceac29220 (diff) |
fdo#57631 fix collection of property states
Change-Id: I607518da26c9430916d922b8e36143cc6dd76f25
(cherry picked from commit d3d95afe5856ef06659d61c3572c7682e5a03766)
Signed-off-by: David Tardon <dtardon@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/4912
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/unodraw/unoshape.cxx | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 4c9a52eeef4e..5e3ef5f3ba00 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -3043,16 +3043,8 @@ uno::Sequence< beans::PropertyState > SAL_CALL SvxShape::getPropertyStates( cons uno::Sequence< beans::PropertyState > aRet( nCount ); beans::PropertyState* pState = aRet.getArray(); - if( mpImpl->mpMaster ) - { - for( sal_Int32 nIdx = 0; nIdx < nCount; nIdx++ ) - pState[nIdx] = mpImpl->mpMaster->getPropertyState( pNames[nIdx] ); - } - else - { - for( sal_Int32 nIdx = 0; nIdx < nCount; nIdx++ ) - pState[nIdx] = _getPropertyState( pNames[nIdx] ); - } + for( sal_Int32 nIdx = 0; nIdx < nCount; nIdx++ ) + pState[nIdx] = getPropertyState( pNames[nIdx] ); return aRet; } |