diff options
Diffstat (limited to 'svx/source/svdraw/svdfmtf.cxx')
-rwxr-xr-x[-rw-r--r--] | svx/source/svdraw/svdfmtf.cxx | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 6a207ca4cba4..fe986ef215fa 100644..100755 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,6 +82,7 @@ ImpSdrGDIMetaFileImport::ImpSdrGDIMetaFileImport(SdrModel& rModel): nLineWidth(0), maLineJoin(basegfx::B2DLINEJOIN_NONE), maDash(XDASH_RECT, 0, 0, 0, 0, 0), + fScaleX(0.0),fScaleY(0.0), bFntDirty(sal_True), bLastObjWasPolyWithoutLine(sal_False),bNoLine(sal_False),bNoFill(sal_False),bLastObjWasLine(sal_False) { @@ -268,12 +270,12 @@ sal_uIntPtr ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf, return aTmpList.GetObjCount(); } -void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, FASTBOOL bForceTextAttr) +void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool 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); + bool bLine = !bForceTextAttr; + bool bFill = (pObj==NULL) || (pObj->IsClosedObj() && !bForceTextAttr); + bool bText = bForceTextAttr || (pObj!=NULL && pObj->GetOutlinerParaObject()!=NULL); if ( bLine ) { @@ -431,7 +433,7 @@ void ImpSdrGDIMetaFileImport::InsertObj( SdrObject* pObj, sal_Bool bScale ) aTmpList.InsertObject( pObj ); if ( HAS_BASE( SdrPathObj, pObj ) ) { - FASTBOOL bClosed=pObj->IsClosedObj(); + bool bClosed=pObj->IsClosedObj(); bLastObjWasPolyWithoutLine=bNoLine && bClosed; bLastObjWasLine=!bClosed; } @@ -444,12 +446,11 @@ void ImpSdrGDIMetaFileImport::InsertObj( SdrObject* pObj, sal_Bool bScale ) } /**************************************************************************************************/ - -void ImpSdrGDIMetaFileImport::DoAction(MetaPixelAction& /*rAct*/) +void ImpSdrGDIMetaFileImport::DoAction(MetaPixelAction& /*rAct*/) const { } -void ImpSdrGDIMetaFileImport::DoAction(MetaPointAction& /*rAct*/) +void ImpSdrGDIMetaFileImport::DoAction(MetaPointAction& /*rAct*/) const { } @@ -1026,3 +1027,5 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile* pM } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |