diff options
Diffstat (limited to 'sw/source/uibase/dochdl/swdtflvr.cxx')
| -rw-r--r-- | sw/source/uibase/dochdl/swdtflvr.cxx | 188 |
1 files changed, 94 insertions, 94 deletions
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index bff00a0c9519..12d04664d4d4 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -130,7 +130,7 @@ #include <memory> -extern bool g_bFrmDrag; +extern bool g_bFrameDrag; extern bool g_bDDINetAttr; extern bool g_bExecuteDrag; @@ -472,10 +472,10 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo m_pWrtShell->SelectTextAttr( RES_TXTATR_INETFMT ); } } - if( m_pWrtShell->IsFrmSelected() ) + if( m_pWrtShell->IsFrameSelected() ) { SfxItemSet aSet( m_pWrtShell->GetAttrPool(), RES_URL, RES_URL ); - m_pWrtShell->GetFlyFrmAttr( aSet ); + m_pWrtShell->GetFlyFrameAttr( aSet ); const SwFormatURL& rURL = static_cast<const SwFormatURL&>(aSet.Get( RES_URL )); if( rURL.GetMap() ) m_pImageMap = new ImageMap( *rURL.GetMap() ); @@ -859,7 +859,7 @@ int SwTransferable::PrepareForCopy( bool bIsCut ) m_eBufferType = TRNSFR_OLE; } // Is there anything to provide anyway? - else if ( m_pWrtShell->IsSelection() || m_pWrtShell->IsFrmSelected() || + else if ( m_pWrtShell->IsSelection() || m_pWrtShell->IsFrameSelected() || m_pWrtShell->IsObjSelected() ) { std::unique_ptr<SwWait> pWait; @@ -872,8 +872,8 @@ int SwTransferable::PrepareForCopy( bool bIsCut ) // and mouse selection is possible. // In AddMode with keyboard selection, the new cursor is not created // before the cursor is moved after end of selection. - if( m_pWrtShell->IsAddMode() && m_pWrtShell->SwCrsrShell::HasSelection() ) - m_pWrtShell->CreateCrsr(); + if( m_pWrtShell->IsAddMode() && m_pWrtShell->SwCursorShell::HasSelection() ) + m_pWrtShell->CreateCursor(); SwDoc *const pTmpDoc = lcl_GetDoc(*m_pClpDocFac); @@ -989,10 +989,10 @@ int SwTransferable::PrepareForCopy( bool bIsCut ) else nRet = 0; - if( m_pWrtShell->IsFrmSelected() ) + if( m_pWrtShell->IsFrameSelected() ) { SfxItemSet aSet( m_pWrtShell->GetAttrPool(), RES_URL, RES_URL ); - m_pWrtShell->GetFlyFrmAttr( aSet ); + m_pWrtShell->GetFlyFrameAttr( aSet ); const SwFormatURL& rURL = static_cast<const SwFormatURL&>(aSet.Get( RES_URL )); if( rURL.GetMap() ) { @@ -1542,9 +1542,9 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData, } } - if( !bPasteSelection && rSh.IsFrmSelected() ) + if( !bPasteSelection && rSh.IsFrameSelected() ) { - rSh.EnterSelFrmMode(); + rSh.EnterSelFrameMode(); //force ::SelectShell rSh.GetView().StopShellTimer(); } @@ -1693,11 +1693,11 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData, if( pStream && pRead ) { - Link<SwCrsrShell*,void> aOldLink( rSh.GetChgLnk() ); - rSh.SetChgLnk( Link<SwCrsrShell*,void>() ); + Link<SwCursorShell*,void> aOldLink( rSh.GetChgLnk() ); + rSh.SetChgLnk( Link<SwCursorShell*,void>() ); - const SwPosition& rInsPos = *rSh.GetCrsr()->Start(); - SwReader aReader( *pStream, aEmptyOUStr, OUString(), *rSh.GetCrsr() ); + const SwPosition& rInsPos = *rSh.GetCursor()->Start(); + SwReader aReader( *pStream, aEmptyOUStr, OUString(), *rSh.GetCursor() ); rSh.SaveTableBoxContent( &rInsPos ); if( IsError( aReader.Read( *pRead )) ) nResId = STR_ERROR_CLPBRD_READ; @@ -1788,7 +1788,7 @@ bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh, if( pRead ) { - SwPaM &rPAM = *rSh.GetCrsr(); + SwPaM &rPAM = *rSh.GetCursor(); SwReader aReader( xStore, aEmptyOUStr, rPAM ); if( !IsError( aReader.Read( *pRead )) ) bRet = true; @@ -1982,7 +1982,7 @@ bool SwTransferable::_PasteTargetURL( TransferableDataHelper& rData, if( rSh.IsObjSelected() ) { rSh.ReplaceSdrObj( sURL, aEmptyOUStr, &aGraphic ); - Point aPt( pPt ? *pPt : rSh.GetCrsrDocPos() ); + Point aPt( pPt ? *pPt : rSh.GetCursorDocPos() ); SwTransferable::SetSelInShell( rSh, true, &aPt ); } else @@ -2012,7 +2012,7 @@ bool SwTransferable::_PasteTargetURL( TransferableDataHelper& rData, if( bRet ) { SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL ); - rSh.GetFlyFrmAttr( aSet ); + rSh.GetFlyFrameAttr( aSet ); SwFormatURL aURL( static_cast<const SwFormatURL&>(aSet.Get( RES_URL )) ); if( aURL.GetURL() != aINetImg.GetTargetURL() || @@ -2021,16 +2021,16 @@ bool SwTransferable::_PasteTargetURL( TransferableDataHelper& rData, aURL.SetURL( aINetImg.GetTargetURL(), false ); aURL.SetTargetFrameName( aINetImg.GetTargetFrame() ); aSet.Put( aURL ); - rSh.SetFlyFrmAttr( aSet ); + rSh.SetFlyFrameAttr( aSet ); } } return bRet; } -void SwTransferable::SetSelInShell( SwWrtShell& rSh, bool bSelectFrm, +void SwTransferable::SetSelInShell( SwWrtShell& rSh, bool bSelectFrame, const Point* pPt ) { - if( bSelectFrm ) + if( bSelectFrame ) { // select frames/objects if( pPt && !rSh.GetView().GetViewFrame()->GetDispatcher()->IsLocked() ) @@ -2038,27 +2038,27 @@ void SwTransferable::SetSelInShell( SwWrtShell& rSh, bool bSelectFrm, rSh.GetView().NoRotate(); if( rSh.SelectObj( *pPt )) { - rSh.HideCrsr(); - rSh.EnterSelFrmMode( pPt ); - g_bFrmDrag = true; + rSh.HideCursor(); + rSh.EnterSelFrameMode( pPt ); + g_bFrameDrag = true; } } } else { - if( rSh.IsFrmSelected() || rSh.IsObjSelected() ) + if( rSh.IsFrameSelected() || rSh.IsObjSelected() ) { - rSh.UnSelectFrm(); - rSh.LeaveSelFrmMode(); - rSh.GetView().GetEditWin().StopInsFrm(); - g_bFrmDrag = false; + rSh.UnSelectFrame(); + rSh.LeaveSelFrameMode(); + rSh.GetView().GetEditWin().StopInsFrame(); + g_bFrameDrag = false; } else if( rSh.GetView().GetDrawFuncPtr() ) - rSh.GetView().GetEditWin().StopInsFrm(); + rSh.GetView().GetEditWin().StopInsFrame(); rSh.EnterStdMode(); if( pPt ) - rSh.SwCrsrShell::SetCrsr( *pPt, true ); + rSh.SwCursorShell::SetCursor( *pPt, true ); } } @@ -2331,7 +2331,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, if( !bRet && SwPasteSdr::SetAttr == nAction && SotClipboardFormatId::SIMPLE_FILE == nFormat && // only at frame selection - rSh.IsFrmSelected() ) + rSh.IsFrameSelected() ) { // then set as hyperlink after the graphic nFormat = SotClipboardFormatId::NETSCAPE_BOOKMARK; @@ -2381,7 +2381,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, rSh.Paste( aGraphic, sURL ); // rSh.ReplaceSdrObj( sURL, aEmptyOUStr, &aGraphic ); - // Point aPt( pPt ? *pPt : rSh.GetCrsrDocPos() ); + // Point aPt( pPt ? *pPt : rSh.GetCursorDocPos() ); // SwTransferable::SetSelInShell( rSh, true, &aPt ); } else @@ -2397,14 +2397,14 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, { if( SotClipboardFormatId::NETSCAPE_BOOKMARK == nFormat ) { - if( rSh.IsFrmSelected() ) + if( rSh.IsFrameSelected() ) { SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL ); - rSh.GetFlyFrmAttr( aSet ); + rSh.GetFlyFrameAttr( aSet ); SwFormatURL aURL( static_cast<const SwFormatURL&>(aSet.Get( RES_URL )) ); aURL.SetURL( aBkmk.GetURL(), false ); aSet.Put( aURL ); - rSh.SetFlyFrmAttr( aSet ); + rSh.SetFlyFrameAttr( aSet ); } } else if( rSh.IsObjSelected() ) @@ -2458,11 +2458,11 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, aMap.GetIMapObjectCount() ) { SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL ); - rSh.GetFlyFrmAttr( aSet ); + rSh.GetFlyFrameAttr( aSet ); SwFormatURL aURL( static_cast<const SwFormatURL&>(aSet.Get( RES_URL )) ); aURL.SetMap( &aMap ); aSet.Put( aURL ); - rSh.SetFlyFrmAttr( aSet ); + rSh.SetFlyFrameAttr( aSet ); bRet = true; } } @@ -2477,7 +2477,7 @@ bool SwTransferable::_PasteImageMap( TransferableDataHelper& rData, if( rData.HasFormat( SotClipboardFormatId::SVIM )) { SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL ); - rSh.GetFlyFrmAttr( aSet ); + rSh.GetFlyFrameAttr( aSet ); SwFormatURL aURL( static_cast<const SwFormatURL&>(aSet.Get( RES_URL )) ); const ImageMap* pOld = aURL.GetMap(); @@ -2488,7 +2488,7 @@ bool SwTransferable::_PasteImageMap( TransferableDataHelper& rData, { aURL.SetMap( &aImageMap ); aSet.Put( aURL ); - rSh.SetFlyFrmAttr( aSet ); + rSh.SetFlyFrameAttr( aSet ); } bRet = true; } @@ -2518,13 +2518,13 @@ bool SwTransferable::_PasteAsHyperlink( TransferableDataHelper& rData, case OBJCNT_OLE: { SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL ); - rSh.GetFlyFrmAttr( aSet ); + rSh.GetFlyFrameAttr( aSet ); SwFormatURL aURL2( static_cast<const SwFormatURL&>(aSet.Get( RES_URL )) ); aURL2.SetURL( sFile, false ); if( aURL2.GetName().isEmpty() ) aURL2.SetName( sFile ); aSet.Put( aURL2 ); - rSh.SetFlyFrmAttr( aSet ); + rSh.SetFlyFrameAttr( aSet ); } break; @@ -2612,13 +2612,13 @@ bool SwTransferable::_PasteFileName( TransferableDataHelper& rData, case OBJCNT_OLE: { SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL ); - rSh.GetFlyFrmAttr( aSet ); + rSh.GetFlyFrameAttr( aSet ); SwFormatURL aURL2( static_cast<const SwFormatURL&>(aSet.Get( RES_URL )) ); aURL2.SetURL( sFile, false ); if( aURL2.GetName().isEmpty() ) aURL2.SetName( sFile ); aSet.Put( aURL2 ); - rSh.SetFlyFrmAttr( aSet ); + rSh.SetFlyFrameAttr( aSet ); } break; @@ -3047,7 +3047,7 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos ) m_eBufferType = TRNSFR_OLE; } //Is there anything to provide anyway? - else if ( m_pWrtShell->IsSelection() || m_pWrtShell->IsFrmSelected() || + else if ( m_pWrtShell->IsSelection() || m_pWrtShell->IsFrameSelected() || m_pWrtShell->IsObjSelected() ) { if( m_pWrtShell->IsObjSelected() ) @@ -3136,10 +3136,10 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos ) } } - if( m_pWrtShell->IsFrmSelected() ) + if( m_pWrtShell->IsFrameSelected() ) { SfxItemSet aSet( m_pWrtShell->GetAttrPool(), RES_URL, RES_URL ); - m_pWrtShell->GetFlyFrmAttr( aSet ); + m_pWrtShell->GetFlyFrameAttr( aSet ); const SwFormatURL& rURL = static_cast<const SwFormatURL&>(aSet.Get( RES_URL )); if( rURL.GetMap() ) { @@ -3165,8 +3165,8 @@ void SwTransferable::StartDrag( vcl::Window* pWin, const Point& rPos ) m_pWrtShell->GetViewOptions()->SetIdle( false ); - if( m_pWrtShell->IsSelFrmMode() ) - m_pWrtShell->ShowCrsr(); + if( m_pWrtShell->IsSelFrameMode() ) + m_pWrtShell->ShowCursor(); SW_MOD()->m_pDragDrop = this; @@ -3196,7 +3196,7 @@ void SwTransferable::DragFinished( sal_Int8 nAction ) m_pWrtShell->DeleteTableSel(); else { - if ( !(m_pWrtShell->IsSelFrmMode() || m_pWrtShell->IsObjSelected()) ) + if ( !(m_pWrtShell->IsSelFrameMode() || m_pWrtShell->IsObjSelected()) ) //SmartCut, take one of the blanks along m_pWrtShell->IntelligentCut( m_pWrtShell->GetSelectionType() ); m_pWrtShell->DelRight(); @@ -3210,16 +3210,16 @@ void SwTransferable::DragFinished( sal_Int8 nAction ) if( ( nsSelectionType::SEL_FRM | nsSelectionType::SEL_GRF | nsSelectionType::SEL_OLE | nsSelectionType::SEL_DRW ) & nSelection ) { - m_pWrtShell->EnterSelFrmMode(); + m_pWrtShell->EnterSelFrameMode(); } } } m_pWrtShell->GetView().GetEditWin().DragFinished(); - if( m_pWrtShell->IsSelFrmMode() ) - m_pWrtShell->HideCrsr(); + if( m_pWrtShell->IsSelFrameMode() ) + m_pWrtShell->HideCursor(); else - m_pWrtShell->ShowCrsr(); + m_pWrtShell->ShowCursor(); m_pWrtShell->GetViewOptions()->SetIdle( m_bOldIdle ); } @@ -3254,7 +3254,7 @@ bool SwTransferable::PrivatePaste( SwWrtShell& rShell ) { // position the cursor again Point aPt( rShell.GetCharRect().Pos() ); - rShell.SwCrsrShell::SetCrsr( aPt, true ); + rShell.SwCursorShell::SetCursor( aPt, true ); } rShell.SetRetainSelection( false ); } @@ -3302,11 +3302,11 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, bool bSttWrd = false; bool bSttPara = false; bool bTableSel = false; - bool bFrmSel = false; + bool bFrameSel = false; SwWrtShell& rSrcSh = *GetShell(); - rSh.UnSetVisCrsr(); + rSh.UnSetVisibleCursor(); if( TRNSFR_INETFLD == m_eBufferType ) { @@ -3319,9 +3319,9 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, // select target graphic if( rSh.SelectObj( rDragPt ) ) { - rSh.HideCrsr(); - rSh.EnterSelFrmMode( &rDragPt ); - g_bFrmDrag = true; + rSh.HideCursor(); + rSh.EnterSelFrameMode( &rDragPt ); + g_bFrameDrag = true; } const int nSelection = rSh.GetSelectionType(); @@ -3330,20 +3330,20 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, if( nsSelectionType::SEL_GRF & nSelection ) { SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL ); - rSh.GetFlyFrmAttr( aSet ); + rSh.GetFlyFrameAttr( aSet ); SwFormatURL aURL( static_cast<const SwFormatURL&>(aSet.Get( RES_URL )) ); aURL.SetURL( aTmp.GetURL(), false ); aSet.Put( aURL ); - rSh.SetFlyFrmAttr( aSet ); + rSh.SetFlyFrameAttr( aSet ); return true; } if( nsSelectionType::SEL_DRW & nSelection ) { - rSh.LeaveSelFrmMode(); - rSh.UnSelectFrm(); - rSh.ShowCrsr(); - g_bFrmDrag = false; + rSh.LeaveSelFrameMode(); + rSh.UnSelectFrame(); + rSh.ShowCursor(); + g_bFrameDrag = false; } } } @@ -3361,18 +3361,18 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, //not in selections or selected frames if( rSh.ChgCurrPam( rDragPt ) || - ( rSh.IsSelFrmMode() && rSh.IsInsideSelectedObj( rDragPt )) ) + ( rSh.IsSelFrameMode() && rSh.IsInsideSelectedObj( rDragPt )) ) return false; if( rSrcSh.IsTableMode() ) bTableSel = true; - else if( rSrcSh.IsSelFrmMode() || rSrcSh.IsObjSelected() ) + else if( rSrcSh.IsSelFrameMode() || rSrcSh.IsObjSelected() ) { // don't move position-protected objects! if( bMove && rSrcSh.IsSelObjProtected( FlyProtectFlags::Pos ) != FlyProtectFlags::NONE ) return false; - bFrmSel = true; + bFrameSel = true; } const int nSel = rSrcSh.GetSelectionType(); @@ -3393,10 +3393,10 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, if( &rSrcSh != &rSh ) { rSh.EnterStdMode(); - rSh.SwCrsrShell::SetCrsr( rDragPt, true ); + rSh.SwCursorShell::SetCursor( rDragPt, true ); cWord = rSrcSh.IntelligentCut( nSel, false ); } - else if( !bTableSel && !bFrmSel ) + else if( !bTableSel && !bFrameSel ) { if( !rSh.IsAddMode() ) { @@ -3404,15 +3404,15 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, if ( rSh.IsBlockMode() ) { // preserve order of cursors for block mode - rSh.GoPrevCrsr(); + rSh.GoPrevCursor(); } - rSh.SwCrsrShell::CreateCrsr(); + rSh.SwCursorShell::CreateCursor(); } - rSh.SwCrsrShell::SetCrsr( rDragPt, true, false ); - rSh.GoPrevCrsr(); + rSh.SwCursorShell::SetCursor( rDragPt, true, false ); + rSh.GoPrevCursor(); cWord = rSh.IntelligentCut( rSh.GetSelectionType(), false ); - rSh.GoNextCrsr(); + rSh.GoNextCursor(); } bInWrd = rSh.IsInWord(); @@ -3427,23 +3427,23 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, { if( &rSrcSh == &rSh ) { - rSh.GoPrevCrsr(); - rSh.SwCrsrShell::SetCrsr( aSttPt, true ); + rSh.GoPrevCursor(); + rSh.SwCursorShell::SetCursor( aSttPt, true ); rSh.SelectTextAttr( RES_TXTATR_INETFMT ); if( rSh.ChgCurrPam( rDragPt ) ) { // don't copy/move inside of yourself - rSh.DestroyCrsr(); + rSh.DestroyCursor(); rSh.EndUndo(); rSh.EndAction(); rSh.EndAction(); return false; } - rSh.GoNextCrsr(); + rSh.GoNextCursor(); } else { - rSrcSh.SwCrsrShell::SetCrsr( aSttPt, true ); + rSrcSh.SwCursorShell::SetCursor( aSttPt, true ); rSrcSh.SelectTextAttr( RES_TXTATR_INETFMT ); } @@ -3453,7 +3453,7 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, g_bDDINetAttr = true; } - if ( rSrcSh.IsSelFrmMode() ) + if ( rSrcSh.IsSelFrameMode() ) { //Hack: fool the special treatment aSttPt -= aSttPt - rSrcSh.GetObjRect().Pos(); @@ -3465,7 +3465,7 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, if( !bIsXSelection ) { rSrcSh.Push(); - if ( bRet && bMove && !bFrmSel ) + if ( bRet && bMove && !bFrameSel ) { if ( bTableSel ) { @@ -3475,7 +3475,7 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, else { //SmartCut, take one of the blanks along. - rSh.SwCrsrShell::DestroyCrsr(); + rSh.SwCursorShell::DestroyCursor(); if ( cWord == SwWrtShell::WORD_SPACE_BEFORE ) rSh.ExtendSelection( false ); else if ( cWord == SwWrtShell::WORD_SPACE_AFTER ) @@ -3490,12 +3490,12 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, set cursor to the drop position. */ if( &rSh == &rSrcSh && ( bTableSel || rSh.IsBlockMode() ) ) { - rSrcSh.SwCrsrShell::SetCrsr(rDragPt); - rSrcSh.GetSwCrsr()->SetMark(); + rSrcSh.SwCursorShell::SetCursor(rDragPt); + rSrcSh.GetSwCursor()->SetMark(); } } - if( bRet && !bTableSel && !bFrmSel ) + if( bRet && !bTableSel && !bFrameSel ) { if( (bInWrd || bEndWrd) && (cWord == SwWrtShell::WORD_SPACE_AFTER || @@ -3516,19 +3516,19 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, { if( &rSrcSh == &rSh && !rSh.IsAddMode() ) { - rSh.SwCrsrShell::DestroyCrsr(); - rSh.GoPrevCrsr(); + rSh.SwCursorShell::DestroyCursor(); + rSh.GoPrevCursor(); } else { rSh.SwapPam(); - rSh.SwCrsrShell::ClearMark(); + rSh.SwCursorShell::ClearMark(); } } else { if( rSh.IsAddMode() ) - rSh.SwCrsrShell::CreateCrsr(); + rSh.SwCursorShell::CreateCursor(); else { // turn on selection mode @@ -3538,16 +3538,16 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, } } - if( bRet && bMove && bFrmSel ) - rSrcSh.LeaveSelFrmMode(); + if( bRet && bMove && bFrameSel ) + rSrcSh.LeaveSelFrameMode(); if( rSrcSh.GetDoc() != rSh.GetDoc() ) rSrcSh.EndUndo(); rSh.EndUndo(); // put the shell in the right state - if( &rSrcSh != &rSh && ( rSh.IsFrmSelected() || rSh.IsObjSelected() )) - rSh.EnterSelFrmMode(); + if( &rSrcSh != &rSh && ( rSh.IsFrameSelected() || rSh.IsObjSelected() )) + rSh.EnterSelFrameMode(); rSrcSh.EndAction(); rSh.EndAction(); |