summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/core/drawdoc4.cxx8
-rw-r--r--sd/source/core/sdpage.cxx18
-rw-r--r--sd/source/core/stlpool.cxx4
-rw-r--r--sd/source/filter/ppt/pptin.cxx2
-rw-r--r--sd/source/ui/func/fuconcs.cxx2
-rw-r--r--sd/source/ui/func/fuconrec.cxx4
-rw-r--r--sd/source/ui/func/futext.cxx32
-rw-r--r--sd/source/ui/view/drviews2.cxx2
8 files changed, 36 insertions, 36 deletions
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 479730a86f7e..a6f939b7639d 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -174,7 +174,7 @@ void SdDrawDocument::CreateLayoutTemplates()
rISet.Put(XFillBitmapItem(pPool, Graphic(aNullBmp)));
// Shadow attributes (Drawing Engine)
- rISet.Put(SdrShadowItem(sal_False));
+ rISet.Put(SdrShadowItem(false));
rISet.Put(SdrShadowColorItem(RGB_Color(COL_GRAY)));
rISet.Put(SdrShadowXDistItem(200)); // 3 mm Shadow distance
rISet.Put(SdrShadowYDistItem(200));
@@ -282,7 +282,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHSHADOW );
pISet = &pSheet->GetItemSet();
- pISet->Put(SdrShadowItem(sal_True));
+ pISet->Put(SdrShadowItem(true));
pISet->Put(SdrShadowColorItem(RGB_Color(COL_GRAY)));
pISet->Put(SdrShadowXDistItem(200)); // 3 mm shadow distance
pISet->Put(SdrShadowYDistItem(200));
@@ -381,7 +381,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(XFillStyleItem(XFILL_SOLID));
pISet->Put(XFillColorItem(OUString(), RGB_Color(COL_CYAN)));
- pISet->Put(SdrShadowItem(sal_True));
+ pISet->Put(SdrShadowItem(true));
pISet->Put(SdrShadowColorItem(RGB_Color(COL_GRAY)));
pISet->Put(SdrShadowXDistItem(200)); // 2 mm shadow distance
pISet->Put(SdrShadowYDistItem(200));
@@ -405,7 +405,7 @@ void SdDrawDocument::CreateLayoutTemplates()
Color aOrange4(255, 204, 153);
pISet->Put(XFillColorItem(OUString(), aOrange4));
- pISet->Put(SdrShadowItem(sal_True));
+ pISet->Put(SdrShadowItem(true));
pISet->Put(SdrShadowColorItem(RGB_Color(COL_GRAY)));
pISet->Put(SdrShadowXDistItem(200)); // 2 mm shadow distance
pISet->Put(SdrShadowYDistItem(200));
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index c25b658d6778..19efb97b2190 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -427,9 +427,9 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const
// potential problem: This action was still NOT
// adapted for vertical text. This sure needs to be done.
if(bVertical)
- aTempAttr.Put(SdrTextAutoGrowWidthItem(sal_False));
+ aTempAttr.Put(SdrTextAutoGrowWidthItem(false));
else
- aTempAttr.Put(SdrTextAutoGrowHeightItem(sal_False));
+ aTempAttr.Put(SdrTextAutoGrowHeightItem(false));
}
// check if we need another vertical adjustement than the default
@@ -533,7 +533,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const
eObjKind == PRESOBJ_GRAPHIC )
{
SfxItemSet aSet( ((SdDrawDocument*) pModel)->GetPool() );
- aSet.Put( SdrTextContourFrameItem( sal_True ) );
+ aSet.Put( SdrTextContourFrameItem( true ) );
aSet.Put( SvxAdjustItem( SVX_ADJUST_CENTER, EE_PARA_JUST ) );
pSdrObj->SetMergedItemSet(aSet);
@@ -2245,13 +2245,13 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind,
SfxItemSet aTempAttr( ((SdDrawDocument*) pModel)->GetPool() );
SdrTextMinFrameHeightItem aMinHeight( aRect.GetSize().Height() );
aTempAttr.Put( aMinHeight );
- aTempAttr.Put( SdrTextAutoGrowHeightItem(sal_False) );
+ aTempAttr.Put( SdrTextAutoGrowHeightItem(false) );
pTextObject->SetMergedItemSet(aTempAttr);
pTextObject->SetLogicRect(aRect);
// switch on AutoGrowHeight
SfxItemSet aAttr( ((SdDrawDocument*) pModel)->GetPool() );
- aAttr.Put( SdrTextAutoGrowHeightItem(sal_True) );
+ aAttr.Put( SdrTextAutoGrowHeightItem(true) );
pTextObject->SetMergedItemSet(aAttr);
}
@@ -2262,13 +2262,13 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind,
SfxItemSet aTempAttr( ((SdDrawDocument*) pModel)->GetPool() );
SdrTextMinFrameWidthItem aMinWidth( aRect.GetSize().Width() );
aTempAttr.Put( aMinWidth );
- aTempAttr.Put( SdrTextAutoGrowWidthItem(sal_False) );
+ aTempAttr.Put( SdrTextAutoGrowWidthItem(false) );
pTextObject->SetMergedItemSet(aTempAttr);
pTextObject->SetLogicRect(aRect);
// switch on AutoGrowWidth
SfxItemSet aAttr( ((SdDrawDocument*) pModel)->GetPool() );
- aAttr.Put( SdrTextAutoGrowWidthItem(sal_True) );
+ aAttr.Put( SdrTextAutoGrowWidthItem(true) );
pTextObject->SetMergedItemSet(aAttr);
}
}
@@ -2289,8 +2289,8 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind,
if( bVertical && (( eObjKind == PRESOBJ_TITLE) || (eObjKind == PRESOBJ_OUTLINE)))
{
SfxItemSet aNewSet(pObj->GetMergedItemSet());
- aNewSet.Put( SdrTextAutoGrowWidthItem(sal_True) );
- aNewSet.Put( SdrTextAutoGrowHeightItem(sal_False) );
+ aNewSet.Put( SdrTextAutoGrowWidthItem(true) );
+ aNewSet.Put( SdrTextAutoGrowHeightItem(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 5208bca56645..457350afd8b8 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -263,7 +263,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, sal_
rSet.Put( XLineStyleItem(XLINE_NONE) );
rSet.Put( XFillStyleItem(XFILL_NONE) );
rSet.Put( SdrTextFitToSizeTypeItem(SDRTEXTFIT_AUTOFIT) );
- rSet.Put( SdrTextAutoGrowHeightItem(sal_False) );
+ rSet.Put( SdrTextAutoGrowHeightItem(false) );
// #i16874# enable kerning by default but only for new documents
rSet.Put( SvxAutoKernItem( true, EE_CHAR_PAIRKERNING ) );
@@ -491,7 +491,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, sal_
pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUNDOBJECTS );
pSheet->SetParent( OUString() );
SfxItemSet& rBackgroundObjectsSet = pSheet->GetItemSet();
- rBackgroundObjectsSet.Put(SdrShadowItem(sal_False));
+ rBackgroundObjectsSet.Put(SdrShadowItem(false));
rBackgroundObjectsSet.Put(SdrShadowColorItem(Color(COL_GRAY)));
rBackgroundObjectsSet.Put(SdrShadowXDistItem(200)); // 3 mm shadow distance
rBackgroundObjectsSet.Put(SdrShadowYDistItem(200));
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index e80fc82781ad..10d9e7210ff6 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2286,7 +2286,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
SfxItemSet aTempAttr( mpDoc->GetPool() );
SdrTextMinFrameHeightItem aMinHeight( pText->GetLogicRect().GetSize().Height() );
aTempAttr.Put( aMinHeight );
- SdrTextAutoGrowHeightItem aAutoGrowHeight( sal_False );
+ SdrTextAutoGrowHeightItem aAutoGrowHeight( false );
aTempAttr.Put( aAutoGrowHeight );
pText->SetMergedItemSet(aTempAttr);
}
diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx
index 8cc0c2b827f3..c782b6c67ef1 100644
--- a/sd/source/ui/func/fuconcs.cxx
+++ b/sd/source/ui/func/fuconcs.cxx
@@ -263,7 +263,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( sal_False ) );
+ pObj->SetMergedItem( SdrTextAutoGrowHeightItem( false ) );
((SdrObjCustomShape*)pObj)->MergeDefaultAttributes( &aCustomShape );
}
}
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 7e611a3a6a5a..dcbb9bded9f3 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -482,8 +482,8 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
Size aSize(pObj->GetLogicRect().GetSize());
rAttr.Put( SdrTextMinFrameHeightItem( aSize.Height() ) );
rAttr.Put( SdrTextMinFrameWidthItem( aSize.Width() ) );
- rAttr.Put( SdrTextAutoGrowHeightItem( sal_True ) );
- rAttr.Put( SdrTextAutoGrowWidthItem( sal_True ) );
+ rAttr.Put( SdrTextAutoGrowHeightItem( true ) );
+ rAttr.Put( SdrTextAutoGrowWidthItem( 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 615ee4b04188..361315283bf5 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -495,8 +495,8 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj)
object, otherwise we draw to much */
SfxItemSet aSet(mpViewShell->GetPool());
aSet.Put(SdrTextMinFrameHeightItem(0));
- aSet.Put(SdrTextAutoGrowWidthItem(sal_False));
- aSet.Put(SdrTextAutoGrowHeightItem(sal_True));
+ aSet.Put(SdrTextAutoGrowWidthItem(false));
+ aSet.Put(SdrTextAutoGrowHeightItem(true));
pTxtObj->SetMergedItemSet(aSet);
pTxtObj->AdjustTextFrameWidthAndHeight();
aSet.Put(SdrTextMaxFrameHeightItem(pTxtObj->GetLogicRect().GetSize().Height()));
@@ -506,8 +506,8 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj)
{
SfxItemSet aSet(mpViewShell->GetPool());
aSet.Put(SdrTextMinFrameWidthItem(0));
- aSet.Put(SdrTextAutoGrowWidthItem(sal_True));
- aSet.Put(SdrTextAutoGrowHeightItem(sal_False));
+ aSet.Put(SdrTextAutoGrowWidthItem(true));
+ aSet.Put(SdrTextAutoGrowHeightItem(false));
// Needs to be set since default is SDRTEXTHORZADJUST_BLOCK
aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT));
@@ -524,8 +524,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(sal_True));
- aSet.Put(SdrTextAutoGrowHeightItem(sal_False));
+ aSet.Put(SdrTextAutoGrowWidthItem(true));
+ aSet.Put(SdrTextAutoGrowHeightItem(false));
// Set defaults for vertical klick-n'drag text object, pool defaults are:
// SdrTextVertAdjustItem: SDRTEXTVERTADJUST_TOP
@@ -545,8 +545,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(sal_False));
- aSet.Put(SdrTextAutoGrowWidthItem(sal_False));
+ aSet.Put(SdrTextAutoGrowHeightItem(false));
+ aSet.Put(SdrTextAutoGrowWidthItem(false));
pTxtObj->SetMergedItemSet(aSet);
pTxtObj->AdjustTextFrameWidthAndHeight();
}
@@ -557,8 +557,8 @@ void FuText::ImpSetAttributesFitToSizeVertical(SdrTextObj* pTxtObj)
SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWWIDTH);
SdrFitToSizeType eFTS = SDRTEXTFIT_PROPORTIONAL;
aSet.Put(SdrTextFitToSizeTypeItem(eFTS));
- aSet.Put(SdrTextAutoGrowHeightItem(sal_False));
- aSet.Put(SdrTextAutoGrowWidthItem(sal_False));
+ aSet.Put(SdrTextAutoGrowHeightItem(false));
+ aSet.Put(SdrTextAutoGrowWidthItem(false));
pTxtObj->SetMergedItemSet(aSet);
pTxtObj->AdjustTextFrameWidthAndHeight();
}
@@ -574,8 +574,8 @@ void FuText::ImpSetAttributesFitCommon(SdrTextObj* pTxtObj)
SfxItemSet aSet(mpViewShell->GetPool());
aSet.Put(SdrTextMinFrameHeightItem(0));
aSet.Put(SdrTextMaxFrameHeightItem(0));
- aSet.Put(SdrTextAutoGrowHeightItem(sal_True));
- aSet.Put(SdrTextAutoGrowWidthItem(sal_False));
+ aSet.Put(SdrTextAutoGrowHeightItem(true));
+ aSet.Put(SdrTextAutoGrowWidthItem(false));
pTxtObj->SetMergedItemSet(aSet);
}
else if( nSlotId == SID_ATTR_CHAR_VERTICAL )
@@ -583,8 +583,8 @@ void FuText::ImpSetAttributesFitCommon(SdrTextObj* pTxtObj)
SfxItemSet aSet(mpViewShell->GetPool());
aSet.Put(SdrTextMinFrameWidthItem(0));
aSet.Put(SdrTextMaxFrameWidthItem(0));
- aSet.Put(SdrTextAutoGrowWidthItem(sal_True));
- aSet.Put(SdrTextAutoGrowHeightItem(sal_False));
+ aSet.Put(SdrTextAutoGrowWidthItem(true));
+ aSet.Put(SdrTextAutoGrowHeightItem(false));
pTxtObj->SetMergedItemSet(aSet);
}
@@ -803,8 +803,8 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
SfxItemSet aSet(mpViewShell->GetPool());
aSet.Put(SdrTextMinFrameHeightItem(0));
aSet.Put(SdrTextMinFrameWidthItem(0));
- aSet.Put(SdrTextAutoGrowHeightItem(sal_True));
- aSet.Put(SdrTextAutoGrowWidthItem(sal_True));
+ aSet.Put(SdrTextAutoGrowHeightItem(true));
+ aSet.Put(SdrTextAutoGrowWidthItem(true));
if(nSlotId == SID_ATTR_CHAR_VERTICAL)
{
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index faad29ae88c3..37c346a30f27 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1909,7 +1909,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
OutlinerParaObject* pOutlParaObject = pOutl->CreateParaObject();
SdrRectObj* pRectObj = new SdrRectObj( OBJ_TEXT );
- pRectObj->SetMergedItem(SdrTextAutoGrowWidthItem(sal_True));
+ pRectObj->SetMergedItem(SdrTextAutoGrowWidthItem(true));
pOutl->UpdateFields();
pOutl->SetUpdateMode( true );