summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-07-15 12:23:40 +0200
committerPetr Mladek <pmladek@suse.cz>2013-07-15 14:11:49 +0000
commit5ecbe5df8034895273942fd19a3cd6c9544e1025 (patch)
tree8d51d69c3635727a4201fba0eb86a617d727f17c
parentaab42944ad90e86ac43dedc7e11be8eb2019d833 (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>
-rw-r--r--svx/source/unodraw/unoshape.cxx12
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;
}