diff options
| author | David Tardon <dtardon@redhat.com> | 2013-07-15 12:23:40 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-07-16 09:45:35 +0000 |
| commit | 2ab2d6b6f8930459e992aa4d856ce8cb59f2b87b (patch) | |
| tree | 8990ee16c4a9b9f7d6418c8f4c0e8fa2b5728f00 | |
| parent | 1f830323da936ca6ffd1751f1bd9845b9f431730 (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/4911
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
| -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; } |