[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source

[David Tardon]

 svx/source/unodraw/unoshape.cxx |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit a5bfa0a75ddae5f5d824d439e99dff6d4329e965
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jul 15 12:23:40 2013 +0200

    fdo#57631 fix collection of property states
    
    Change-Id: I607518da26c9430916d922b8e36143cc6dd76f25
    (cherry picked from commit d3d95afe5856ef06659d61c3572c7682e5a03766)
    Signed-off-by: David Tardon <dtardon at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/4910
    Reviewed-by: Petr Mladek <pmladek at suse.cz>
    Tested-by: Petr Mladek <pmladek at suse.cz>

diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 5aee667..57270ea 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;
 }