svdmrkv.cxx (cdf0e10c) | svdmrkv.cxx (079eb148) |
---|---|
1/************************************************************************* 2 * 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 * 5 * Copyright 2000, 2010 Oracle and/or its affiliates. 6 * 7 * OpenOffice.org - a multi-platform office productivity suite 8 * --- 717 unchanged lines hidden (view full) --- 726 727 // #i33755# 728 const sal_Bool bHideHandlesWhenInTextEdit( 729 ((SdrView*)this)->IsTextEdit() 730 && pMarkedObj 731 && pMarkedObj->ISA(SdrTextObj) 732 && ((SdrTextObj*)pMarkedObj)->IsInEditMode()); 733 | 1/************************************************************************* 2 * 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 * 5 * Copyright 2000, 2010 Oracle and/or its affiliates. 6 * 7 * OpenOffice.org - a multi-platform office productivity suite 8 * --- 717 unchanged lines hidden (view full) --- 726 727 // #i33755# 728 const sal_Bool bHideHandlesWhenInTextEdit( 729 ((SdrView*)this)->IsTextEdit() 730 && pMarkedObj 731 && pMarkedObj->ISA(SdrTextObj) 732 && ((SdrTextObj*)pMarkedObj)->IsInEditMode()); 733 |
734 if(!aRect.IsEmpty() && !bHideHandlesWhenInTextEdit) | 734 // #i118524# if inplace activated OLE is selected, 735 // suppress handles 736 bool bHideHandlesWhenOleActive(false); 737 const SdrOle2Obj* pSdrOle2Obj = dynamic_cast< const SdrOle2Obj* >(pMarkedObj); 738 739 if(pSdrOle2Obj && (pSdrOle2Obj->isInplaceActive() || pSdrOle2Obj->isUiActive())) 740 { 741 bHideHandlesWhenOleActive = true; 742 } 743 744 if(!aRect.IsEmpty() && !bHideHandlesWhenInTextEdit && !bHideHandlesWhenOleActive) |
735 { // sonst nix gefunden 736 if( bSingleTextObjMark ) 737 { 738 const sal_uIntPtr nSiz0=aHdl.GetHdlCount(); 739 pMarkedObj->AddToHdlList(aHdl); 740 const sal_uIntPtr nSiz1=aHdl.GetHdlCount(); 741 for (sal_uIntPtr i=nSiz0; i<nSiz1; i++) 742 { --- 1435 unchanged lines hidden --- | 745 { // sonst nix gefunden 746 if( bSingleTextObjMark ) 747 { 748 const sal_uIntPtr nSiz0=aHdl.GetHdlCount(); 749 pMarkedObj->AddToHdlList(aHdl); 750 const sal_uIntPtr nSiz1=aHdl.GetHdlCount(); 751 for (sal_uIntPtr i=nSiz0; i<nSiz1; i++) 752 { --- 1435 unchanged lines hidden --- |