Task #91678#: 'selection clipbord' implemented
This commit is contained in:
parent
ad77081233
commit
64708a5251
3 changed files with 35 additions and 7 deletions
|
@ -2,9 +2,9 @@
|
|||
*
|
||||
* $RCSfile: select.cxx,v $
|
||||
*
|
||||
* $Revision: 1.7 $
|
||||
* $Revision: 1.8 $
|
||||
*
|
||||
* last change: $Author: jp $ $Date: 2001-05-16 18:07:35 $
|
||||
* last change: $Author: jp $ $Date: 2001-09-11 14:57:42 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
|
@ -124,6 +124,9 @@
|
|||
#ifndef _SWEVENT_HXX
|
||||
#include <swevent.hxx>
|
||||
#endif
|
||||
#ifndef _SWDTFLVR_HXX
|
||||
#include <swdtflvr.hxx>
|
||||
#endif
|
||||
|
||||
#ifdef DEBUG
|
||||
#ifndef _PAM_HXX
|
||||
|
@ -355,6 +358,7 @@ void SwWrtShell::UnSelectFrm()
|
|||
// Rahmenselektion aufheben mit garantiert ungueltiger Position
|
||||
Point aPt(LONG_MIN, LONG_MIN);
|
||||
SelectObj(aPt);
|
||||
SwTransferable::ClearSelection( *this );
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -392,6 +396,7 @@ long SwWrtShell::ResetSelect(const Point *,BOOL)
|
|||
*/
|
||||
GetChgLnk().Call(this);
|
||||
}
|
||||
SwTransferable::ClearSelection( *this );
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -419,6 +424,7 @@ void SwWrtShell::SttSelect()
|
|||
fnKillSel = &SwWrtShell::Ignore;
|
||||
fnSetCrsr = &SwWrtShell::SetCrsr;
|
||||
bInSelect = TRUE;
|
||||
SwTransferable::CreateSelection( *this );
|
||||
}
|
||||
/*
|
||||
* Ende eines Selektionsvorganges.
|
||||
|
@ -977,11 +983,14 @@ long SwWrtShell::MoveText(const Point *pPt,BOOL)
|
|||
|
||||
Source Code Control System - Header
|
||||
|
||||
$Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/ui/wrtsh/select.cxx,v 1.7 2001-05-16 18:07:35 jp Exp $
|
||||
$Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/ui/wrtsh/select.cxx,v 1.8 2001-09-11 14:57:42 jp Exp $
|
||||
|
||||
Source Code Control System - Update
|
||||
|
||||
$Log: not supported by cvs2svn $
|
||||
Revision 1.7 2001/05/16 18:07:35 jp
|
||||
Bug #85853#: IntelligentCut - only for LATIN scripts
|
||||
|
||||
Revision 1.6 2001/03/12 08:18:49 tl
|
||||
SearcParam => SearchOptions and implied changes
|
||||
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
*
|
||||
* $RCSfile: wrtsh1.cxx,v $
|
||||
*
|
||||
* $Revision: 1.13 $
|
||||
* $Revision: 1.14 $
|
||||
*
|
||||
* last change: $Author: mtg $ $Date: 2001-07-20 10:22:01 $
|
||||
* last change: $Author: jp $ $Date: 2001-09-11 14:57:42 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
|
@ -212,6 +212,9 @@
|
|||
#ifndef _VISCRS_HXX //autogen wg. SwSelPaintRects
|
||||
#include <viscrs.hxx>
|
||||
#endif
|
||||
#ifndef _SWDTFLVR_HXX
|
||||
#include <swdtflvr.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _SWERROR_H
|
||||
#include <swerror.h>
|
||||
|
@ -1473,6 +1476,7 @@ SwWrtShell::~SwWrtShell()
|
|||
PopMode();
|
||||
while(PopCrsr(FALSE))
|
||||
;
|
||||
SwTransferable::ClearSelection( *this );
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
*
|
||||
* $RCSfile: wrtundo.cxx,v $
|
||||
*
|
||||
* $Revision: 1.2 $
|
||||
* $Revision: 1.3 $
|
||||
*
|
||||
* last change: $Author: tl $ $Date: 2001-04-09 07:28:55 $
|
||||
* last change: $Author: jp $ $Date: 2001-09-11 14:57:42 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
|
@ -83,6 +83,9 @@
|
|||
#ifndef _SWUNDO_HXX
|
||||
#include <swundo.hxx> // fuer Undo-Ids
|
||||
#endif
|
||||
#ifndef _SWDTFLVR_HXX
|
||||
#include <swdtflvr.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _WRTSH_HRC
|
||||
#include <wrtsh.hrc>
|
||||
|
@ -115,6 +118,7 @@ void SwWrtShell::Do( DoType eDoType, USHORT nCnt )
|
|||
}
|
||||
EndAllAction();
|
||||
|
||||
BOOL bCreateXSelection = FALSE;
|
||||
const FASTBOOL bFrmSelected = IsFrmSelected() || IsObjSelected();
|
||||
if ( IsSelection() )
|
||||
{
|
||||
|
@ -125,15 +129,23 @@ void SwWrtShell::Do( DoType eDoType, USHORT nCnt )
|
|||
// bei Cursor setzen
|
||||
fnKillSel = &SwWrtShell::ResetSelect;
|
||||
fnSetCrsr = &SwWrtShell::SetCrsrKillSel;
|
||||
bCreateXSelection = TRUE;
|
||||
}
|
||||
else if ( bFrmSelected )
|
||||
{
|
||||
EnterSelFrmMode();
|
||||
bCreateXSelection = TRUE;
|
||||
}
|
||||
else if( (CNT_GRF | CNT_OLE ) & GetCntType() )
|
||||
{
|
||||
SelectObj( GetCharRect().Pos() );
|
||||
EnterSelFrmMode();
|
||||
bCreateXSelection = TRUE;
|
||||
}
|
||||
|
||||
if( bCreateXSelection )
|
||||
SwTransferable::CreateSelection( *this );
|
||||
|
||||
// Bug 32918: nach loeschen der Numerierung bleibt die Obj. Leiste stehen
|
||||
// Warum wird hier nicht immer ein CallChgLink gerufen?
|
||||
CallChgLnk();
|
||||
|
@ -213,6 +225,9 @@ String SwWrtShell::GetRepeatString() const
|
|||
/*************************************************************************
|
||||
|
||||
$Log: not supported by cvs2svn $
|
||||
Revision 1.2 2001/04/09 07:28:55 tl
|
||||
Undo/Redo controller modifications
|
||||
|
||||
Revision 1.1.1.1 2000/09/18 17:14:53 hr
|
||||
initial import
|
||||
|
||||
|
|
Loading…
Reference in a new issue