diff options
| author | David Tardon <dtardon@redhat.com> | 2013-07-15 12:23:40 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-07-15 13:49:50 +0000 |
| commit | a5bfa0a75ddae5f5d824d439e99dff6d4329e965 (patch) | |
| tree | 998d21b6f5331cfc899ca36df12da9c20a402a32 /svx | |
| parent | 17249bb757b775f0956cdca437108943d2a50b71 (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/4910
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 5aee66783c8a..57270ea908c3 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -3030,16 +3030,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; } |