summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-07-15 12:23:40 +0200
committerDavid Tardon <dtardon@redhat.com>2013-07-15 12:25:15 +0200
commitd3d95afe5856ef06659d61c3572c7682e5a03766 (patch)
tree9537890d3742d35686379c4fd80c3014504f56e1
parent2d3caece27d2353d0e7d82917c32aceba45859c5 (diff)
fdo#57631 fix collection of property states
Change-Id: I607518da26c9430916d922b8e36143cc6dd76f25
-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 4c1628b3f706..68267c72953d 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;
}