summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdfmtf.cxx
diff options
context:
space:
mode:
authorPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-02-14 16:17:22 +0100
committerPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-02-14 16:17:22 +0100
commit1fb042333fe6287756ff1fac11d18cd7c150730d (patch)
tree595de5d187177832ce656d7832af9dce9dce2d99 /svx/source/svdraw/svdfmtf.cxx
parent5b3e910e926c7dd1e8dcfe8e0a5c6cb5bd17480a (diff)
parentcd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff)
rebase to DEV300_m100
Diffstat (limited to 'svx/source/svdraw/svdfmtf.cxx')
-rw-r--r--svx/source/svdraw/svdfmtf.cxx44
1 files changed, 22 insertions, 22 deletions
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index f10610317578..6a207ca4cba4 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -81,10 +81,10 @@ ImpSdrGDIMetaFileImport::ImpSdrGDIMetaFileImport(SdrModel& rModel):
nLineWidth(0),
maLineJoin(basegfx::B2DLINEJOIN_NONE),
maDash(XDASH_RECT, 0, 0, 0, 0, 0),
- bFntDirty(TRUE),
- bLastObjWasPolyWithoutLine(FALSE),bNoLine(FALSE),bNoFill(FALSE),bLastObjWasLine(FALSE)
+ bFntDirty(sal_True),
+ bLastObjWasPolyWithoutLine(sal_False),bNoLine(sal_False),bNoFill(sal_False),bLastObjWasLine(sal_False)
{
- aVD.EnableOutput(FALSE);
+ aVD.EnableOutput(sal_False);
// #i111954# init to no fill and no line initially
aVD.SetLineColor();
@@ -104,15 +104,15 @@ ImpSdrGDIMetaFileImport::~ImpSdrGDIMetaFileImport()
delete pTextAttr;
}
-ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
+sal_uIntPtr ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
SdrObjList& rOL,
- ULONG nInsPos,
+ sal_uIntPtr nInsPos,
SvdProgressInfo *pProgrInfo)
{
pPage = rOL.GetPage();
GDIMetaFile* pTmpMtf=NULL;
GDIMetaFile* pMtf = (GDIMetaFile*) &rMtf;
- ULONG nActionAnz=pMtf->GetActionCount();
+ sal_uIntPtr nActionAnz=pMtf->GetActionCount();
sal_Bool bError = sal_False;
@@ -148,13 +148,13 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
if(65000 < nActionAnz)
{
nActionAnz = 65000;
- bError = TRUE;
+ bError = sal_True;
}
if(pProgrInfo)
pProgrInfo->SetActionCount(nActionAnz);
- ULONG nActionsToReport = 0;
+ sal_uIntPtr nActionsToReport = 0;
for( MetaAction* pAct = pMtf->FirstAction(); pAct; pAct = pMtf->NextAction() )
{
@@ -219,7 +219,7 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
// MapMode-Scaling vornehmen
MapScaling();
// Objekte in vorgegebenes Rechteck hineinskalieren
- ULONG nAnz=aTmpList.GetObjCount();
+ sal_uIntPtr nAnz=aTmpList.GetObjCount();
// Beim berechnen der Fortschrittsanzeige wird GetActionCount()*3 benutzt.
// Da in aTmpList allerdings weniger eintraege als GetActionCount()
@@ -239,7 +239,7 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
// alle in aTmpList zwischengespeicherten Objekte nun in rOL ab der Position nInsPos einfuegen
if (nInsPos>rOL.GetObjCount()) nInsPos=rOL.GetObjCount();
SdrInsertReason aReason(SDRREASON_VIEWCALL);
- for (ULONG i=0; i<nAnz; i++)
+ for (sal_uIntPtr i=0; i<nAnz; i++)
{
SdrObject* pObj=aTmpList.GetObj(i);
rOL.NbcInsertObject(pObj,nInsPos,&aReason);
@@ -270,8 +270,8 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, FASTBOOL bForceTextAttr)
{
- bNoLine = FALSE; bNoFill = FALSE;
- FASTBOOL bLine=TRUE && !bForceTextAttr;
+ bNoLine = sal_False; bNoFill = sal_False;
+ FASTBOOL bLine=sal_True && !bForceTextAttr;
FASTBOOL bFill=pObj==NULL || pObj->IsClosedObj() && !bForceTextAttr;
FASTBOOL bText=bForceTextAttr || (pObj!=NULL && pObj->GetOutlinerParaObject()!=NULL);
@@ -320,7 +320,7 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, FASTBOOL bForceText
}
}
else
- bNoLine = TRUE;
+ bNoLine = sal_True;
if ( bFill )
{
@@ -333,7 +333,7 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, FASTBOOL bForceText
pFillAttr->Put(XFillStyleItem(XFILL_NONE));
}
else
- bNoFill = TRUE;
+ bNoFill = sal_True;
if ( bText && bFntDirty )
{
@@ -360,7 +360,7 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, FASTBOOL bForceText
pTextAttr->Put(SvxContourItem(aFnt.IsOutline(), EE_CHAR_OUTLINE));
pTextAttr->Put(SvxColorItem(aFnt.GetColor(), EE_CHAR_COLOR));
//... svxfont textitem svditext
- bFntDirty=FALSE;
+ bFntDirty=sal_False;
}
if (pObj!=NULL)
{
@@ -437,8 +437,8 @@ void ImpSdrGDIMetaFileImport::InsertObj( SdrObject* pObj, sal_Bool bScale )
}
else
{
- bLastObjWasPolyWithoutLine = FALSE;
- bLastObjWasLine = FALSE;
+ bLastObjWasPolyWithoutLine = sal_False;
+ bLastObjWasLine = sal_False;
}
}
}
@@ -772,7 +772,7 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const XubString& rS
if ( aFnt.GetWidth() || ( rAct.GetType() == META_STRETCHTEXT_ACTION ) )
{
pText->ClearMergedItem( SDRATTR_TEXT_AUTOGROWWIDTH );
- pText->SetMergedItem( SdrTextAutoGrowHeightItem( FALSE ) );
+ pText->SetMergedItem( SdrTextAutoGrowHeightItem( sal_False ) );
// don't let the margins eat the space needed for the text
pText->SetMergedItem ( SdrTextUpperDistItem (0));
pText->SetMergedItem ( SdrTextLowerDistItem (0));
@@ -786,7 +786,7 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const XubString& rS
pText->SetModel( pModel );
pText->SetLayer( nLayer );
pText->NbcSetText( rStr );
- SetAttributes( pText, TRUE );
+ SetAttributes( pText, sal_True );
pText->SetSnapRect( aTextRect );
if (!aFnt.IsTransparent())
@@ -927,8 +927,8 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaMapModeAction& rAct)
{
MapScaling();
rAct.Execute(&aVD);
- bLastObjWasPolyWithoutLine=FALSE;
- bLastObjWasLine=FALSE;
+ bLastObjWasPolyWithoutLine=sal_False;
+ bLastObjWasLine=sal_False;
}
void ImpSdrGDIMetaFileImport::MapScaling()
@@ -978,7 +978,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile* pM
aXGradient.SetGradientStyle((XGradientStyle)rGrad.GetStyle());
aXGradient.SetStartColor(rGrad.GetStartColor());
aXGradient.SetEndColor(rGrad.GetEndColor());
- aXGradient.SetAngle((USHORT)rGrad.GetAngle());
+ aXGradient.SetAngle((sal_uInt16)rGrad.GetAngle());
aXGradient.SetBorder(rGrad.GetBorder());
aXGradient.SetXOffset(rGrad.GetOfsX());
aXGradient.SetYOffset(rGrad.GetOfsY());
generated by cgit (git 2.34.1) at 2025-03-23 23:21:23 +0000