Skip to content

C
core
Kaydet (Commit) 0f48d918 authored tarafından Armin Le Grand's avatar Armin Le Grand Kaydeden (comit) Michael Meeks
Dosyalara gözat
Seçenekler

Related: #ii122121# Adapted ScDrawShell::GetDrawAttrState 

(cherry picked from commit 81203126)

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

Change-Id: I19b1b7e83f16b618ecac95f000c15a60288ce5ae
üst 4d814ec1
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 14 deletions
sc/source/ui/drawfunc/drawsh2.cxx
Dosyayı görüntüle @ 0f48d918
...@@ -295,23 +295,12 @@ void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet ) ...@@ -295,23 +295,12 @@ void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet )
if( bHasMarked ) if( bHasMarked )
{ {
rSet.Put( pDrView->GetAttrFromMarked(false) ); rSet.Put( pDrView->GetAttrFromMarked(false), 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();
}
} }
else else
{
rSet.Put( pDrView->GetDefaultAttr() ); rSet.Put( pDrView->GetDefaultAttr() );
}
SdrPageView* pPV = pDrView->GetSdrPageView(); SdrPageView* pPV = pDrView->GetSdrPageView();
if ( pPV ) if ( pPV )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment