diff options
Diffstat (limited to 'sd/source/ui/func')
59 files changed, 451 insertions, 451 deletions
diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx index 9fdb789e3553..85540be5634e 100644 --- a/sd/source/ui/func/bulmaper.cxx +++ b/sd/source/ui/func/bulmaper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -131,7 +131,7 @@ void SdBulletMapper::MapFontsInNumRule( SvxNumRule& aNumRule, const SfxItemSet& aMyFont.SetShadow(rSItem.GetValue()); aNewLevel.SetBulletFont(&aMyFont); -// aNewLevel.SetBulletRelSize( 75 ); +// aNewLevel.SetBulletRelSize( 75 ); aNumRule.SetLevel(nLevel, aNewLevel ); } else if( rSrcLevel.GetNumberingType() == com::sun::star::style::NumberingType::CHAR_SPECIAL ) diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx index cdfb1364dd8a..029baf51e6ed 100644 --- a/sd/source/ui/func/fuarea.cxx +++ b/sd/source/ui/func/fuarea.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ void FuArea::DoExecute( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); AbstractSvxAreaTabDialog * pDlg = pFact ? pFact->CreateSvxAreaTabDialog( NULL, - &aNewAttr, + &aNewAttr, mpDoc, mpView) : 0; if( pDlg && (pDlg->Execute() == RET_OK) ) diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index 37161bca901e..e09c34192af7 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,13 +56,13 @@ namespace sd { -const sal_Unicode CHAR_HARDBLANK = ((sal_Unicode)0x00A0); -const sal_Unicode CHAR_HARDHYPHEN = ((sal_Unicode)0x2011); -const sal_Unicode CHAR_SOFTHYPHEN = ((sal_Unicode)0x00AD); -const sal_Unicode CHAR_RLM = ((sal_Unicode)0x200F); -const sal_Unicode CHAR_LRM = ((sal_Unicode)0x200E); -const sal_Unicode CHAR_ZWSP = ((sal_Unicode)0x200B); -const sal_Unicode CHAR_ZWNBSP = ((sal_Unicode)0x2060); +const sal_Unicode CHAR_HARDBLANK = ((sal_Unicode)0x00A0); +const sal_Unicode CHAR_HARDHYPHEN = ((sal_Unicode)0x2011); +const sal_Unicode CHAR_SOFTHYPHEN = ((sal_Unicode)0x00AD); +const sal_Unicode CHAR_RLM = ((sal_Unicode)0x200F); +const sal_Unicode CHAR_LRM = ((sal_Unicode)0x200E); +const sal_Unicode CHAR_ZWSP = ((sal_Unicode)0x200B); +const sal_Unicode CHAR_ZWNBSP = ((sal_Unicode)0x2060); TYPEINIT1( FuBullet, FuPoor ); @@ -99,8 +99,8 @@ void FuBullet::DoExecute( SfxRequest& rReq ) switch( rReq.GetSlot() ) { case FN_INSERT_SOFT_HYPHEN: cMark = CHAR_SOFTHYPHEN ; break; - case FN_INSERT_HARDHYPHEN: cMark = CHAR_HARDHYPHEN ; break; - case FN_INSERT_HARD_SPACE: cMark = CHAR_HARDBLANK ; break; + case FN_INSERT_HARDHYPHEN: cMark = CHAR_HARDHYPHEN ; break; + case FN_INSERT_HARD_SPACE: cMark = CHAR_HARDBLANK ; break; case SID_INSERT_RLM : cMark = CHAR_RLM ; break; case SID_INSERT_LRM : cMark = CHAR_LRM ; break; case SID_INSERT_ZWSP : cMark = CHAR_ZWSP ; break; @@ -118,7 +118,7 @@ void FuBullet::DoExecute( SfxRequest& rReq ) void FuBullet::InsertFormattingMark( sal_Unicode cMark ) { OutlinerView* pOV = NULL; - ::Outliner* pOL = NULL; + ::Outliner* pOL = NULL; // depending on ViewShell set Outliner and OutlinerView if (mpViewShell->ISA(DrawViewShell)) @@ -240,7 +240,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) if( aChars.Len() ) { OutlinerView* pOV = NULL; - ::Outliner* pOL = NULL; + ::Outliner* pOL = NULL; // je nach ViewShell Outliner und OutlinerView bestimmen if(mpViewShell && mpViewShell->ISA(DrawViewShell)) @@ -282,7 +282,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) // attributieren (Font setzen) SfxItemSet aSet(pOL->GetEmptyItemSet()); - SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetName(), + SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetName(), aFont.GetStyleName(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO); diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx index 9c3d1855303a..01860ceaa9e1 100644 --- a/sd/source/ui/func/fuchar.cxx +++ b/sd/source/ui/func/fuchar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx index e19ed0506e5d..cba11d2bac72 100644 --- a/sd/source/ui/func/fucon3d.cxx +++ b/sd/source/ui/func/fucon3d.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,11 +72,11 @@ TYPEINIT1( FuConstruct3dObject, FuConstruct ); \************************************************************************/ FuConstruct3dObject::FuConstruct3dObject ( - ViewShell* pViewSh, - ::sd::Window* pWin, - ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq) + ViewShell* pViewSh, + ::sd::Window* pWin, + ::sd::View* pView, + SdDrawDocument* pDoc, + SfxRequest& rReq) : FuConstruct(pViewSh, pWin, pView, pDoc, rReq) { } @@ -289,7 +289,7 @@ void FuConstruct3dObject::ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj, E3dS case SID_3D_SPHERE: { -// pScene->RotateX(DEG2RAD(60)); +// pScene->RotateX(DEG2RAD(60)); } break; @@ -304,13 +304,13 @@ void FuConstruct3dObject::ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj, E3dS case SID_3D_CONE: case SID_3D_PYRAMID: { -// pScene->RotateX(DEG2RAD(25)); +// pScene->RotateX(DEG2RAD(25)); } break; case SID_3D_TORUS: { -// pScene->RotateX(DEG2RAD(15)); +// pScene->RotateX(DEG2RAD(15)); aTransformation.rotate(DEG2RAD(90), 0.0, 0.0); } break; @@ -455,7 +455,7 @@ SdrObject* FuConstruct3dObject::CreateDefaultObject(const sal_uInt16 nID, const E3dCompoundObject* p3DObj = ImpCreateBasic3DShape(); - // E3dView::SetCurrent3DObj part + // E3dView::SetCurrent3DObj part // get transformed BoundVolume of the object basegfx::B3DRange aObjVol(p3DObj->GetBoundVolume()); aObjVol.transform(p3DObj->GetTransform()); @@ -478,18 +478,18 @@ SdrObject* FuConstruct3dObject::CreateDefaultObject(const sal_uInt16 nID, const aCam.SetFocalLength(mpView->GetDefaultCamFocal()); aCam.SetDefaults(::basegfx::B3DPoint(0.0, 0.0, fDefaultCamPosZ), aLookAt, mpView->GetDefaultCamFocal()); pScene->SetCamera(aCam); - + pScene->Insert3DObj(p3DObj); pScene->NbcSetSnapRect(a3DRect); pScene->SetModel(mpDoc); - + ImpPrepareBasic3DShape(p3DObj, pScene); - + SfxItemSet aAttr(mpDoc->GetPool()); SetStyleSheet(aAttr, p3DObj); aAttr.Put(XLineStyleItem (XLINE_NONE)); p3DObj->SetMergedItemSet(aAttr); - + // make object interactive at once pScene->SetRectsDirty(); diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx index dd7db1ecb231..8bb887f73534 100644 --- a/sd/source/ui/func/fuconarc.cxx +++ b/sd/source/ui/func/fuconarc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,11 +66,11 @@ TYPEINIT1( FuConstructArc, FuConstruct ); \************************************************************************/ FuConstructArc::FuConstructArc ( - ViewShell* pViewSh, - ::sd::Window* pWin, - ::sd::View* pView, + ViewShell* pViewSh, + ::sd::Window* pWin, + ::sd::View* pView, SdDrawDocument* pDoc, - SfxRequest& rReq ) + SfxRequest& rReq ) : FuConstruct( pViewSh, pWin, pView, pDoc, rReq ) { } @@ -103,7 +103,7 @@ void FuConstructArc::DoExecute( SfxRequest& rReq ) SFX_REQUEST_ARG (rReq, pPhiStart, SfxUInt32Item, ID_VAL_ANGLESTART, FALSE); SFX_REQUEST_ARG (rReq, pPhiEnd, SfxUInt32Item, ID_VAL_ANGLEEND, FALSE); - Rectangle aNewRectangle (pCenterX->GetValue () - pAxisX->GetValue () / 2, + Rectangle aNewRectangle (pCenterX->GetValue () - pAxisX->GetValue () / 2, pCenterY->GetValue () - pAxisY->GetValue () / 2, pCenterX->GetValue () + pAxisX->GetValue () / 2, pCenterY->GetValue () + pAxisY->GetValue () / 2); @@ -144,7 +144,7 @@ BOOL FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt ) SfxItemSet aAttr(mpDoc->GetPool()); SetStyleSheet(aAttr, pObj); -//-/ pObj->NbcSetAttributes(aAttr, FALSE); +//-/ pObj->NbcSetAttributes(aAttr, FALSE); pObj->SetMergedItemSet(aAttr); } @@ -227,25 +227,25 @@ void FuConstructArc::Activate() switch( nSlotId ) { - case SID_DRAW_ARC : + case SID_DRAW_ARC : case SID_DRAW_CIRCLEARC: { aObjKind = OBJ_CARC; } break; - case SID_DRAW_PIE : - case SID_DRAW_PIE_NOFILL : - case SID_DRAW_CIRCLEPIE : + case SID_DRAW_PIE : + case SID_DRAW_PIE_NOFILL : + case SID_DRAW_CIRCLEPIE : case SID_DRAW_CIRCLEPIE_NOFILL: { aObjKind = OBJ_SECT; } break; - case SID_DRAW_ELLIPSECUT : + case SID_DRAW_ELLIPSECUT : case SID_DRAW_ELLIPSECUT_NOFILL: - case SID_DRAW_CIRCLECUT : + case SID_DRAW_CIRCLECUT : case SID_DRAW_CIRCLECUT_NOFILL : { aObjKind = OBJ_CCUT; @@ -262,7 +262,7 @@ void FuConstructArc::Activate() mpView->SetCurrentObj((UINT16)aObjKind); FuConstruct::Activate(); -// FuDraw::Activate(); +// FuDraw::Activate(); } /************************************************************************* @@ -274,7 +274,7 @@ void FuConstructArc::Activate() void FuConstructArc::Deactivate() { FuConstruct::Deactivate(); -// FuDraw::Deactivate(); +// FuDraw::Deactivate(); } // #97016# diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index 410174a39792..1aacd9c27cda 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,9 +72,9 @@ TYPEINIT1( FuConstructBezierPolygon, FuConstruct ); \************************************************************************/ FuConstructBezierPolygon::FuConstructBezierPolygon ( - ViewShell* pViewSh, + ViewShell* pViewSh, ::sd::Window* pWin, - ::sd::View* pView, + ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq) : FuConstruct(pViewSh, pWin, pView, pDoc, rReq), @@ -248,7 +248,7 @@ BOOL FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) mpView->DeleteMarked(); bDeleted = true; } - + if ((!bPermanent && bCreated) || bDeleted) { mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); @@ -444,7 +444,7 @@ SdrObject* FuConstructBezierPolygon::CreateDefaultObject(const sal_uInt16 nID, c basegfx::B2DPolygon aInnerPoly; aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left(), rRectangle.Bottom())); - + aInnerPoly.appendBezierSegment( basegfx::B2DPoint(rRectangle.Left(), rRectangle.Top()), basegfx::B2DPoint(rRectangle.Center().X(), rRectangle.Top()), @@ -463,7 +463,7 @@ SdrObject* FuConstructBezierPolygon::CreateDefaultObject(const sal_uInt16 nID, c { aInnerPoly.setClosed(true); } - + aPoly.append(aInnerPoly); break; } @@ -471,14 +471,14 @@ SdrObject* FuConstructBezierPolygon::CreateDefaultObject(const sal_uInt16 nID, c case SID_DRAW_XPOLYGON_NOFILL: { basegfx::B2DPolygon aInnerPoly; - + aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left(), rRectangle.Bottom())); aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left(), rRectangle.Top())); aInnerPoly.append(basegfx::B2DPoint(rRectangle.Center().X(), rRectangle.Top())); aInnerPoly.append(basegfx::B2DPoint(rRectangle.Center().X(), rRectangle.Center().Y())); aInnerPoly.append(basegfx::B2DPoint(rRectangle.Right(), rRectangle.Center().Y())); aInnerPoly.append(basegfx::B2DPoint(rRectangle.Right(), rRectangle.Bottom())); - + if(SID_DRAW_XPOLYGON_NOFILL == nID) { aInnerPoly.append(basegfx::B2DPoint(rRectangle.Center().X(), rRectangle.Bottom())); @@ -497,7 +497,7 @@ SdrObject* FuConstructBezierPolygon::CreateDefaultObject(const sal_uInt16 nID, c basegfx::B2DPolygon aInnerPoly; const sal_Int32 nWdt(rRectangle.GetWidth()); const sal_Int32 nHgt(rRectangle.GetHeight()); - + aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left(), rRectangle.Bottom())); aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left() + (nWdt * 30) / 100, rRectangle.Top() + (nHgt * 70) / 100)); aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left(), rRectangle.Top() + (nHgt * 15) / 100)); @@ -506,7 +506,7 @@ SdrObject* FuConstructBezierPolygon::CreateDefaultObject(const sal_uInt16 nID, c aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left() + (nWdt * 80) / 100, rRectangle.Top() + (nHgt * 50) / 100)); aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left() + (nWdt * 80) / 100, rRectangle.Top() + (nHgt * 75) / 100)); aInnerPoly.append(basegfx::B2DPoint(rRectangle.Bottom(), rRectangle.Right())); - + if(SID_DRAW_POLYGON_NOFILL == nID) { aInnerPoly.append(basegfx::B2DPoint(rRectangle.Center().X(), rRectangle.Bottom())); diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index 60bbc213791b..d0b5ef700314 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -94,11 +94,11 @@ TYPEINIT1( FuConstructCustomShape, FuConstruct ); \************************************************************************/ FuConstructCustomShape::FuConstructCustomShape ( - ViewShell* pViewSh, - ::sd::Window* pWin, - ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq ) : + ViewShell* pViewSh, + ::sd::Window* pWin, + ::sd::View* pView, + SdDrawDocument* pDoc, + SfxRequest& rReq ) : FuConstruct(pViewSh, pWin, pView, pDoc, rReq) { } @@ -263,7 +263,7 @@ void FuConstructCustomShape::SetAttributes( SdrObject* pObj ) if( pSourceObj ) { const SfxItemSet& rSource = pSourceObj->GetMergedItemSet(); - SfxItemSet aDest( pObj->GetModel()->GetItemPool(), // ranges from SdrAttrObj + SfxItemSet aDest( pObj->GetModel()->GetItemPool(), // ranges from SdrAttrObj SDRATTR_START, SDRATTR_SHADOW_LAST, SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST, SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION, diff --git a/sd/source/ui/func/fuconnct.cxx b/sd/source/ui/func/fuconnct.cxx index 1dc882342a54..9650fa422e0b 100644 --- a/sd/source/ui/func/fuconnct.cxx +++ b/sd/source/ui/func/fuconnct.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,10 +51,10 @@ TYPEINIT1( FuConnectionDlg, FuPoor ); \************************************************************************/ FuConnectionDlg::FuConnectionDlg ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) { diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index 9cd2980831c9..8a5b82ae7fda 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,11 +89,11 @@ TYPEINIT1( FuConstructRectangle, FuConstruct ); \************************************************************************/ FuConstructRectangle::FuConstructRectangle ( - ViewShell* pViewSh, - ::sd::Window* pWin, - ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq) + ViewShell* pViewSh, + ::sd::Window* pWin, + ::sd::View* pView, + SdDrawDocument* pDoc, + SfxRequest& rReq) : FuConstruct(pViewSh, pWin, pView, pDoc, rReq) { } @@ -128,11 +128,11 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq ) SFX_REQUEST_ARG (rReq, pAxisX, SfxUInt32Item, ID_VAL_AXIS_X, FALSE); SFX_REQUEST_ARG (rReq, pAxisY, SfxUInt32Item, ID_VAL_AXIS_Y, FALSE); - Rectangle aNewRectangle (pCenterX->GetValue () - pAxisX->GetValue () / 2, + Rectangle aNewRectangle (pCenterX->GetValue () - pAxisX->GetValue () / 2, pCenterY->GetValue () - pAxisY->GetValue () / 2, pCenterX->GetValue () + pAxisX->GetValue () / 2, pCenterY->GetValue () + pAxisY->GetValue () / 2); - SdrCircObj *pNewCircle = new SdrCircObj (OBJ_CIRC, aNewRectangle); + SdrCircObj *pNewCircle = new SdrCircObj (OBJ_CIRC, aNewRectangle); SdrPageView *pPV = mpView->GetSdrPageView(); mpView->InsertObjectAtView(pNewCircle, *pPV, SDRINSERT_SETDEFLAYER | SDRINSERT_SETDEFATTR); @@ -146,11 +146,11 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq ) SFX_REQUEST_ARG (rReq, pMouseEndX, SfxUInt32Item, ID_VAL_MOUSEEND_X, FALSE); SFX_REQUEST_ARG (rReq, pMouseEndY, SfxUInt32Item, ID_VAL_MOUSEEND_Y, FALSE); - Rectangle aNewRectangle (pMouseStartX->GetValue (), + Rectangle aNewRectangle (pMouseStartX->GetValue (), pMouseStartY->GetValue (), pMouseEndX->GetValue (), pMouseEndY->GetValue ()); - SdrRectObj *pNewRect = new SdrRectObj (aNewRectangle); + SdrRectObj *pNewRect = new SdrRectObj (aNewRectangle); SdrPageView *pPV = mpView->GetSdrPageView(); mpView->InsertObjectAtView(pNewRect, *pPV, SDRINSERT_SETDEFLAYER | SDRINSERT_SETDEFATTR); @@ -186,13 +186,13 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq ) nSlotId == SID_CONNECTOR_LINES_ARROWS || nSlotId == SID_CONNECTOR_LINES_CIRCLE_START || nSlotId == SID_CONNECTOR_LINES_CIRCLE_END || - nSlotId == SID_CONNECTOR_LINES_CIRCLES || - nSlotId == SID_LINE_ARROW_START || - nSlotId == SID_LINE_ARROW_END || - nSlotId == SID_LINE_ARROWS || - nSlotId == SID_LINE_ARROW_CIRCLE || - nSlotId == SID_LINE_CIRCLE_ARROW || - nSlotId == SID_LINE_ARROW_SQUARE || + nSlotId == SID_CONNECTOR_LINES_CIRCLES || + nSlotId == SID_LINE_ARROW_START || + nSlotId == SID_LINE_ARROW_END || + nSlotId == SID_LINE_ARROWS || + nSlotId == SID_LINE_ARROW_CIRCLE || + nSlotId == SID_LINE_CIRCLE_ARROW || + nSlotId == SID_LINE_ARROW_SQUARE || nSlotId == SID_LINE_SQUARE_ARROW ) { mpView->UnmarkAll(); @@ -356,21 +356,21 @@ void FuConstructRectangle::Activate() break; case SID_DRAW_RECT : - case SID_DRAW_RECT_NOFILL : - case SID_DRAW_RECT_ROUND : + case SID_DRAW_RECT_NOFILL : + case SID_DRAW_RECT_ROUND : case SID_DRAW_RECT_ROUND_NOFILL: - case SID_DRAW_SQUARE : + case SID_DRAW_SQUARE : case SID_DRAW_SQUARE_NOFILL : - case SID_DRAW_SQUARE_ROUND : + case SID_DRAW_SQUARE_ROUND : case SID_DRAW_SQUARE_ROUND_NOFILL: { aObjKind = OBJ_RECT; } break; - case SID_DRAW_ELLIPSE : + case SID_DRAW_ELLIPSE : case SID_DRAW_ELLIPSE_NOFILL: - case SID_DRAW_CIRCLE : + case SID_DRAW_CIRCLE : case SID_DRAW_CIRCLE_NOFILL : { aObjKind = OBJ_CIRC; @@ -465,13 +465,13 @@ void FuConstructRectangle::Deactivate() nSlotId == SID_CONNECTOR_LINES_ARROWS || nSlotId == SID_CONNECTOR_LINES_CIRCLE_START || nSlotId == SID_CONNECTOR_LINES_CIRCLE_END || - nSlotId == SID_CONNECTOR_LINES_CIRCLES || - nSlotId == SID_LINE_ARROW_START || - nSlotId == SID_LINE_ARROW_END || - nSlotId == SID_LINE_ARROWS || - nSlotId == SID_LINE_ARROW_CIRCLE || - nSlotId == SID_LINE_CIRCLE_ARROW || - nSlotId == SID_LINE_ARROW_SQUARE || + nSlotId == SID_CONNECTOR_LINES_CIRCLES || + nSlotId == SID_LINE_ARROW_START || + nSlotId == SID_LINE_ARROW_END || + nSlotId == SID_LINE_ARROWS || + nSlotId == SID_LINE_ARROW_CIRCLE || + nSlotId == SID_LINE_CIRCLE_ARROW || + nSlotId == SID_LINE_ARROW_SQUARE || nSlotId == SID_LINE_SQUARE_ARROW ) { mpView->SetGlueVisible( FALSE ); @@ -989,8 +989,8 @@ SdrObject* FuConstructRectangle::CreateDefaultObject(const sal_uInt16 nID, const } // For task #105815# the default text is not inserted anymore. - // String aText(SdResId(STR_POOLSHEET_TEXT)); - // ((SdrCaptionObj*)pObj)->SetText(aText); + // String aText(SdResId(STR_POOLSHEET_TEXT)); + // ((SdrCaptionObj*)pObj)->SetText(aText); ((SdrCaptionObj*)pObj)->SetLogicRect(aRect); ((SdrCaptionObj*)pObj)->SetTailPos( diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index 0a74bbdac3a3..641c868ae38b 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,11 +63,11 @@ TYPEINIT1( FuConstruct, FuDraw ); \************************************************************************/ FuConstruct::FuConstruct ( - ViewShell* pViewSh, - ::sd::Window* pWin, - ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq) + ViewShell* pViewSh, + ::sd::Window* pWin, + ::sd::View* pView, + SdDrawDocument* pDoc, + SfxRequest& rReq) : FuDraw(pViewSh, pWin, pView, pDoc, rReq), bSelectionChanged(FALSE) { @@ -96,7 +96,7 @@ BOOL FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) // #90235# this extra triggering is an error and leads to // erasing the last two points when creating a polygon. // if ( rMEvt.IsRight() ) - // mpView->BckAction(); + // mpView->BckAction(); return TRUE; } @@ -392,7 +392,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj, else { /*********************************** - * object was created on normal page + * object was created on normal page ************************************/ if ( bForceNoFillStyle ) { diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx index 6126fa15f97b..00474a0e91e0 100644 --- a/sd/source/ui/func/fuconuno.cxx +++ b/sd/source/ui/func/fuconuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,11 +66,11 @@ TYPEINIT1( FuConstructUnoControl, FuConstruct ); \************************************************************************/ FuConstructUnoControl::FuConstructUnoControl ( - ViewShell* pViewSh, - ::sd::Window* pWin, - ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq) + ViewShell* pViewSh, + ::sd::Window* pWin, + ::sd::View* pView, + SdDrawDocument* pDoc, + SfxRequest& rReq) : FuConstruct(pViewSh, pWin, pView, pDoc, rReq) { } @@ -204,7 +204,7 @@ void FuConstructUnoControl::Deactivate() SdrObject* FuConstructUnoControl::CreateDefaultObject(const sal_uInt16, const Rectangle& rRectangle) { // case SID_FM_CREATE_CONTROL: - + SdrObject* pObj = SdrObjFactory::MakeNewObject( mpView->GetCurrentObjInventor(), mpView->GetCurrentObjIdentifier(), 0L, mpDoc); diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx index 858081dad195..d5572ddaa692 100644 --- a/sd/source/ui/func/fucopy.cxx +++ b/sd/source/ui/func/fucopy.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,10 +63,10 @@ TYPEINIT1( FuCopy, FuPoor ); \************************************************************************/ FuCopy::FuCopy ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) { @@ -99,7 +99,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) // Farb-Attribut angeben SfxItemSet aAttr( mpDoc->GetPool() ); mpView->GetAttributes( aAttr ); - const SfxPoolItem* pPoolItem = NULL; + const SfxPoolItem* pPoolItem = NULL; if( SFX_ITEM_SET == aAttr.GetItemState( XATTR_FILLSTYLE, TRUE, &pPoolItem ) ) { @@ -144,11 +144,11 @@ void FuCopy::DoExecute( SfxRequest& rReq ) } } - Rectangle aRect; - INT32 lWidth = 0, lHeight = 0, lSizeX = 0L, lSizeY = 0L, lAngle = 0L; - UINT16 nNumber = 0; - Color aStartColor, aEndColor; - BOOL bColor = FALSE; + Rectangle aRect; + INT32 lWidth = 0, lHeight = 0, lSizeX = 0L, lSizeY = 0L, lAngle = 0L; + UINT16 nNumber = 0; + Color aStartColor, aEndColor; + BOOL bColor = FALSE; const SfxPoolItem* pPoolItem = NULL; // Anzahl @@ -201,19 +201,19 @@ void FuCopy::DoExecute( SfxRequest& rReq ) bWaiting = TRUE; } - const SdrMarkList aMarkList( mpView->GetMarkedObjectList() ); - const ULONG nMarkCount = aMarkList.GetMarkCount(); - SdrObject* pObj = NULL; + const SdrMarkList aMarkList( mpView->GetMarkedObjectList() ); + const ULONG nMarkCount = aMarkList.GetMarkCount(); + SdrObject* pObj = NULL; // Anzahl moeglicher Kopien berechnen aRect = mpView->GetAllMarkedRect(); - + if( lWidth < 0L ) { long nTmp = ( aRect.Right() - aRect.Left() ) / -lWidth; nNumber = (UINT16) Min( nTmp, (long)nNumber ); } - + if( lHeight < 0L ) { long nTmp = ( aRect.Bottom() - aRect.Top() ) / -lHeight; @@ -237,16 +237,16 @@ void FuCopy::DoExecute( SfxRequest& rReq ) // make a copy of selected objects mpView->CopyMarked(); - - // get newly selected objects + + // get newly selected objects SdrMarkList aCopyMarkList( mpView->GetMarkedObjectList() ); - ULONG j, nCopyMarkCount = aMarkList.GetMarkCount(); - + ULONG j, nCopyMarkCount = aMarkList.GetMarkCount(); + // set protection flags at marked copies to null for( j = 0; j < nCopyMarkCount; j++ ) { pObj = aCopyMarkList.GetMark( j )->GetMarkedSdrObj(); - + if( pObj ) { pObj->SetMoveProtect( FALSE ); @@ -265,7 +265,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) if( mpView->IsMoveAllowed() ) mpView->MoveAllMarked( Size( lSizeX, lSizeY ) ); - + // set protection flags at marked copies to original values if( nMarkCount == nCopyMarkCount ) { @@ -273,8 +273,8 @@ void FuCopy::DoExecute( SfxRequest& rReq ) { SdrObject* pSrcObj = aMarkList.GetMark( j )->GetMarkedSdrObj(); SdrObject* pDstObj = aCopyMarkList.GetMark( j )->GetMarkedSdrObj(); - - if( pSrcObj && pDstObj && + + if( pSrcObj && pDstObj && ( pSrcObj->GetObjInventor() == pDstObj->GetObjInventor() ) && ( pSrcObj->GetObjIdentifier() == pDstObj->GetObjIdentifier() ) ) { @@ -313,6 +313,6 @@ void FuCopy::DoExecute( SfxRequest& rReq ) } } -} // end of namespace +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx index 3000aaa8553c..dd150adcce86 100644 --- a/sd/source/ui/func/fucushow.cxx +++ b/sd/source/ui/func/fucushow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,11 +56,11 @@ TYPEINIT1( FuCustomShowDlg, FuPoor ); \************************************************************************/ FuCustomShowDlg::FuCustomShowDlg ( - ViewShell* pViewSh, - ::sd::Window* pWin, - ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq) + ViewShell* pViewSh, + ::sd::Window* pWin, + ::sd::View* pView, + SdDrawDocument* pDoc, + SfxRequest& rReq) : FuPoor( pViewSh, pWin, pView, pDoc, rReq ) { } @@ -97,6 +97,6 @@ void FuCustomShowDlg::DoExecute( SfxRequest& ) } } -} // end of namespace +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 5caaf842aa41..d4217eee6918 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -130,8 +130,8 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt) { FrameView* pFrameView = mpViewShell->GetFrameView(); -// BOOL bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho(); -// bOrtho = bOrtho != rMEvt.IsShift(); +// BOOL bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho(); +// bOrtho = bOrtho != rMEvt.IsShift(); BOOL bOrtho = FALSE; BOOL bRestricted = TRUE; @@ -252,8 +252,8 @@ BOOL FuDraw::MouseMove(const MouseEvent& rMEvt) FrameView* pFrameView = mpViewShell->GetFrameView(); Point aPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() ); -// BOOL bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho(); -// bOrtho = bOrtho != rMEvt.IsShift(); +// BOOL bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho(); +// bOrtho = bOrtho != rMEvt.IsShift(); BOOL bOrtho = FALSE; BOOL bRestricted = TRUE; @@ -688,8 +688,8 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) { UINT16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier(); - if ( nSdrObjKind != OBJ_TEXT && - nSdrObjKind != OBJ_TITLETEXT && + if ( nSdrObjKind != OBJ_TEXT && + nSdrObjKind != OBJ_TITLETEXT && nSdrObjKind != OBJ_OUTLINETEXT && aVEvt.pObj->IsEmptyPresObj() ) { @@ -785,8 +785,8 @@ BOOL FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) || (mpView->ISA(DrawView) && SlideShow::IsRunning( mpViewShell->GetViewShellBase() ) && - (pInfo->meClickAction == presentation::ClickAction_VANISH || - pInfo->meClickAction == presentation::ClickAction_INVISIBLE || + (pInfo->meClickAction == presentation::ClickAction_VANISH || + pInfo->meClickAction == presentation::ClickAction_INVISIBLE || pInfo->meClickAction == presentation::ClickAction_STOPPRESENTATION || (pInfo->mbActive && ( pInfo->meEffect != presentation::AnimationEffect_NONE || diff --git a/sd/source/ui/func/fudspord.cxx b/sd/source/ui/func/fudspord.cxx index 24528f251640..e7665a8145f9 100644 --- a/sd/source/ui/func/fudspord.cxx +++ b/sd/source/ui/func/fudspord.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ TYPEINIT1( FuDisplayOrder, FuPoor ); |* \************************************************************************/ -FuDisplayOrder::FuDisplayOrder( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq) +FuDisplayOrder::FuDisplayOrder( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) , mpRefObj(NULL) , mpOverlay(0L) diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx index 24fb5dfd2e9b..fb00ac95e209 100644 --- a/sd/source/ui/func/fuediglu.cxx +++ b/sd/source/ui/func/fuediglu.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,8 +61,8 @@ FuEditGluePoints::FuEditGluePoints ( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq) + SdDrawDocument* pDoc, + SfxRequest& rReq) : FuDraw(pViewSh, pWin, pView, pDoc, rReq) { } diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx index f09141ccc989..04667a62540c 100644 --- a/sd/source/ui/func/fuexpand.cxx +++ b/sd/source/ui/func/fuexpand.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -195,7 +195,7 @@ void FuExpandPage::DoExecute( SfxRequest& ) // Title-Textobjekt erstellen SdrTextObj* pTextObj = (SdrTextObj*) pPage->GetPresObj(PRESOBJ_TITLE); - + // OutlinerParaObject* pOutlinerParaObject = pOutl->CreateParaObject( (USHORT) nParaPos, 1); pOutlinerParaObject->SetOutlinerMode(OUTLINERMODE_TITLEOBJECT); @@ -234,13 +234,13 @@ void FuExpandPage::DoExecute( SfxRequest& ) // -- SdrOutliner* pTempOutl = SdrMakeOutliner( OUTLINERMODE_OUTLINEOBJECT, mpDoc ); pTempOutl->SetText( *pOPO ); - + ULONG nParaCount2 = pTempOutl->GetParagraphCount(); ULONG nPara; for( nPara = 0; nPara < nParaCount2; nPara++ ) { pTempOutl->SetDepth ( - pTempOutl->GetParagraph( nPara ), + pTempOutl->GetParagraph( nPara ), pTempOutl->GetDepth((USHORT) nPara ) - 1); } diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index ce189dd459ab..2b933e5e888b 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ namespace sd { TYPEINIT1( FuFormatPaintBrush, FuText ); -FuFormatPaintBrush::FuFormatPaintBrush( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) +FuFormatPaintBrush::FuFormatPaintBrush( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) : FuText(pViewSh, pWin, pView, pDoc, rReq) , mbPermanent( false ) , mbOldIsQuickTextEditMode( true ) @@ -91,7 +91,7 @@ void FuFormatPaintBrush::DoExecute( SfxRequest& rReq ) void FuFormatPaintBrush::implcancel() { if( mpViewShell && mpViewShell->GetViewFrame() ) - { + { SfxViewFrame* pViewFrame = mpViewShell->GetViewFrame(); pViewFrame->GetBindings().Invalidate(SID_FORMATPAINTBRUSH); pViewFrame->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); @@ -150,7 +150,7 @@ BOOL FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt) unmarkimpl( mpView ); if( aVEvt.pObj ) - { + { USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); BOOL bToggle = FALSE; mpView->MarkObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ), nHitLog, bToggle, FALSE); @@ -259,7 +259,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma if(mpItemSet.get() && (rMarkList.GetMarkCount() == 1) ) { SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); - + if( mpDoc->IsUndoEnabled() ) { String sLabel( mpViewShell->GetViewShellBase().RetrieveLabelFromCommand( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormatPaintbrush" ) ) ) ); @@ -268,7 +268,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma } mpView->ApplyFormatPaintBrush( *mpItemSet.get(), bNoCharacterFormats, bNoParagraphFormats ); - + if( mpDoc->IsUndoEnabled() ) { mpDoc->EndUndo(); @@ -280,7 +280,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma { const SdrMarkList& rMarkList = rDrawViewShell.GetDrawView()->GetMarkedObjectList(); const ULONG nMarkCount = rMarkList.GetMarkCount(); - + if( nMarkCount == 1 ) { SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx index 3cc212478b93..39c202f86ab4 100644 --- a/sd/source/ui/func/fuhhconv.cxx +++ b/sd/source/ui/func/fuhhconv.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index de244e5f259a..743bf758f889 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -130,17 +130,17 @@ FunctionReference FuInsertGraphic::Create( ViewShell* pViewSh, ::sd::Window* pWi void FuInsertGraphic::DoExecute( SfxRequest& ) { - SvxOpenGraphicDialog aDlg(SdResId(STR_INSERTGRAPHIC)); + SvxOpenGraphicDialog aDlg(SdResId(STR_INSERTGRAPHIC)); if( aDlg.Execute() == GRFILTER_OK ) { - Graphic aGraphic; + Graphic aGraphic; int nError = aDlg.GetGraphic(aGraphic); if( nError == GRFILTER_OK ) { if( mpViewShell && mpViewShell->ISA(DrawViewShell)) { - sal_Int8 nAction = DND_ACTION_COPY; + sal_Int8 nAction = DND_ACTION_COPY; SdrObject* pPickObj = mpView->GetEmptyPresentationObject( PRESOBJ_GRAPHIC ); if( pPickObj ) nAction = DND_ACTION_LINK; @@ -204,7 +204,7 @@ FunctionReference FuInsertClipboard::Create( ViewShell* pViewSh, ::sd::Window* p void FuInsertClipboard::DoExecute( SfxRequest& ) { - TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( mpWindow ) ); + TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( mpWindow ) ); ULONG nFormatId; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -721,9 +721,9 @@ FunctionReference FuInsertAVMedia::Create( ViewShell* pViewSh, ::sd::Window* pWi void FuInsertAVMedia::DoExecute( SfxRequest& rReq ) { - ::rtl::OUString aURL; - const SfxItemSet* pReqArgs = rReq.GetArgs(); - bool bAPI = false; + ::rtl::OUString aURL; + const SfxItemSet* pReqArgs = rReq.GetArgs(); + bool bAPI = false; if( pReqArgs ) { @@ -753,8 +753,8 @@ void FuInsertAVMedia::DoExecute( SfxRequest& rReq ) } else { - Point aPos; - Size aSize; + Point aPos; + Size aSize; sal_Int8 nAction = DND_ACTION_COPY; if( aPrefSize.Width() && aPrefSize.Height() ) diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 6b2807fca4c5..d664b54f8df1 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,9 +85,9 @@ namespace sd { TYPEINIT1( FuInsertFile, FuPoor ); -#define POOL_BUFFER_SIZE (USHORT)32768 -#define BASIC_BUFFER_SIZE (USHORT)8192 -#define DOCUMENT_BUFFER_SIZE (USHORT)32768 +#define POOL_BUFFER_SIZE (USHORT)32768 +#define BASIC_BUFFER_SIZE (USHORT)8192 +#define DOCUMENT_BUFFER_SIZE (USHORT)32768 /************************************************************************* |* @@ -97,10 +97,10 @@ TYPEINIT1( FuInsertFile, FuPoor ); FuInsertFile::FuInsertFile ( ViewShell* pViewSh, - ::sd::Window* pWin, - ::sd::View* pView, + ::sd::Window* pWin, + ::sd::View* pView, SdDrawDocument* pDoc, - SfxRequest& rReq) + SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) { } @@ -127,7 +127,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) Reference< XFilterManager > xFilterManager( xFilePicker, UNO_QUERY ); String aOwnCont; String aOtherCont; - const SfxFilter* pFilter = NULL; + const SfxFilter* pFilter = NULL; aFileDialog.SetTitle( String( SdResId(STR_DLG_INSERT_PAGES_FROM_FILE ) ) ); @@ -269,12 +269,12 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) mpDocSh->SetWaitCursor( TRUE ); - SfxMedium* pMedium = new SfxMedium( aFile, STREAM_READ | STREAM_NOCREATE, FALSE ); - const SfxFilter* pFilter = NULL; - + SfxMedium* pMedium = new SfxMedium( aFile, STREAM_READ | STREAM_NOCREATE, FALSE ); + const SfxFilter* pFilter = NULL; + SFX_APP()->GetFilterMatcher().GuessFilter( *pMedium, &pFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE ); - - BOOL bDrawMode = mpViewShell && mpViewShell->ISA(DrawViewShell); + + BOOL bDrawMode = mpViewShell && mpViewShell->ISA(DrawViewShell); BOOL bInserted = FALSE; if( pFilter ) @@ -512,11 +512,11 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium) // was zeichnen muessen; // der globale Outliner koennte in SdPage::CreatePresObj // benutzt werden -// SfxItemPool* pPool = mpDoc->GetDrawOutliner().GetEmptyItemSet().GetPool(); +// SfxItemPool* pPool = mpDoc->GetDrawOutliner().GetEmptyItemSet().GetPool(); SdrOutliner* pOutliner = new ::sd::Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT ); -// pOutliner->SetStyleSheetPool((SfxStyleSheetPool*)mpDoc->GetStyleSheetPool()); -// pOutliner->SetEditTextObjectPool(pPool); -// pOutliner->SetForbiddenCharsTable( mpDoc->GetForbiddenCharsTable() ); +// pOutliner->SetStyleSheetPool((SfxStyleSheetPool*)mpDoc->GetStyleSheetPool()); +// pOutliner->SetEditTextObjectPool(pPool); +// pOutliner->SetForbiddenCharsTable( mpDoc->GetForbiddenCharsTable() ); // Referenz-Device setzen pOutliner->SetRefDevice( SD_MOD()->GetRefDevice( *mpDocSh ) ); @@ -634,9 +634,9 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) else if( aFilterName.SearchAscii( "HTML" ) != STRING_NOTFOUND ) nFormat = EE_FORMAT_HTML; - ::Outliner* pDocliner = static_cast<OutlineView*>(mpView)->GetOutliner(); - List* pList = pDocliner->GetView(0)->CreateSelectionList(); - Paragraph* pPara = (Paragraph*)pList->First(); + ::Outliner* pDocliner = static_cast<OutlineView*>(mpView)->GetOutliner(); + List* pList = pDocliner->GetView(0)->CreateSelectionList(); + Paragraph* pPara = (Paragraph*)pList->First(); // wo soll eingefuegt werden? while( !pDocliner->HasParaFlag( pPara, PARAFLAG_ISPAGE ) ) @@ -774,14 +774,14 @@ BOOL FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium) pOutliner->SetParaInsertedHdl( Link(NULL, NULL)); Link aOldParagraphRemovingHdl = pOutliner->GetParaRemovingHdl(); pOutliner->SetParaRemovingHdl( Link(NULL, NULL)); - Link aOldDepthChangedHdl = pOutliner->GetDepthChangedHdl(); + Link aOldDepthChangedHdl = pOutliner->GetDepthChangedHdl(); pOutliner->SetDepthChangedHdl( Link(NULL, NULL)); - Link aOldBeginMovingHdl = pOutliner->GetBeginMovingHdl(); + Link aOldBeginMovingHdl = pOutliner->GetBeginMovingHdl(); pOutliner->SetBeginMovingHdl( Link(NULL, NULL)); - Link aOldEndMovingHdl = pOutliner->GetEndMovingHdl(); + Link aOldEndMovingHdl = pOutliner->GetEndMovingHdl(); pOutliner->SetEndMovingHdl( Link(NULL, NULL)); - Link aOldStatusEventHdl = pOutliner->GetStatusEventHdl(); + Link aOldStatusEventHdl = pOutliner->GetStatusEventHdl(); pOutliner->SetStatusEventHdl(Link(NULL, NULL)); pOutliner->Clear(); diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx index e8191a9ee5d3..e16ed6dcef38 100644 --- a/sd/source/ui/func/fuline.cxx +++ b/sd/source/ui/func/fuline.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,10 +61,10 @@ TYPEINIT1( FuLine, FuPoor ); \************************************************************************/ FuLine::FuLine ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) { @@ -79,7 +79,7 @@ FunctionReference FuLine::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd:: void FuLine::DoExecute( SfxRequest& rReq ) { - BOOL bHasMarked = mpView->AreObjectsMarked(); + BOOL bHasMarked = mpView->AreObjectsMarked(); const SfxItemSet* pArgs = rReq.GetArgs(); diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx index a89bd4253ad7..a415beb911ef 100644 --- a/sd/source/ui/func/fulinend.cxx +++ b/sd/source/ui/func/fulinend.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/fulink.cxx b/sd/source/ui/func/fulink.cxx index 8628dc76fb93..922af457ffb1 100644 --- a/sd/source/ui/func/fulink.cxx +++ b/sd/source/ui/func/fulink.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/fumeasur.cxx b/sd/source/ui/func/fumeasur.cxx index 062664979c2d..4ce60fb86c38 100644 --- a/sd/source/ui/func/fumeasur.cxx +++ b/sd/source/ui/func/fumeasur.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,10 +50,10 @@ TYPEINIT1( FuMeasureDlg, FuPoor ); \************************************************************************/ FuMeasureDlg::FuMeasureDlg ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) { diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index e15c9adf3500..5ab48991715e 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,12 +67,12 @@ TYPEINIT1( FuMorph, FuPoor ); // constructor // FuMorph::FuMorph ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq ) - : FuPoor(pViewSh, pWin, pView, pDoc, rReq) + SdDrawDocument* pDoc, + SfxRequest& rReq ) + : FuPoor(pViewSh, pWin, pView, pDoc, rReq) { } @@ -85,23 +85,23 @@ FunctionReference FuMorph::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd: void FuMorph::DoExecute( SfxRequest& ) { - const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); + const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); if(rMarkList.GetMarkCount() == 2) { // Clones erzeugen - SdrObject* pObj1 = rMarkList.GetMark(0)->GetMarkedSdrObj(); - SdrObject* pObj2 = rMarkList.GetMark(1)->GetMarkedSdrObj(); - SdrObject* pCloneObj1 = pObj1->Clone(); - SdrObject* pCloneObj2 = pObj2->Clone(); + SdrObject* pObj1 = rMarkList.GetMark(0)->GetMarkedSdrObj(); + SdrObject* pObj2 = rMarkList.GetMark(1)->GetMarkedSdrObj(); + SdrObject* pCloneObj1 = pObj1->Clone(); + SdrObject* pCloneObj2 = pObj2->Clone(); // Text am Clone loeschen, da wir sonst kein richtiges PathObj bekommen pCloneObj1->SetOutlinerParaObject(NULL); pCloneObj2->SetOutlinerParaObject(NULL); // Path-Objekte erzeugen - SdrObject* pPolyObj1 = pCloneObj1->ConvertToPolyObj(FALSE, FALSE); - SdrObject* pPolyObj2 = pCloneObj2->ConvertToPolyObj(FALSE, FALSE); + SdrObject* pPolyObj1 = pCloneObj1->ConvertToPolyObj(FALSE, FALSE); + SdrObject* pPolyObj2 = pCloneObj2->ConvertToPolyObj(FALSE, FALSE); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); AbstractMorphDlg* pDlg = pFact ? pFact->CreateMorphDlg( static_cast< ::Window*>(mpWindow), pObj1, pObj2 ) : 0; if(pPolyObj1 && pPolyObj2 && pDlg && (pDlg->Execute() == RET_OK)) @@ -262,7 +262,7 @@ void FuMorph::ImpEqualizePolyPointCount(::basegfx::B2DPolygon& rSmall, const ::b const ::basegfx::B2DPoint aSrcPos(aSrcSize.getCenter()); const ::basegfx::B2DRange aDstSize(::basegfx::tools::getRange(rSmall)); const ::basegfx::B2DPoint aDstPos(aDstSize.getCenter()); - + basegfx::B2DHomMatrix aTrans(basegfx::tools::createTranslateB2DHomMatrix(-aSrcPos.getX(), -aSrcPos.getY())); aTrans.scale(aDstSize.getWidth() / aSrcSize.getWidth(), aDstSize.getHeight() / aSrcSize.getHeight()); aTrans.translate(aDstPos.getX(), aDstPos.getY()); @@ -324,7 +324,7 @@ void FuMorph::ImpAddPolys(::basegfx::B2DPolyPolygon& rSmaller, const ::basegfx:: { aNewPoly.append(aNewPoint); } - + rSmaller.append(aNewPoly); } } @@ -335,21 +335,21 @@ void FuMorph::ImpAddPolys(::basegfx::B2DPolyPolygon& rSmaller, const ::basegfx:: void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, const SdrObject* pObj1, const SdrObject* pObj2) { - Color aStartFillCol; - Color aEndFillCol; - Color aStartLineCol; - Color aEndLineCol; - long nStartLineWidth = 0; - long nEndLineWidth = 0; - SdrPageView* pPageView = mpView->GetSdrPageView(); - SfxItemPool* pPool = pObj1->GetObjectItemPool(); - SfxItemSet aSet1( *pPool,SDRATTR_START,SDRATTR_NOTPERSIST_FIRST-1,EE_ITEMS_START,EE_ITEMS_END,0 ); - SfxItemSet aSet2( aSet1 ); - BOOL bLineColor = FALSE; - BOOL bFillColor = FALSE; - BOOL bLineWidth = FALSE; - BOOL bIgnoreLine = FALSE; - BOOL bIgnoreFill = FALSE; + Color aStartFillCol; + Color aEndFillCol; + Color aStartLineCol; + Color aEndLineCol; + long nStartLineWidth = 0; + long nEndLineWidth = 0; + SdrPageView* pPageView = mpView->GetSdrPageView(); + SfxItemPool* pPool = pObj1->GetObjectItemPool(); + SfxItemSet aSet1( *pPool,SDRATTR_START,SDRATTR_NOTPERSIST_FIRST-1,EE_ITEMS_START,EE_ITEMS_END,0 ); + SfxItemSet aSet2( aSet1 ); + BOOL bLineColor = FALSE; + BOOL bFillColor = FALSE; + BOOL bLineWidth = FALSE; + BOOL bIgnoreLine = FALSE; + BOOL bIgnoreFill = FALSE; aSet1.Put(pObj1->GetMergedItemSet()); aSet2.Put(pObj2->GetMergedItemSet()); @@ -390,13 +390,13 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, if ( pPageView ) { - SfxItemSet aSet( aSet1 ); - SdrObjGroup* pObjGroup = new SdrObjGroup; - SdrObjList* pObjList = pObjGroup->GetSubList(); - const ULONG nCount = rPolyPolyList3D.Count(); - const double fStep = 1. / ( nCount + 1 ); - const double fDelta = nEndLineWidth - nStartLineWidth; - double fFactor = fStep; + SfxItemSet aSet( aSet1 ); + SdrObjGroup* pObjGroup = new SdrObjGroup; + SdrObjList* pObjList = pObjGroup->GetSubList(); + const ULONG nCount = rPolyPolyList3D.Count(); + const double fStep = 1. / ( nCount + 1 ); + const double fDelta = nEndLineWidth - nStartLineWidth; + double fFactor = fStep; aSet.Put( XLineStyleItem( XLINE_SOLID ) ); aSet.Put( XFillStyleItem( XFILL_SOLID ) ); @@ -446,8 +446,8 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, ////////////////////////////////////////////////////////////////////////////// // create single morphed PolyPolygon // -::basegfx::B2DPolyPolygon* FuMorph::ImpCreateMorphedPolygon( - const ::basegfx::B2DPolyPolygon& rPolyPolyStart, +::basegfx::B2DPolyPolygon* FuMorph::ImpCreateMorphedPolygon( + const ::basegfx::B2DPolyPolygon& rPolyPolyStart, const ::basegfx::B2DPolyPolygon& rPolyPolyEnd, double fMorphingFactor) { @@ -479,7 +479,7 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, // create morphed PolyPolygons // sal_Bool FuMorph::ImpMorphPolygons( - const ::basegfx::B2DPolyPolygon& rPolyPoly1, + const ::basegfx::B2DPolyPolygon& rPolyPoly1, const ::basegfx::B2DPolyPolygon& rPolyPoly2, const sal_uInt16 nSteps, List& rPolyPolyList3D) { diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 142949a462fd..3e7d46a4dcfd 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ #include "View.hxx" #include "sdabstdlg.hxx" #include "sdresid.hxx" -#include <vcl/salbtype.hxx> // FRound +#include <vcl/salbtype.hxx> // FRound #include <basegfx/polygon/b2dpolygon.hxx> using namespace ::com::sun::star; @@ -75,11 +75,11 @@ TYPEINIT1( FuObjectAnimationParameters, FuPoor ); \************************************************************************/ FuObjectAnimationParameters::FuObjectAnimationParameters ( - ViewShell* pViewSh, - ::sd::Window* pWin, - ::sd::View* pView, + ViewShell* pViewSh, + ::sd::Window* pWin, + ::sd::View* pView, SdDrawDocument* pDoc, - SfxRequest& rReq) + SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) { } @@ -96,8 +96,8 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) SfxUndoManager* pUndoMgr = mpViewShell->GetViewFrame()->GetObjectShell()->GetUndoManager(); const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(); - ULONG nObject = 0; + ULONG nCount = rMarkList.GetMarkCount(); + ULONG nObject = 0; short nAnimationSet = ATTR_MISSING; short nEffectSet = ATTR_MISSING; @@ -727,10 +727,10 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) pAction->SetSoundOn(pInfo->mbSoundOn, pInfo->mbSoundOn); pAction->SetSound(pInfo->maSoundFile, pInfo->maSoundFile); pAction->SetPlayFull(pInfo->mbPlayFull, pInfo->mbPlayFull); -// pAction->SetPathObj(pInfo->mpPathObj, pInfo->mpPathObj); +// pAction->SetPathObj(pInfo->mpPathObj, pInfo->mpPathObj); pAction->SetClickAction(pInfo->meClickAction, pInfo->meClickAction); pAction->SetBookmark(pInfo->GetBookmark(), pInfo->GetBookmark()); -// pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, TRUE); +// pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, TRUE); pAction->SetVerb(pInfo->mnVerb, pInfo->mnVerb); pAction->SetSecondEffect(pInfo->meSecondEffect, pInfo->meSecondEffect); pAction->SetSecondSpeed(pInfo->meSecondSpeed, pInfo->meSecondSpeed); @@ -738,7 +738,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) pAction->SetSecondPlayFull(pInfo->mbSecondPlayFull, pInfo->mbSecondPlayFull); pUndoGroup->AddAction(pAction); -// pInfo->mbInvisibleInPresentation = TRUE; +// pInfo->mbInvisibleInPresentation = TRUE; } else { @@ -759,8 +759,8 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) pAction->SetPathObj(pInfo->mpPathObj, pPath); pAction->SetClickAction(pInfo->meClickAction, eClickAction); pAction->SetBookmark(pInfo->GetBookmark(), aBookmark); -// pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, -// pInfo->mbInvisibleInPresentation); +// pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, +// pInfo->mbInvisibleInPresentation); pAction->SetVerb(pInfo->mnVerb, (USHORT)pInfo->GetBookmark().ToInt32() ); pAction->SetSecondEffect(pInfo->meSecondEffect, eSecondEffect); pAction->SetSecondSpeed(pInfo->meSecondSpeed, eSecondSpeed); @@ -818,8 +818,8 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) pInfo->mbSecondPlayFull = bSecondPlayFull; // noch ein paar Spezialitaeten -// if (eEffect == presentation::AnimationEffect_PATH && nEffectSet == ATTR_SET) -// pInfo->mSetPath(pPath); +// if (eEffect == presentation::AnimationEffect_PATH && nEffectSet == ATTR_SET) +// pInfo->mSetPath(pPath); if (eClickAction == presentation::ClickAction_VERB) pInfo->mnVerb = (USHORT)aBookmark.ToInt32(); diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index c6388e788620..ae2113c66a39 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx index f3c146184c20..361b38ddee37 100644 --- a/sd/source/ui/func/fuoltext.cxx +++ b/sd/source/ui/func/fuoltext.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/fuoutl.cxx b/sd/source/ui/func/fuoutl.cxx index d1d65291c4c6..30ae5344a316 100644 --- a/sd/source/ui/func/fuoutl.cxx +++ b/sd/source/ui/func/fuoutl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,10 +48,10 @@ TYPEINIT1( FuOutline, FuPoor ); \************************************************************************/ FuOutline::FuOutline ( - ViewShell* pViewShell, - ::sd::Window* pWindow, + ViewShell* pViewShell, + ::sd::Window* pWindow, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewShell, pWindow, pView, pDoc, rReq), pOutlineViewShell (static_cast<OutlineViewShell*>(pViewShell)), @@ -69,13 +69,13 @@ BOOL FuOutline::Command(const CommandEvent& rCEvt) { BOOL bResult = FALSE; - OutlinerView* pOlView = + OutlinerView* pOlView = static_cast<OutlineView*>(mpView)->GetViewByWindow(mpWindow); DBG_ASSERT (pOlView, "keine OutlinerView gefunden"); if (pOlView) { - pOlView->Command(rCEvt); // liefert leider keinen Returnwert + pOlView->Command(rCEvt); // liefert leider keinen Returnwert bResult = TRUE; } return bResult; diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 9196c2803249..c6881014b14e 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -124,7 +124,7 @@ void mergeItemSetsImpl( SfxItemSet& rTarget, const SfxItemSet& rSource ) FuPage::FuPage( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) -: FuPoor(pViewSh, pWin, pView, pDoc, rReq), +: FuPoor(pViewSh, pWin, pView, pDoc, rReq), mrReq(rReq), mpArgs( rReq.GetArgs() ), mpBackgroundObjUndoAction( 0 ), @@ -282,10 +282,10 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) } else { - if(pStyleSheet + if(pStyleSheet && XFILL_NONE != ((const XFillStyleItem&)pStyleSheet->GetItemSet().Get(XATTR_FILLSTYLE)).GetValue()) { - // if the page has no fill style, use the settings from the + // if the page has no fill style, use the settings from the // background stylesheet (if used) mergeItemSetsImpl(aMergedAttr, pStyleSheet->GetItemSet()); } @@ -302,11 +302,11 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) if( GetSlotID() == SID_SELECT_BACKGROUND ) { - SvxOpenGraphicDialog aDlg(SdResId(STR_SET_BACKGROUND_PICTURE)); + SvxOpenGraphicDialog aDlg(SdResId(STR_SET_BACKGROUND_PICTURE)); if( aDlg.Execute() == GRFILTER_OK ) { - Graphic aGraphic; + Graphic aGraphic; int nError = aDlg.GetGraphic(aGraphic); if( nError == GRFILTER_OK ) { @@ -467,7 +467,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) SdrPage& rUsedMasterPage = mpPage->IsMasterPage() ? *mpPage : mpPage->TRG_GetMasterPage(); OSL_ENSURE(rUsedMasterPage.IsMasterPage(), "No MasterPage (!)"); rUsedMasterPage.getSdrPageProperties().ClearItem(); - OSL_ENSURE(0 != rUsedMasterPage.getSdrPageProperties().GetStyleSheet(), + OSL_ENSURE(0 != rUsedMasterPage.getSdrPageProperties().GetStyleSheet(), "MasterPage without StyleSheet detected (!)"); } @@ -493,10 +493,10 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) const SfxPoolItem* pPoolItem; BOOL bSetPageSizeAndBorder = FALSE; Size aNewSize(maSize); - INT32 nLeft = -1, nRight = -1, nUpper = -1, nLower = -1; - BOOL bScaleAll = TRUE; + INT32 nLeft = -1, nRight = -1, nUpper = -1, nLower = -1; + BOOL bScaleAll = TRUE; Orientation eOrientation = mpPage->GetOrientation(); - SdPage* pMasterPage = mpPage->IsMasterPage() ? mpPage : &(SdPage&)(mpPage->TRG_GetMasterPage()); + SdPage* pMasterPage = mpPage->IsMasterPage() ? mpPage : &(SdPage&)(mpPage->TRG_GetMasterPage()); BOOL bFullSize = pMasterPage->IsBackgroundFullSize(); USHORT nPaperBin = mpPage->GetPaperBin(); diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx index e18240c6ca2e..62406e785e07 100644 --- a/sd/source/ui/func/fuparagr.cxx +++ b/sd/source/ui/func/fuparagr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 7400e477ead7..514c369f0abf 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -183,12 +183,12 @@ void FuPoor::ForceScroll(const Point& aPixPos) if ( !mpView->IsDragHelpLine() && !mpView->IsSetPageOrg() && !SlideShow::IsRunning( mpViewShell->GetViewShellBase() ) ) { -/* Size aSize = mpWindow->GetSizePixel(); +/* Size aSize = mpWindow->GetSizePixel(); short dx = 0, dy = 0; - if ( aPixPos.X() <= 0 ) dx = -1; + if ( aPixPos.X() <= 0 ) dx = -1; if ( aPixPos.X() >= aSize.Width() ) dx = 1; - if ( aPixPos.Y() <= 0 ) dy = -1; + if ( aPixPos.Y() <= 0 ) dy = -1; if ( aPixPos.Y() >= aSize.Height() ) dy = 1; */ Point aPos = mpWindow->OutputToScreenPixel(aPixPos); @@ -203,10 +203,10 @@ void FuPoor::ForceScroll(const Point& aPixPos) { short dx = 0, dy = 0; - if ( aPos.X() <= rRect.Left() ) dx = -1; - if ( aPos.X() >= rRect.Right() ) dx = 1; - if ( aPos.Y() <= rRect.Top() ) dy = -1; - if ( aPos.Y() >= rRect.Bottom() ) dy = 1; + if ( aPos.X() <= rRect.Left() ) dx = -1; + if ( aPos.X() >= rRect.Right() ) dx = 1; + if ( aPos.Y() <= rRect.Top() ) dy = -1; + if ( aPos.Y() >= rRect.Bottom() ) dy = 1; if ( dx != 0 || dy != 0 ) { @@ -233,7 +233,7 @@ void FuPoor::ForceScroll(const Point& aPixPos) IMPL_LINK_INLINE_START( FuPoor, ScrollHdl, Timer *, EMPTYARG ) { Point aPnt(mpWindow->GetPointerPosPixel()); - + // #95491# use remembered MouseButton state to create correct // MouseEvents for this artifical MouseMove. MouseMove(MouseEvent(aPnt, 1, 0, GetMouseButtonCode())); @@ -266,7 +266,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) { if(mpViewShell && mpViewShell->ISA(DrawViewShell)) { - DrawViewShell* pDrawViewShell = + DrawViewShell* pDrawViewShell = static_cast<DrawViewShell*>(mpViewShell); SdPage* pActualPage = pDrawViewShell->GetActualPage(); SdrTextObj* pCandidate = 0L; @@ -284,7 +284,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) sal_uInt32 nInv(pObj->GetObjInventor()); sal_uInt16 nKnd(pObj->GetObjIdentifier()); - if(SdrInventor == nInv && + if(SdrInventor == nInv && (OBJ_TITLETEXT == nKnd || OBJ_OUTLINETEXT == nKnd || OBJ_TEXT == nKnd)) { pCandidate = (SdrTextObj*)pObj; @@ -317,7 +317,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) // #98255# activate OLE object on RETURN for selected object // #98198# activate text edit on RETURN for selected object const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); - + if( !mpView->IsTextEdit() && 1 == rMarkList.GetMarkCount() ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); @@ -370,7 +370,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) } } break; - + case KEY_ESCAPE: { bReturn = FuPoor::cancel(); @@ -461,8 +461,8 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) case KEY_HOME: { - if (!mpView->IsTextEdit() - && mpViewShell->ISA(DrawViewShell) + if (!mpView->IsTextEdit() + && mpViewShell->ISA(DrawViewShell) && !bSlideShow) { // Sprung zu erster Seite @@ -474,12 +474,12 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) case KEY_END: { - if (!mpView->IsTextEdit() - && mpViewShell->ISA(DrawViewShell) + if (!mpView->IsTextEdit() + && mpViewShell->ISA(DrawViewShell) && !bSlideShow) { // Sprung zu letzter Seite - SdPage* pPage = + SdPage* pPage = static_cast<DrawViewShell*>(mpViewShell)->GetActualPage(); static_cast<DrawViewShell*>(mpViewShell) ->SwitchPage(mpDoc->GetSdPageCount( @@ -493,7 +493,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) { if( rKEvt.GetKeyCode().IsMod1() && rKEvt.GetKeyCode().IsMod2() ) break; - + if(mpViewShell->ISA(DrawViewShell) && !bSlideShow) { // The page-up key switches layers or pages depending on the @@ -503,12 +503,12 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) // With no modifier pressed we move to the previous // slide. mpView->SdrEndTextEdit(); - + // Previous page. bReturn = TRUE; SdPage* pPage = static_cast<DrawViewShell*>(mpViewShell)->GetActualPage(); USHORT nSdPage = (pPage->GetPageNum() - 1) / 2; - + if (nSdPage > 0) { // Switch the page and send events regarding @@ -547,14 +547,14 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) // modifier key. if ( ! rKEvt.GetKeyCode().GetAllModifier()) { - // With no modifier pressed we move to the next slide. + // With no modifier pressed we move to the next slide. mpView->SdrEndTextEdit(); - + // Next page. bReturn = TRUE; SdPage* pPage = static_cast<DrawViewShell*>(mpViewShell)->GetActualPage(); USHORT nSdPage = (pPage->GetPageNum() - 1) / 2; - + if (nSdPage < mpDoc->GetSdPageCount(pPage->GetPageKind()) - 1) { // Switch the page and send events regarding @@ -570,7 +570,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) } } else if (rKEvt.GetKeyCode().IsMod1()) - { + { // With the CONTROL modifier we switch layers. if (static_cast<DrawViewShell*>(mpViewShell)->IsLayerModeActive()) { @@ -596,7 +596,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) // rescue ID of point with focus sal_uInt32 nPol(pHdl->GetPolyNum()); sal_uInt32 nPnt(pHdl->GetPointNum()); - + if(mpView->IsPointMarked(*pHdl)) { if(rKEvt.GetKeyCode().IsShift()) @@ -613,7 +613,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) mpView->MarkPoint(*pHdl); } - + if(0L == rHdlList.GetFocusHdl()) { // restore point with focus @@ -622,9 +622,9 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) for(sal_uInt32 a(0); !pNewOne && a < rHdlList.GetHdlCount(); a++) { SdrHdl* pAct = rHdlList.GetHdl(a); - - if(pAct - && pAct->GetKind() == HDL_POLY + + if(pAct + && pAct->GetKind() == HDL_POLY && pAct->GetPolyNum() == nPol && pAct->GetPointNum() == nPnt) { @@ -886,14 +886,14 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) // #98533# use common IsSimpleCharInput from // the EditEngine. sal_Bool bPrintable(EditEngine::IsSimpleCharInput(rKEvt)); - + if(bPrintable) { // try to activate textedit mode for the selected object SfxStringItem aInputString(SID_ATTR_CHAR, String(rKEvt.GetCharCode())); - + mpViewShell->GetViewFrame()->GetDispatcher()->Execute( - SID_ATTR_CHAR, + SID_ATTR_CHAR, SFX_CALLMODE_ASYNCHRON, &aInputString, 0L); @@ -907,10 +907,10 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) { // #99039# test if there is a title object there. If yes, try to // set it to edit mode and start typing... - if(mpViewShell->ISA(DrawViewShell) + if(mpViewShell->ISA(DrawViewShell) && EditEngine::IsSimpleCharInput(rKEvt)) { - DrawViewShell* pDrawViewShell = + DrawViewShell* pDrawViewShell = static_cast<DrawViewShell*>(mpViewShell); SdPage* pActualPage = pDrawViewShell->GetActualPage(); SdrTextObj* pCandidate = 0L; @@ -944,7 +944,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) SfxStringItem aInputString(SID_ATTR_CHAR, String(rKEvt.GetCharCode())); mpViewShell->GetViewFrame()->GetDispatcher()->Execute( - SID_ATTR_CHAR, + SID_ATTR_CHAR, SFX_CALLMODE_ASYNCHRON, &aInputString, 0L); @@ -1061,7 +1061,7 @@ IMPL_LINK_INLINE_START( FuPoor, DelayHdl, Timer *, EMPTYARG ) bScrollable = TRUE; Point aPnt(mpWindow->GetPointerPosPixel()); - + // #95491# use remembered MouseButton state to create correct // MouseEvents for this artifical MouseMove. MouseMove(MouseEvent(aPnt, 1, 0, GetMouseButtonCode())); @@ -1082,16 +1082,16 @@ BOOL FuPoor::MouseButtonUp (const MouseEvent& rMEvt) SetMouseButtonCode(rMEvt.GetButtons()); aDelayToScrollTimer.Stop (); - return bScrollable = + return bScrollable = bDelayActive = FALSE; } -BOOL FuPoor::MouseButtonDown(const MouseEvent& rMEvt) -{ +BOOL FuPoor::MouseButtonDown(const MouseEvent& rMEvt) +{ // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - return FALSE; + return FALSE; } /************************************************************************* @@ -1176,13 +1176,13 @@ void FuPoor::ImpForceQuadratic(Rectangle& rRect) if(rRect.GetWidth() > rRect.GetHeight()) { rRect = Rectangle( - Point(rRect.Left() + ((rRect.GetWidth() - rRect.GetHeight()) / 2), rRect.Top()), + Point(rRect.Left() + ((rRect.GetWidth() - rRect.GetHeight()) / 2), rRect.Top()), Size(rRect.GetHeight(), rRect.GetHeight())); } else { rRect = Rectangle( - Point(rRect.Left(), rRect.Top() + ((rRect.GetHeight() - rRect.GetWidth()) / 2)), + Point(rRect.Left(), rRect.Top() + ((rRect.GetHeight() - rRect.GetWidth()) / 2)), Size(rRect.GetWidth(), rRect.GetWidth())); } } @@ -1194,7 +1194,7 @@ void FuPoor::SwitchLayer (sal_Int32 nOffset) { if(mpViewShell && mpViewShell->ISA(DrawViewShell)) { - DrawViewShell* pDrawViewShell = + DrawViewShell* pDrawViewShell = static_cast<DrawViewShell*>(mpViewShell); // Calculate the new index. diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index 7f6011005939..8da448d42356 100644 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,8 +75,8 @@ SO2_DECL_REF(SvStorage) TYPEINIT1( FuPresentationLayout, FuPoor ); -#define POOL_BUFFER_SIZE (USHORT)32768 -#define DOCUMENT_BUFFER_SIZE (USHORT)32768 +#define POOL_BUFFER_SIZE (USHORT)32768 +#define DOCUMENT_BUFFER_SIZE (USHORT)32768 #define DOCUMENT_TOKEN (sal_Unicode('#')) /************************************************************************* @@ -146,9 +146,9 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) BOOL bCheckMasters = FALSE; // Dialog aufrufen - BOOL bLoad = FALSE; // tauchen neue Masterpages auf? + BOOL bLoad = FALSE; // tauchen neue Masterpages auf? String aFile; - + SfxItemSet aSet(mpDoc->GetPool(), ATTR_PRESLAYOUT_START, ATTR_PRESLAYOUT_END); aSet.Put( SfxBoolItem( ATTR_PRESLAYOUT_LOAD, bLoad)); @@ -156,8 +156,8 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) aSet.Put( SfxBoolItem( ATTR_PRESLAYOUT_CHECK_MASTERS, bCheckMasters ) ); aSet.Put( SfxStringItem( ATTR_PRESLAYOUT_NAME, aOldLayoutName)); - - + + const SfxItemSet *pArgs = rReq.GetArgs (); if (pArgs) @@ -248,7 +248,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) { if (mpViewShell->ISA(DrawViewShell)) { - ::sd::View* pView = + ::sd::View* pView = static_cast<DrawViewShell*>(mpViewShell)->GetView(); USHORT nPgNum = pSelectedPage->TRG_GetMasterPage().GetPageNum(); @@ -271,7 +271,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) // fake a mode change to repaint the page tab bar if( mpViewShell && mpViewShell->ISA( DrawViewShell ) ) { - DrawViewShell* pDrawViewSh = + DrawViewShell* pDrawViewSh = static_cast<DrawViewShell*>(mpViewShell); EditMode eMode = pDrawViewSh->GetEditMode(); BOOL bLayer = pDrawViewSh->IsLayerModeActive(); diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index 1e67a409fb40..402bd9cc0324 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ TYPEINIT1( FuPresentationObjects, FuPoor ); FuPresentationObjects::FuPresentationObjects ( ViewShell* pViewSh, - ::sd::Window* pWin, + ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq) @@ -94,8 +94,8 @@ void FuPresentationObjects::DoExecute( SfxRequest& ) String aLayoutName = (((SfxStringItem&)aSet.Get(SID_STATUS_LAYOUT)).GetValue()); DBG_ASSERT(aLayoutName.Len(), "Layout unbestimmt"); - BOOL bUnique = FALSE; - sal_Int16 nDepth, nTmp; + BOOL bUnique = FALSE; + sal_Int16 nDepth, nTmp; OutlineView* pOlView = static_cast<OutlineView*>(pOutlineViewShell->GetView()); OutlinerView* pOutlinerView = pOlView->GetViewByWindow( (Window*) mpWindow ); ::Outliner* pOutl = pOutlinerView->GetOutliner(); @@ -129,7 +129,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& ) String aStyleName = aLayoutName; aStyleName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ) ); USHORT nDlgId = TAB_PRES_LAYOUT_TEMPLATE; - PresentationObjects ePO; + PresentationObjects ePO; if( bPage ) { diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx index ab6ac2434d0a..1dca285dcdf2 100644 --- a/sd/source/ui/func/fuscale.cxx +++ b/sd/source/ui/func/fuscale.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,10 +65,10 @@ TYPEINIT1( FuScale, FuPoor ); \************************************************************************/ FuScale::FuScale ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) { @@ -197,7 +197,7 @@ void FuScale::DoExecute( SfxRequest& rReq ) break; } } - + delete pZoomItem; } else if(mpViewShell && (pArgs->Count () == 1)) diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx index f5e65b8a1e8a..8224e4d8915d 100644 --- a/sd/source/ui/func/fusearch.cxx +++ b/sd/source/ui/func/fusearch.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 3cbb76adc095..240d96340e19 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx index 1d7e4cac9c8f..4223ac10ddda 100644 --- a/sd/source/ui/func/fusldlg.cxx +++ b/sd/source/ui/func/fusldlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,11 +60,11 @@ TYPEINIT1( FuSlideShowDlg, FuPoor ); \************************************************************************/ FuSlideShowDlg::FuSlideShowDlg ( - ViewShell* pViewSh, + ViewShell* pViewSh, ::sd::Window* pWin, - ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq) + ::sd::View* pView, + SdDrawDocument* pDoc, + SfxRequest& rReq) : FuPoor( pViewSh, pWin, pView, pDoc, rReq ) { } @@ -80,13 +80,13 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) { PresentationSettings& rPresentationSettings = mpDoc->getPresentationSettings(); - SfxItemSet aDlgSet( mpDoc->GetPool(), ATTR_PRESENT_START, ATTR_PRESENT_END ); - List aPageNameList; - const String& rPresPage = rPresentationSettings.maPresPage; - String aFirstPage; - String aStandardName( SdResId( STR_PAGE ) ); - SdPage* pPage = NULL; - long nPage; + SfxItemSet aDlgSet( mpDoc->GetPool(), ATTR_PRESENT_START, ATTR_PRESENT_END ); + List aPageNameList; + const String& rPresPage = rPresentationSettings.maPresPage; + String aFirstPage; + String aStandardName( SdResId( STR_PAGE ) ); + SdPage* pPage = NULL; + long nPage; for( nPage = mpDoc->GetSdPageCount( PK_STANDARD ) - 1L; nPage >= 0L; nPage-- ) { @@ -145,9 +145,9 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) if( pDlg && (pDlg->Execute() == RET_OK) ) { rtl::OUString aPage; - long nValue32; + long nValue32; sal_Bool bValue; - bool bValuesChanged = FALSE; + bool bValuesChanged = FALSE; pDlg->GetAttr( aDlgSet ); diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx index dbd29cf755af..72356caf7e96 100644 --- a/sd/source/ui/func/fusnapln.cxx +++ b/sd/source/ui/func/fusnapln.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,8 +75,8 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) { const SfxItemSet* pArgs = rReq.GetArgs(); SdrPageView* pPV = 0; - USHORT nHelpLine = 0; - BOOL bCreateNew = TRUE; + USHORT nHelpLine = 0; + BOOL bCreateNew = TRUE; // Get index of snap line or snap point from the request. SFX_REQUEST_ARG (rReq, pHelpLineIndex, SfxUInt32Item, ID_VAL_INDEX, FALSE); @@ -86,19 +86,19 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) // Reset the argument pointer to trigger the display of the dialog. pArgs = NULL; } - + if ( !pArgs ) { SfxItemSet aNewAttr(mpViewShell->GetPool(), ATTR_SNAPLINE_START, ATTR_SNAPLINE_END); bool bLineExist (false); pPV = mpView->GetSdrPageView(); Point aLinePos; - + if (pHelpLineIndex == NULL) { // The index of the snap line is not provided as argument to the // request. Determine it from the mouse position. - + aLinePos = static_cast<DrawViewShell*>(mpViewShell)->GetMousePos(); static_cast<DrawViewShell*>(mpViewShell)->SetMousePosFreezed( FALSE ); @@ -194,9 +194,9 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) switch ( (SnapKind) ((const SfxAllEnumItem&) pArgs->Get(ATTR_SNAPLINE_KIND)).GetValue() ) { - case SK_HORIZONTAL : eKind = SDRHELPLINE_HORIZONTAL; break; - case SK_VERTICAL : eKind = SDRHELPLINE_VERTICAL; break; - default : eKind = SDRHELPLINE_POINT; break; + case SK_HORIZONTAL : eKind = SDRHELPLINE_HORIZONTAL; break; + case SK_VERTICAL : eKind = SDRHELPLINE_VERTICAL; break; + default : eKind = SDRHELPLINE_POINT; break; } pPV->InsertHelpLine(SdrHelpLine(eKind, aHlpPos)); } diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx index ace7e51524b2..48e6489a6ef8 100644 --- a/sd/source/ui/func/fusumry.cxx +++ b/sd/source/ui/func/fusumry.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,10 +61,10 @@ TYPEINIT1( FuSummaryPage, FuPoor ); |* \************************************************************************/ FuSummaryPage::FuSummaryPage ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) { diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index 5ade46f9a8a3..35ffa85d3fc2 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -247,14 +247,14 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) String aStr; if( // if the object had no style sheet, allow all - !pOldStyleSheet || - + !pOldStyleSheet || + // allow if old and new style sheet has same family pStyleSheet->GetFamily() == pOldStyleSheet->GetFamily() || - + // allow if old was background objects and new is graphics pStyleSheet->GetFamily() == (SD_STYLE_FAMILY_GRAPHICS && pOldStyleSheet->GetHelpId( aStr ) == HID_PSEUDOSHEET_BACKGROUNDOBJECTS) || - + // allow if old was presentation and we are a drawing document (pOldStyleSheet->GetFamily() == SD_STYLE_FAMILY_MASTERPAGE && mpDoc->GetDocumentType() == DOCUMENT_TYPE_DRAW) ) { diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index ae617a2f218d..0b77cab868d1 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -117,7 +117,7 @@ static USHORT SidArray[] = { SID_SET_SUPER_SCRIPT, // 10294 SID_SET_SUB_SCRIPT, // 10295 SID_HYPERLINK_GETLINK, // 10361 - SID_CHARMAP, // 10503 + SID_CHARMAP, // 10503 SID_TEXTDIRECTION_LEFT_TO_RIGHT, // 10907 SID_TEXTDIRECTION_TOP_TO_BOTTOM, // 10908 SID_ATTR_PARA_LEFT_TO_RIGHT, // 10950 @@ -138,7 +138,7 @@ static BOOL bTestText = 0; |* \************************************************************************/ -FuText::FuText( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) +FuText::FuText( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) : FuConstruct(pViewSh, pWin, pView, pDoc, rReq) , bFirstObjCreated(FALSE) , rRequest (rReq) @@ -407,10 +407,10 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) // this caused SdrEndTextEdit() to be called also when not in text editing and // this does not make sense and caused troubles. (see issue 112855) -// ::Outliner* pOutl = mpView->GetTextEditOutliner(); -// -// if (mxTextObj.is() && (mxTextObj->GetOutlinerParaObject() || -// (pOutl && pOutl->GetText(pOutl->GetParagraph( 0 )).Len() != 0))) +// ::Outliner* pOutl = mpView->GetTextEditOutliner(); +// +// if (mxTextObj.is() && (mxTextObj->GetOutlinerParaObject() || +// (pOutl && pOutl->GetText(pOutl->GetParagraph( 0 )).Len() != 0))) if( mpView->IsTextEdit() ) { mpView->SdrEndTextEdit(); @@ -1006,8 +1006,8 @@ BOOL FuText::KeyInput(const KeyEvent& rKEvt) mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray ); -// if ( pTextObj ) -// pTextObj->SetEmptyPresObj(FALSE); +// if ( pTextObj ) +// pTextObj->SetEmptyPresObj(FALSE); } else if (aKeyCode == KEY_ESCAPE) { @@ -1412,7 +1412,7 @@ void FuText::DoubleClick(const MouseEvent& ) */ SdrObject* FuText::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) { - // case SID_TEXTEDIT: // BASIC ??? + // case SID_TEXTEDIT: // BASIC ??? // case SID_ATTR_CHAR: // case SID_ATTR_CHAR_VERTICAL: // case SID_TEXT_FITTOSIZE: @@ -1501,7 +1501,7 @@ void FuText::ChangeFontSize( bool bGrow, OutlinerView* pOLV, const FontList* pFo } else { -// SdDrawDocument* pDoc = pView->GetDoc(); +// SdDrawDocument* pDoc = pView->GetDoc(); const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); for( sal_uInt32 nMark = 0; nMark < rMarkList.GetMarkCount(); nMark++ ) @@ -1543,7 +1543,7 @@ void FuText::ChangeFontSize( bool bGrow, OutlinerView* pOLV, const FontList* pFo pTextObj->SetObjectItemNoBroadcast( aShapeSet.Get( EE_CHAR_FONTHEIGHT_CTL ) ); } } - } + } } } diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx index 7705a68b6930..82e172e8496f 100644 --- a/sd/source/ui/func/futhes.cxx +++ b/sd/source/ui/func/futhes.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx index 58f88594dbda..f3cde6852b89 100644 --- a/sd/source/ui/func/futransf.cxx +++ b/sd/source/ui/func/futransf.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/futxtatt.cxx b/sd/source/ui/func/futxtatt.cxx index d49825760570..8a1c9cd44413 100644 --- a/sd/source/ui/func/futxtatt.cxx +++ b/sd/source/ui/func/futxtatt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,10 +51,10 @@ TYPEINIT1( FuTextAttrDlg, FuPoor ); \************************************************************************/ FuTextAttrDlg::FuTextAttrDlg ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) { diff --git a/sd/source/ui/func/fuvect.cxx b/sd/source/ui/func/fuvect.cxx index be46ab48d72b..0be4b7970936 100644 --- a/sd/source/ui/func/fuvect.cxx +++ b/sd/source/ui/func/fuvect.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,10 +57,10 @@ TYPEINIT1( FuVectorize, FuPoor ); \************************************************************************/ FuVectorize::FuVectorize ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor (pViewSh, pWin, pView, pDoc, rReq) { @@ -87,13 +87,13 @@ void FuVectorize::DoExecute( SfxRequest& ) AbstractSdVectorizeDlg* pDlg = pFact ? pFact->CreateSdVectorizeDlg( mpWindow, ( (SdrGrafObj*) pObj )->GetGraphic().GetBitmap(), mpDocSh ) : 0; if( pDlg && pDlg->Execute() == RET_OK ) { - const GDIMetaFile& rMtf = pDlg->GetGDIMetaFile(); - SdrPageView* pPageView = mpView->GetSdrPageView(); + const GDIMetaFile& rMtf = pDlg->GetGDIMetaFile(); + SdrPageView* pPageView = mpView->GetSdrPageView(); if( pPageView && rMtf.GetActionCount() ) { - SdrGrafObj* pVectObj = (SdrGrafObj*) pObj->Clone(); - String aStr( mpView->GetDescriptionOfMarkedObjects() ); + SdrGrafObj* pVectObj = (SdrGrafObj*) pObj->Clone(); + String aStr( mpView->GetDescriptionOfMarkedObjects() ); aStr.Append( sal_Unicode(' ') ); aStr.Append( String( SdResId( STR_UNDO_VECTORIZE ) ) ); diff --git a/sd/source/ui/func/fuzoom.cxx b/sd/source/ui/func/fuzoom.cxx index 5160c641e387..fe3e2fc13988 100644 --- a/sd/source/ui/func/fuzoom.cxx +++ b/sd/source/ui/func/fuzoom.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,8 +65,8 @@ FuZoom::FuZoom( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq) + SdDrawDocument* pDoc, + SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq), bVisible(FALSE), bStartDrag(FALSE) diff --git a/sd/source/ui/func/sdundo.cxx b/sd/source/ui/func/sdundo.cxx index ab9e3c6345b7..70024e69ee05 100644 --- a/sd/source/ui/func/sdundo.cxx +++ b/sd/source/ui/func/sdundo.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/sdundogr.cxx b/sd/source/ui/func/sdundogr.cxx index 6d3550965a7c..427c2b0571f1 100644 --- a/sd/source/ui/func/sdundogr.cxx +++ b/sd/source/ui/func/sdundogr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,14 +64,14 @@ BOOL SdUndoGroup::Merge( SfxUndoAction* pNextAction ) if( pNextAction && pNextAction->ISA( SdUndoAction ) ) { SdUndoAction* pClone = static_cast< SdUndoAction* >( pNextAction )->Clone(); - + if( pClone ) { AddAction( pClone ); bRet = TRUE; } } - + return bRet; } diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx index 7743bbec6f10..cf3ff21b5526 100644 --- a/sd/source/ui/func/smarttag.cxx +++ b/sd/source/ui/func/smarttag.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -285,8 +285,8 @@ bool SmartTagSet::KeyInput( const KeyEvent& rKEvt ) return true; } } - - + + return false; } @@ -336,7 +336,7 @@ bool SmartTagSet::Command( const CommandEvent& rCEvt ) { if( mxSelectedTag.is() ) return mxSelectedTag->Command( rCEvt ); - + } return false; @@ -405,7 +405,7 @@ ULONG SmartTagSet::GetMarkedPointCount() const BOOL SmartTagSet::IsPointMarkable(const SdrHdl& rHdl) const { const SmartHdl* pSmartHdl = dynamic_cast< const SmartHdl* >( &rHdl ); - + return pSmartHdl && pSmartHdl->isMarkable(); } @@ -451,7 +451,7 @@ SmartHdl::SmartHdl( const SmartTagReference& xTag, const Point& rPnt, SdrHdlKind : SdrHdl( rPnt, eNewKind ) , mxTag( xTag ) { -} +} // -------------------------------------------------------------------- diff --git a/sd/source/ui/func/undoback.cxx b/sd/source/ui/func/undoback.cxx index b09ace0712d6..e5bc6ec5521b 100644 --- a/sd/source/ui/func/undoback.cxx +++ b/sd/source/ui/func/undoback.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,10 +43,10 @@ TYPEINIT1( SdBackgroundObjUndoAction, SdUndoAction ); // ----------------------------------------------------------------------------- -SdBackgroundObjUndoAction::SdBackgroundObjUndoAction( - SdDrawDocument& rDoc, +SdBackgroundObjUndoAction::SdBackgroundObjUndoAction( + SdDrawDocument& rDoc, SdPage& rPage, - const SfxItemSet& rItenSet) + const SfxItemSet& rItenSet) : SdUndoAction(&rDoc), mrPage(rPage), mpItemSet(new SfxItemSet(rItenSet)) diff --git a/sd/source/ui/func/undoheaderfooter.cxx b/sd/source/ui/func/undoheaderfooter.cxx index dd3973085c12..f1b200fbfb3c 100644 --- a/sd/source/ui/func/undoheaderfooter.cxx +++ b/sd/source/ui/func/undoheaderfooter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,8 +40,8 @@ TYPEINIT1(SdHeaderFooterUndoAction, SdUndoAction); -SdHeaderFooterUndoAction::SdHeaderFooterUndoAction( SdDrawDocument* pDoc, SdPage* pPage, const sd::HeaderFooterSettings& rNewSettings ) -: SdUndoAction(pDoc), +SdHeaderFooterUndoAction::SdHeaderFooterUndoAction( SdDrawDocument* pDoc, SdPage* pPage, const sd::HeaderFooterSettings& rNewSettings ) +: SdUndoAction(pDoc), mpPage(pPage), maOldSettings(pPage->getHeaderFooterSettings()), maNewSettings(rNewSettings) diff --git a/sd/source/ui/func/undolayer.cxx b/sd/source/ui/func/undolayer.cxx index 563005021e4d..3c021d1304cd 100644 --- a/sd/source/ui/func/undolayer.cxx +++ b/sd/source/ui/func/undolayer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,11 +39,11 @@ TYPEINIT1(SdLayerModifyUndoAction, SdUndoAction); -SdLayerModifyUndoAction::SdLayerModifyUndoAction( +SdLayerModifyUndoAction::SdLayerModifyUndoAction( SdDrawDocument* _pDoc, SdrLayer* pLayer, const String& rOldLayerName, const String& rOldLayerTitle, const String& rOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool bOldIsPrintable, const String& rNewLayerName, const String& rNewLayerTitle, const String& rNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool bNewIsPrintable ) -: SdUndoAction( _pDoc ), +: SdUndoAction( _pDoc ), mpLayer( pLayer ), maOldLayerName( rOldLayerName ), maOldLayerTitle( rOldLayerTitle ), @@ -67,7 +67,7 @@ void SdLayerModifyUndoAction::Undo() ::sd::DrawDocShell* mpDocSh = mpDoc->GetDocSh(); if( mpDocSh ) { - ::sd::DrawViewShell* pDrViewSh = + ::sd::DrawViewShell* pDrViewSh = PTR_CAST(::sd::DrawViewShell, mpDocSh->GetViewShell() ); if( pDrViewSh ) { @@ -81,7 +81,7 @@ void SdLayerModifyUndoAction::Redo() ::sd::DrawDocShell* mpDocSh = mpDoc->GetDocSh(); if( mpDocSh ) { - ::sd::DrawViewShell* pDrViewSh = + ::sd::DrawViewShell* pDrViewSh = PTR_CAST(::sd::DrawViewShell, mpDocSh->GetViewShell() ); if( pDrViewSh ) { diff --git a/sd/source/ui/func/undopage.cxx b/sd/source/ui/func/undopage.cxx index ad3c47c0f24f..36355309daf9 100644 --- a/sd/source/ui/func/undopage.cxx +++ b/sd/source/ui/func/undopage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/func/unmovss.cxx b/sd/source/ui/func/unmovss.cxx index c7043cbe3804..a70484e59cd2 100644 --- a/sd/source/ui/func/unmovss.cxx +++ b/sd/source/ui/func/unmovss.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ void SdMoveStyleSheetsUndoAction::Undo() if (mbMySheets) { - // the styles have to be inserted in the pool + // the styles have to be inserted in the pool // first insert all styles to the pool for(SdStyleSheetVector::iterator iter = maStyles.begin(); iter != maStyles.end(); iter++ ) diff --git a/sd/source/ui/func/unoaprms.cxx b/sd/source/ui/func/unoaprms.cxx index 799f49f06267..a063d84e25fe 100644 --- a/sd/source/ui/func/unoaprms.cxx +++ b/sd/source/ui/func/unoaprms.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,26 +49,26 @@ void SdAnimationPrmsUndoAction::Undo() // keine neu Info erzeugt: Daten restaurieren if (!bInfoCreated) { - SdDrawDocument* pDoc = (SdDrawDocument*)pObject->GetModel(); + SdDrawDocument* pDoc = (SdDrawDocument*)pObject->GetModel(); if( pDoc ) { SdAnimationInfo* pInfo = pDoc->GetAnimationInfo( pObject ); // So nicht... //SdAnimationInfo* pInfo = (SdAnimationInfo*)pObject->GetUserData(0); - pInfo->mbActive = bOldActive; + pInfo->mbActive = bOldActive; pInfo->meEffect = eOldEffect; pInfo->meTextEffect = eOldTextEffect; - pInfo->meSpeed = eOldSpeed; + pInfo->meSpeed = eOldSpeed; pInfo->mbDimPrevious = bOldDimPrevious; pInfo->maDimColor = aOldDimColor; pInfo->mbDimHide = bOldDimHide; pInfo->mbSoundOn = bOldSoundOn; pInfo->maSoundFile = aOldSoundFile; pInfo->mbPlayFull = bOldPlayFull; -// pInfo->mSetPath(pOldPathObj); +// pInfo->mSetPath(pOldPathObj); pInfo->meClickAction = eOldClickAction; pInfo->SetBookmark( aOldBookmark ); -// pInfo->mbInvisibleInPresentation = bOldInvisibleInPres; +// pInfo->mbInvisibleInPresentation = bOldInvisibleInPres; pInfo->mnVerb = nOldVerb; pInfo->mnPresOrder = nOldPresOrder; @@ -111,10 +111,10 @@ void SdAnimationPrmsUndoAction::Redo() pInfo->mbSoundOn = bNewSoundOn; pInfo->maSoundFile = aNewSoundFile; pInfo->mbPlayFull = bNewPlayFull; -// pInfo->mSetPath(pNewPathObj); +// pInfo->mSetPath(pNewPathObj); pInfo->meClickAction = eNewClickAction; pInfo->SetBookmark( aNewBookmark ); -// pInfo->mbInvisibleInPresentation = bNewInvisibleInPres; +// pInfo->mbInvisibleInPresentation = bNewInvisibleInPres; pInfo->mnVerb = nNewVerb; pInfo->mnPresOrder = nNewPresOrder; diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx index 059fc04751e2..4904780f5b74 100644 --- a/sd/source/ui/func/unprlout.cxx +++ b/sd/source/ui/func/unprlout.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |