commit 0f48d9182530e992114d3338889e631c462fc80b
author Armin Le Grand <alg@apache.org> Wed Apr 24 12:03:20 2013 +0000
committer Michael Meeks <michael.meeks@suse.com> Mon May 20 11:33:21 2013 +0100
tree a2e15a9e43ef4f555323f71dbb5605dd94a9e801
parent 4d814ec1518c98d2ca251a5a10287f40a427ea6e

Related: #ii122121# Adapted ScDrawShell::GetDrawAttrState

(cherry picked from commit 8120312665d94223a1e506fb6f46d2e0e9bc30ad)

Conflicts:
	sc/source/ui/drawfunc/drawsh2.cxx

Change-Id: I19b1b7e83f16b618ecac95f000c15a60288ce5ae

sc/source/ui/drawfunc/drawsh2.cxx

diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx
index b63732a..47df366 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -295,23 +295,12 @@ void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet )

    if( bHasMarked )
    {
        rSet.Put( pDrView->GetAttrFromMarked(false) );

        // Wenn die View selektierte Objekte besitzt, muessen entspr. Items
        // von SFX_ITEM_DEFAULT (_ON) auf SFX_ITEM_DISABLED geaendert werden

        SfxWhichIter aIter( rSet, XATTR_LINE_FIRST, XATTR_FILL_LAST );
        sal_uInt16 nWhich = aIter.FirstWhich();
        while( nWhich )
        {
            if( SFX_ITEM_DEFAULT == rSet.GetItemState( nWhich ) )
                rSet.DisableItem( nWhich );

            nWhich = aIter.NextWhich();
        }
        rSet.Put( pDrView->GetAttrFromMarked(false), false );
    }
    else
    {
        rSet.Put( pDrView->GetDefaultAttr() );
    }

    SdrPageView* pPV = pDrView->GetSdrPageView();
    if ( pPV )