From 151fbebf8ced85ee8582fe1ad8a8176e061845a6 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 4 Aug 2014 19:22:55 +0200 Subject: Consistency around SdrOnOffItem in svx/sdtagitm.hxx ...similar to what has been done for svx/sdtmfitm.hxx in 6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 "Remove unused ctors" and 68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem." Change-Id: I6d8b3709d6d55bd6958d38f262141c43779dfdcc --- sd/source/core/sdpage.cxx | 16 ++++++++-------- sd/source/core/stlpool.cxx | 2 +- sd/source/filter/ppt/pptin.cxx | 2 +- sd/source/ui/func/fuconcs.cxx | 2 +- sd/source/ui/func/fuconrec.cxx | 4 ++-- sd/source/ui/func/futext.cxx | 32 ++++++++++++++++---------------- sd/source/ui/view/drviews2.cxx | 2 +- 7 files changed, 30 insertions(+), 30 deletions(-) (limited to 'sd') diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 351f544fff08..8f8f6e613a75 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -427,9 +427,9 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, bool bVertical, const Rec // potential problem: This action was still NOT // adapted for vertical text. This sure needs to be done. if(bVertical) - aTempAttr.Put(SdrTextAutoGrowWidthItem(false)); + aTempAttr.Put(makeSdrTextAutoGrowWidthItem(false)); else - aTempAttr.Put(SdrTextAutoGrowHeightItem(false)); + aTempAttr.Put(makeSdrTextAutoGrowHeightItem(false)); } // check if we need another vertical adjustment than the default @@ -2240,13 +2240,13 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind, SfxItemSet aTempAttr( ((SdDrawDocument*) pModel)->GetPool() ); SdrMetricItem aMinHeight( makeSdrTextMinFrameHeightItem(aRect.GetSize().Height()) ); aTempAttr.Put( aMinHeight ); - aTempAttr.Put( SdrTextAutoGrowHeightItem(false) ); + aTempAttr.Put( makeSdrTextAutoGrowHeightItem(false) ); pTextObject->SetMergedItemSet(aTempAttr); pTextObject->SetLogicRect(aRect); // switch on AutoGrowHeight SfxItemSet aAttr( ((SdDrawDocument*) pModel)->GetPool() ); - aAttr.Put( SdrTextAutoGrowHeightItem(true) ); + aAttr.Put( makeSdrTextAutoGrowHeightItem(true) ); pTextObject->SetMergedItemSet(aAttr); } @@ -2257,13 +2257,13 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind, SfxItemSet aTempAttr( ((SdDrawDocument*) pModel)->GetPool() ); SdrMetricItem aMinWidth( makeSdrTextMinFrameWidthItem(aRect.GetSize().Width()) ); aTempAttr.Put( aMinWidth ); - aTempAttr.Put( SdrTextAutoGrowWidthItem(false) ); + aTempAttr.Put( makeSdrTextAutoGrowWidthItem(false) ); pTextObject->SetMergedItemSet(aTempAttr); pTextObject->SetLogicRect(aRect); // switch on AutoGrowWidth SfxItemSet aAttr( ((SdDrawDocument*) pModel)->GetPool() ); - aAttr.Put( SdrTextAutoGrowWidthItem(true) ); + aAttr.Put( makeSdrTextAutoGrowWidthItem(true) ); pTextObject->SetMergedItemSet(aAttr); } } @@ -2284,8 +2284,8 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind, if( bVertical && (( eObjKind == PRESOBJ_TITLE) || (eObjKind == PRESOBJ_OUTLINE))) { SfxItemSet aNewSet(pObj->GetMergedItemSet()); - aNewSet.Put( SdrTextAutoGrowWidthItem(true) ); - aNewSet.Put( SdrTextAutoGrowHeightItem(false) ); + aNewSet.Put( makeSdrTextAutoGrowWidthItem(true) ); + aNewSet.Put( makeSdrTextAutoGrowHeightItem(false) ); if( eObjKind == PRESOBJ_OUTLINE ) { aNewSet.Put( SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP) ); diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index cb11f738ccea..79475e5184be 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -255,7 +255,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool rSet.Put( XLineStyleItem(XLINE_NONE) ); rSet.Put( XFillStyleItem(drawing::FillStyle_NONE) ); rSet.Put( SdrTextFitToSizeTypeItem(SDRTEXTFIT_AUTOFIT) ); - rSet.Put( SdrTextAutoGrowHeightItem(false) ); + rSet.Put( makeSdrTextAutoGrowHeightItem(false) ); // #i16874# enable kerning by default but only for new documents rSet.Put( SvxAutoKernItem( true, EE_CHAR_PAIRKERNING ) ); diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index a84e29dcea91..01a683722781 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2276,7 +2276,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj SfxItemSet aTempAttr( mpDoc->GetPool() ); SdrMetricItem aMinHeight( makeSdrTextMinFrameHeightItem(pText->GetLogicRect().GetSize().Height()) ); aTempAttr.Put( aMinHeight ); - SdrTextAutoGrowHeightItem aAutoGrowHeight( false ); + SdrOnOffItem aAutoGrowHeight( makeSdrTextAutoGrowHeightItem(false) ); aTempAttr.Put( aAutoGrowHeight ); pText->SetMergedItemSet(aTempAttr); } diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index 8d1c003a52c3..eeaf6485ce1f 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -254,7 +254,7 @@ void FuConstructCustomShape::SetAttributes( SdrObject* pObj ) pObj->SetMergedItem( SvxAdjustItem( SVX_ADJUST_CENTER, EE_PARA_JUST ) ); pObj->SetMergedItem( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) ); pObj->SetMergedItem( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_BLOCK ) ); - pObj->SetMergedItem( SdrTextAutoGrowHeightItem( false ) ); + pObj->SetMergedItem( makeSdrTextAutoGrowHeightItem( false ) ); ((SdrObjCustomShape*)pObj)->MergeDefaultAttributes( &aCustomShape ); } } diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index a92d4bd24f4f..ebd76dbc192c 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -472,8 +472,8 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj) Size aSize(pObj->GetLogicRect().GetSize()); rAttr.Put( makeSdrTextMinFrameHeightItem( aSize.Height() ) ); rAttr.Put( makeSdrTextMinFrameWidthItem( aSize.Width() ) ); - rAttr.Put( SdrTextAutoGrowHeightItem( true ) ); - rAttr.Put( SdrTextAutoGrowWidthItem( true ) ); + rAttr.Put( makeSdrTextAutoGrowHeightItem( true ) ); + rAttr.Put( makeSdrTextAutoGrowWidthItem( true ) ); // Support full with for vertical caption objects, too if(SID_DRAW_CAPTION == nSlotId) diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index d7075e4b4934..b13949d3785a 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -481,8 +481,8 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj) object, otherwise we draw to much */ SfxItemSet aSet(mpViewShell->GetPool()); aSet.Put(makeSdrTextMinFrameHeightItem(0)); - aSet.Put(SdrTextAutoGrowWidthItem(false)); - aSet.Put(SdrTextAutoGrowHeightItem(true)); + aSet.Put(makeSdrTextAutoGrowWidthItem(false)); + aSet.Put(makeSdrTextAutoGrowHeightItem(true)); pTxtObj->SetMergedItemSet(aSet); pTxtObj->AdjustTextFrameWidthAndHeight(); aSet.Put(makeSdrTextMaxFrameHeightItem(pTxtObj->GetLogicRect().GetSize().Height())); @@ -492,8 +492,8 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj) { SfxItemSet aSet(mpViewShell->GetPool()); aSet.Put(makeSdrTextMinFrameWidthItem(0)); - aSet.Put(SdrTextAutoGrowWidthItem(true)); - aSet.Put(SdrTextAutoGrowHeightItem(false)); + aSet.Put(makeSdrTextAutoGrowWidthItem(true)); + aSet.Put(makeSdrTextAutoGrowHeightItem(false)); // Needs to be set since default is SDRTEXTHORZADJUST_BLOCK aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT)); @@ -510,8 +510,8 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj) // draw text object, needs to be initialized when vertical text is used SfxItemSet aSet(mpViewShell->GetPool()); - aSet.Put(SdrTextAutoGrowWidthItem(true)); - aSet.Put(SdrTextAutoGrowHeightItem(false)); + aSet.Put(makeSdrTextAutoGrowWidthItem(true)); + aSet.Put(makeSdrTextAutoGrowHeightItem(false)); // Set defaults for vertical klick-n'drag text object, pool defaults are: // SdrTextVertAdjustItem: SDRTEXTVERTADJUST_TOP @@ -531,8 +531,8 @@ void FuText::ImpSetAttributesFitToSize(SdrTextObj* pTxtObj) SfxItemSet aSet(mpViewShell->GetPool(), SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWWIDTH); SdrFitToSizeType eFTS = SDRTEXTFIT_PROPORTIONAL; aSet.Put(SdrTextFitToSizeTypeItem(eFTS)); - aSet.Put(SdrTextAutoGrowHeightItem(false)); - aSet.Put(SdrTextAutoGrowWidthItem(false)); + aSet.Put(makeSdrTextAutoGrowHeightItem(false)); + aSet.Put(makeSdrTextAutoGrowWidthItem(false)); pTxtObj->SetMergedItemSet(aSet); pTxtObj->AdjustTextFrameWidthAndHeight(); } @@ -543,8 +543,8 @@ void FuText::ImpSetAttributesFitToSizeVertical(SdrTextObj* pTxtObj) SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWWIDTH); SdrFitToSizeType eFTS = SDRTEXTFIT_PROPORTIONAL; aSet.Put(SdrTextFitToSizeTypeItem(eFTS)); - aSet.Put(SdrTextAutoGrowHeightItem(false)); - aSet.Put(SdrTextAutoGrowWidthItem(false)); + aSet.Put(makeSdrTextAutoGrowHeightItem(false)); + aSet.Put(makeSdrTextAutoGrowWidthItem(false)); pTxtObj->SetMergedItemSet(aSet); pTxtObj->AdjustTextFrameWidthAndHeight(); } @@ -560,8 +560,8 @@ void FuText::ImpSetAttributesFitCommon(SdrTextObj* pTxtObj) SfxItemSet aSet(mpViewShell->GetPool()); aSet.Put(makeSdrTextMinFrameHeightItem(0)); aSet.Put(makeSdrTextMaxFrameHeightItem(0)); - aSet.Put(SdrTextAutoGrowHeightItem(true)); - aSet.Put(SdrTextAutoGrowWidthItem(false)); + aSet.Put(makeSdrTextAutoGrowHeightItem(true)); + aSet.Put(makeSdrTextAutoGrowWidthItem(false)); pTxtObj->SetMergedItemSet(aSet); } else if( nSlotId == SID_ATTR_CHAR_VERTICAL ) @@ -569,8 +569,8 @@ void FuText::ImpSetAttributesFitCommon(SdrTextObj* pTxtObj) SfxItemSet aSet(mpViewShell->GetPool()); aSet.Put(makeSdrTextMinFrameWidthItem(0)); aSet.Put(makeSdrTextMaxFrameWidthItem(0)); - aSet.Put(SdrTextAutoGrowWidthItem(true)); - aSet.Put(SdrTextAutoGrowHeightItem(false)); + aSet.Put(makeSdrTextAutoGrowWidthItem(true)); + aSet.Put(makeSdrTextAutoGrowHeightItem(false)); pTxtObj->SetMergedItemSet(aSet); } @@ -789,8 +789,8 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt) SfxItemSet aSet(mpViewShell->GetPool()); aSet.Put(makeSdrTextMinFrameHeightItem(0)); aSet.Put(makeSdrTextMinFrameWidthItem(0)); - aSet.Put(SdrTextAutoGrowHeightItem(true)); - aSet.Put(SdrTextAutoGrowWidthItem(true)); + aSet.Put(makeSdrTextAutoGrowHeightItem(true)); + aSet.Put(makeSdrTextAutoGrowWidthItem(true)); if(nSlotId == SID_ATTR_CHAR_VERTICAL) { diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index c135ee37da3e..3371a41f2dc7 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -1969,7 +1969,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) OutlinerParaObject* pOutlParaObject = pOutl->CreateParaObject(); SdrRectObj* pRectObj = new SdrRectObj( OBJ_TEXT ); - pRectObj->SetMergedItem(SdrTextAutoGrowWidthItem(true)); + pRectObj->SetMergedItem(makeSdrTextAutoGrowWidthItem(true)); pOutl->UpdateFields(); pOutl->SetUpdateMode( true ); -- cgit