Kaydet (Commit) 9a6d1c6e authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Consistency around SdrYesNoItem in svx/sxmspitm.hxx

...similar to what has been done for svx/sdtmfitm.hxx in
6a2ea81c "Remove unused ctors" and
68969cc6 "Consistency around SdrMetricItem."

Change-Id: If7a3c3834f63bd0b358da4d05e9510c3f695c5d0
üst 970ad502
...@@ -22,23 +22,13 @@ ...@@ -22,23 +22,13 @@
#include <svx/svddef.hxx> #include <svx/svddef.hxx>
#include <svx/sdynitm.hxx> #include <svx/sdynitm.hxx>
inline SdrYesNoItem makeSdrObjMoveProtectItem(bool bOn) {
return SdrYesNoItem(SDRATTR_OBJMOVEPROTECT, bOn);
}
// class SdrMoveProtectItem inline SdrYesNoItem makeSdrObjSizeProtectItem(bool bOn) {
return SdrYesNoItem(SDRATTR_OBJSIZEPROTECT, bOn);
class SdrObjMoveProtectItem: public SdrYesNoItem { }
public:
SdrObjMoveProtectItem(bool bOn=false): SdrYesNoItem(SDRATTR_OBJMOVEPROTECT,bOn) {}
SdrObjMoveProtectItem(SvStream& rIn): SdrYesNoItem(SDRATTR_OBJMOVEPROTECT,rIn) {}
};
// class SdrSizeProtectItem
class SdrObjSizeProtectItem: public SdrYesNoItem {
public:
SdrObjSizeProtectItem(bool bOn=false): SdrYesNoItem(SDRATTR_OBJSIZEPROTECT,bOn) {}
SdrObjSizeProtectItem(SvStream& rIn): SdrYesNoItem(SDRATTR_OBJSIZEPROTECT,rIn) {}
};
#endif #endif
......
...@@ -201,8 +201,8 @@ SdrItemPool::SdrItemPool( ...@@ -201,8 +201,8 @@ SdrItemPool::SdrItemPool(
mppLocalPoolDefaults[SDRATTR_CIRCKIND -SDRATTR_START]=new SdrCircKindItem; mppLocalPoolDefaults[SDRATTR_CIRCKIND -SDRATTR_START]=new SdrCircKindItem;
mppLocalPoolDefaults[SDRATTR_CIRCSTARTANGLE-SDRATTR_START]=new SdrCircStartAngleItem; mppLocalPoolDefaults[SDRATTR_CIRCSTARTANGLE-SDRATTR_START]=new SdrCircStartAngleItem;
mppLocalPoolDefaults[SDRATTR_CIRCENDANGLE -SDRATTR_START]=new SdrCircEndAngleItem; mppLocalPoolDefaults[SDRATTR_CIRCENDANGLE -SDRATTR_START]=new SdrCircEndAngleItem;
mppLocalPoolDefaults[SDRATTR_OBJMOVEPROTECT -SDRATTR_START]=new SdrObjMoveProtectItem; mppLocalPoolDefaults[SDRATTR_OBJMOVEPROTECT -SDRATTR_START]=new SdrYesNoItem(SDRATTR_OBJMOVEPROTECT, false);
mppLocalPoolDefaults[SDRATTR_OBJSIZEPROTECT -SDRATTR_START]=new SdrObjSizeProtectItem; mppLocalPoolDefaults[SDRATTR_OBJSIZEPROTECT -SDRATTR_START]=new SdrYesNoItem(SDRATTR_OBJSIZEPROTECT, false);
mppLocalPoolDefaults[SDRATTR_OBJPRINTABLE -SDRATTR_START]=new SdrObjPrintableItem; mppLocalPoolDefaults[SDRATTR_OBJPRINTABLE -SDRATTR_START]=new SdrObjPrintableItem;
mppLocalPoolDefaults[SDRATTR_OBJVISIBLE -SDRATTR_START]=new SdrObjVisibleItem; mppLocalPoolDefaults[SDRATTR_OBJVISIBLE -SDRATTR_START]=new SdrObjVisibleItem;
mppLocalPoolDefaults[SDRATTR_LAYERID -SDRATTR_START]=new SdrLayerIdItem; mppLocalPoolDefaults[SDRATTR_LAYERID -SDRATTR_START]=new SdrLayerIdItem;
......
...@@ -2203,11 +2203,11 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) ...@@ -2203,11 +2203,11 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
} }
if (rAttr.GetItemState(SDRATTR_OBJMOVEPROTECT,true,&pPoolItem)==SFX_ITEM_SET) { if (rAttr.GetItemState(SDRATTR_OBJMOVEPROTECT,true,&pPoolItem)==SFX_ITEM_SET) {
bool b=((const SdrObjMoveProtectItem*)pPoolItem)->GetValue(); bool b=((const SdrYesNoItem*)pPoolItem)->GetValue();
SetMoveProtect(b); SetMoveProtect(b);
} }
if (rAttr.GetItemState(SDRATTR_OBJSIZEPROTECT,true,&pPoolItem)==SFX_ITEM_SET) { if (rAttr.GetItemState(SDRATTR_OBJSIZEPROTECT,true,&pPoolItem)==SFX_ITEM_SET) {
bool b=((const SdrObjSizeProtectItem*)pPoolItem)->GetValue(); bool b=((const SdrYesNoItem*)pPoolItem)->GetValue();
SetResizeProtect(b); SetResizeProtect(b);
} }
...@@ -2283,8 +2283,8 @@ void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr, bool bMerge) const ...@@ -2283,8 +2283,8 @@ void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr, bool bMerge) const
{ {
const Rectangle& rSnap=GetSnapRect(); const Rectangle& rSnap=GetSnapRect();
const Rectangle& rLogic=GetLogicRect(); const Rectangle& rLogic=GetLogicRect();
lcl_SetItem(rAttr,bMerge,SdrObjMoveProtectItem(IsMoveProtect())); lcl_SetItem(rAttr,bMerge,makeSdrObjMoveProtectItem(IsMoveProtect()));
lcl_SetItem(rAttr,bMerge,SdrObjSizeProtectItem(IsResizeProtect())); lcl_SetItem(rAttr,bMerge,makeSdrObjSizeProtectItem(IsResizeProtect()));
lcl_SetItem(rAttr,bMerge,SdrObjPrintableItem(IsPrintable())); lcl_SetItem(rAttr,bMerge,SdrObjPrintableItem(IsPrintable()));
lcl_SetItem(rAttr,bMerge,SdrObjVisibleItem(IsVisible())); lcl_SetItem(rAttr,bMerge,SdrObjVisibleItem(IsVisible()));
lcl_SetItem(rAttr,bMerge,SdrRotateAngleItem(GetRotateAngle())); lcl_SetItem(rAttr,bMerge,SdrRotateAngleItem(GetRotateAngle()));
......
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