Author: alg
Date: Wed Apr 24 13:03:20 2013
New Revision: 1471393
URL: http://svn.apache.org/r1471393
Log:
i122121 Adapted ScDrawShell::GetDrawAttrState
Modified:
openoffice/trunk/main/sc/source/ui/drawfunc/drawsh2.cxx
openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
Modified: openoffice/trunk/main/sc/source/ui/drawfunc/drawsh2.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/drawfunc/drawsh2.cxx?rev=1471393&r1=1471392&r2=1471393&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/drawfunc/drawsh2.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/drawfunc/drawsh2.cxx Wed Apr 24 13:03:20
2013
@@ -307,23 +307,12 @@ void ScDrawShell::GetDrawAttrState( SfxI
if( bHasMarked )
{
- rSet.Put( pDrView->GetAttrFromMarked(sal_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(sal_False), false );
}
else
+ {
rSet.Put( pDrView->GetDefaultAttr() );
+ }
SdrPageView* pPV = pDrView->GetSdrPageView();
if ( pPV )
Modified:
openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.hxx?rev=1471393&r1=1471392&r2=1471393&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
(original)
+++ openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
Wed Apr 24 13:03:20 2013
@@ -130,15 +130,15 @@ private:
SfxBindings* mpBindings;
// to remember original positions for restoring these for different layouts
- Point maFtWidthOrigPos;
- Point maMtrWidthOrigPos;
- Point maFtHeightOrigPos;
- Point maMtrHeightOrigPos;
+ Point maFtWidthOrigPos;
+ Point maMtrWidthOrigPos;
+ Point maFtHeightOrigPos;
+ Point maMtrHeightOrigPos;
Point maCbxScaleOrigPos;
- Point maFtAngleOrigPos;
- Point maMtrAnglOrigPos;
- Point maFlipTbxOrigPos;
- Point maDialOrigPos;
+ Point maFtAngleOrigPos;
+ Point maMtrAnglOrigPos;
+ Point maFlipTbxOrigPos;
+ Point maDialOrigPos;
Point maFtFlipOrigPos;
/// bitfield
