[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sc/source

[Armin Le Grand]

 sc/source/ui/drawfunc/drawsh2.cxx |   17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

New commits:
commit c8c260a3afb52a416c84180e9609a9229233cf70
Author: Armin Le Grand <a...@apache.org>
Date:   Wed Apr 24 12:03:20 2013 +0000

    Related: #ii122121# Adapted ScDrawShell::GetDrawAttrState
    
    (cherry picked from commit 8120312665d94223a1e506fb6f46d2e0e9bc30ad)
    
    Conflicts:
        sc/source/ui/drawfunc/drawsh2.cxx
    
    Change-Id: I19b1b7e83f16b618ecac95f000c15a60288ce5ae

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 )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits