diff options
Diffstat (limited to 'sc/source/ui/drawfunc/fudraw.cxx')
-rw-r--r-- | sc/source/ui/drawfunc/fudraw.cxx | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index 70342cc10e24..a96a16206421 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/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 @@ -31,7 +31,7 @@ //------------------------------------------------------------------------ -#include <editeng/editeng.hxx> // EditEngine::IsSimpleCharInput +#include <editeng/editeng.hxx> // EditEngine::IsSimpleCharInput #include <editeng/outlobj.hxx> #include <svx/svdobj.hxx> #include <svx/svdoole2.hxx> @@ -87,23 +87,23 @@ FuDraw::~FuDraw() void FuDraw::DoModifiers(const MouseEvent& rMEvt) { - // Shift = Ortho und AngleSnap - // Control = Snap (Toggle) - // Alt = zentrisch + // Shift = Ortho und AngleSnap + // Control = Snap (Toggle) + // Alt = zentrisch - BOOL bShift = rMEvt.IsShift(); + BOOL bShift = rMEvt.IsShift(); // BOOL bCtrl = rMEvt.IsMod1(); - BOOL bAlt = rMEvt.IsMod2(); + BOOL bAlt = rMEvt.IsMod2(); // ScViewData* pViewData = pViewShell->GetViewData(); // const ScViewOptions& rOpt = pViewData->GetOptions(); // const ScGridOptions& rGrid = rOpt.GetGridOptions(); // BOOL bGridOpt = rGrid.GetUseGridSnap(); - BOOL bOrtho = bShift; - BOOL bAngleSnap = bShift; + BOOL bOrtho = bShift; + BOOL bAngleSnap = bShift; // BOOL bGridSnap = ( bGridOpt != bCtrl ); // andere Snap's nicht unterstuetzt - BOOL bCenter = bAlt; + BOOL bCenter = bAlt; // #i33136# if(doConstructOrthogonal()) @@ -116,7 +116,7 @@ void FuDraw::DoModifiers(const MouseEvent& rMEvt) if (pView->IsAngleSnapEnabled() != bAngleSnap) pView->SetAngleSnapEnabled(bAngleSnap); -/* Control fuer Snap beisst sich beim Verschieben mit "kopieren" !!! +/* Control fuer Snap beisst sich beim Verschieben mit "kopieren" !!! if (pView->IsGridSnap() != bGridSnap) pView->SetGridSnap(bGridSnap); @@ -176,8 +176,8 @@ BOOL __EXPORT FuDraw::MouseButtonDown(const MouseEvent& rMEvt) BOOL __EXPORT FuDraw::MouseMove(const MouseEvent& rMEvt) { - // #106438# evaluate modifiers only if in a drawing layer action - // (don't interfere with keyboard shortcut handling) + // #106438# evaluate modifiers only if in a drawing layer action + // (don't interfere with keyboard shortcut handling) if (pView->IsAction()) DoModifiers( rMEvt ); @@ -230,7 +230,7 @@ BOOL lcl_KeyEditMode( SdrObject* pObj, ScTabViewShell* pViewShell, const KeyEven // get the resulting FuText and set in edit mode pPoor = pViewShell->GetViewData()->GetView()->GetDrawFuncPtr(); - if ( pPoor && pPoor->GetSlotID() == nTextSlotId ) // no RTTI + if ( pPoor && pPoor->GetSlotID() == nTextSlotId ) // no RTTI { FuText* pText = (FuText*)pPoor; pText->SetInEditMode( pObj, NULL, TRUE, pInitialKey ); @@ -252,20 +252,20 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt) /* 18.12.95: TextShell beibehalten nicht mehr gewuenscht... * - * if ( pView->IsAction() ) - * { - * pView->BrkAction(); - * pWindow->ReleaseMouse(); - * bReturn = TRUE; - * } - * else if ( pView->IsTextEdit() ) - * { - * pView->EndTextEdit(); - * pView->SetCreateMode(); - * pViewShell->GetScDrawView()->InvalidateDrawTextAttrs(); - * bReturn = TRUE; - * } - * else + * if ( pView->IsAction() ) + * { + * pView->BrkAction(); + * pWindow->ReleaseMouse(); + * bReturn = TRUE; + * } + * else if ( pView->IsTextEdit() ) + * { + * pView->EndTextEdit(); + * pView->SetCreateMode(); + * pViewShell->GetScDrawView()->InvalidateDrawTextAttrs(); + * bReturn = TRUE; + * } + * else */ if ( pViewShell->IsDrawTextShell() || aSfxRequest.GetSlot() == SID_DRAW_NOTEEDIT ) @@ -289,7 +289,7 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt) else pView->UnmarkAll(); - // Beim Bezier-Editieren ist jetzt wieder das Objekt selektiert + // Beim Bezier-Editieren ist jetzt wieder das Objekt selektiert if (!pView->AreObjectsMarked()) pViewShell->SetDrawShell( FALSE ); @@ -297,7 +297,7 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt) } break; - case KEY_DELETE: //! ueber Accelerator + case KEY_DELETE: //! ueber Accelerator pView->DeleteMarked(); bReturn = TRUE; break; @@ -321,7 +321,7 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt) // consumed bReturn = TRUE; } - else if ( lcl_KeyEditMode( pObj, pViewShell, NULL ) ) // start text edit for suitable object + else if ( lcl_KeyEditMode( pObj, pViewShell, NULL ) ) // start text edit for suitable object bReturn = TRUE; } } @@ -338,7 +338,7 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt) if( !pView->IsTextEdit() && 1 == rMarkList.GetMarkCount() ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); - if ( lcl_KeyEditMode( pObj, pViewShell, NULL ) ) // start text edit for suitable object + if ( lcl_KeyEditMode( pObj, pViewShell, NULL ) ) // start text edit for suitable object bReturn = TRUE; } } @@ -720,7 +720,7 @@ void FuDraw::SelectionHasChanged() void FuDraw::ScrollStart() { -// HideShownXor in Gridwin +// HideShownXor in Gridwin } /************************************************************************* @@ -731,7 +731,7 @@ void FuDraw::ScrollStart() void FuDraw::ScrollEnd() { -// ShowShownXor in Gridwin +// ShowShownXor in Gridwin } /************************************************************************* @@ -786,9 +786,9 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) if ( !pView->IsAction() ) { Point aPosPixel = pWindow->GetPointerPosPixel(); - BOOL bAlt = pMEvt && pMEvt->IsMod2(); - Point aPnt = pWindow->PixelToLogic( aPosPixel ); - SdrHdl* pHdl = pView->PickHandle(aPnt); + BOOL bAlt = pMEvt && pMEvt->IsMod2(); + Point aPnt = pWindow->PixelToLogic( aPosPixel ); + SdrHdl* pHdl = pView->PickHandle(aPnt); SdrObject* pObj; SdrPageView* pPV; @@ -806,7 +806,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) if ( pView->IsTextEdit() ) { - pViewShell->SetActivePointer(Pointer(POINTER_TEXT)); // kann nicht sein ? + pViewShell->SetActivePointer(Pointer(POINTER_TEXT)); // kann nicht sein ? } else if ( pHdl ) { @@ -820,13 +820,13 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) else if ( !bAlt && ( !pMEvt || !pMEvt->GetButtons() ) && lcl_UrlHit( pView, aPosPixel, pWindow ) ) { - // kann mit ALT unterdrueckt werden - pWindow->SetPointer( Pointer( POINTER_REFHAND ) ); // Text-URL / ImageMap + // kann mit ALT unterdrueckt werden + pWindow->SetPointer( Pointer( POINTER_REFHAND ) ); // Text-URL / ImageMap } else if ( !bAlt && pView->PickObj(aPnt, pView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKMACRO) ) { - // kann mit ALT unterdrueckt werden - SdrObjMacroHitRec aHitRec; //! muss da noch irgendwas gesetzt werden ???? + // kann mit ALT unterdrueckt werden + SdrObjMacroHitRec aHitRec; //! muss da noch irgendwas gesetzt werden ???? pViewShell->SetActivePointer( pObj->GetMacroPointer(aHitRec) ); } else if ( !bAlt && pInfo && ((pInfo->GetMacro().getLength() > 0) || (pInfo->GetHlink().getLength() > 0)) ) @@ -834,7 +834,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) else if ( IsDetectiveHit( aPnt ) ) pViewShell->SetActivePointer( Pointer( POINTER_DETECTIVE ) ); else - pViewShell->SetActivePointer( aNewPointer ); //! in Gridwin? + pViewShell->SetActivePointer( aNewPointer ); //! in Gridwin? } } |