mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/libreoffice-3-4'

Browse Source
This commit is contained in:
Jan Holesovsky
2011-06-06 12:53:09 +02:00
parent 6a9ac34b46 ff2af03b48
commit a293befc76
4 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
basctl/sdi/baside.sdi
View File

@@ -57,6 +57,11 @@ shell BasicIDEShell
StateMethod = GetState;
]
SID_SELECTALL
[
ExecMethod = ExecuteCurrent;
]
SID_CUT
[
ExecMethod = ExecuteCurrent;

9
basctl/source/basicide/baside2.cxx
View File

@@ -995,6 +995,15 @@ void ModulWindow::ExecuteCommand( SfxRequest& rReq )
sal_uInt16 nSlot = rReq.GetSlot();
switch ( nSlot )
{
case SID_DELETE:
{
KeyEvent aFakeDelete( 0, KEY_DELETE );
GetEditView()->KeyInput( aFakeDelete );
break;
}
case SID_SELECTALL:
GetEditView()->SetSelection( TextSelection( TextPaM( 0, 0 ), TextPaM( 0xFFFFFFFF, 0xFFFF ) ) );
break;
case SID_BASICRUN:
{
BasicRun();

4
basctl/source/basicide/baside2b.cxx
View File

@@ -417,9 +417,7 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
if ( !bDone && ( !TextEngine::DoesKeyChangeText( rKEvt ) || ImpCanModify() ) )
{
if ( ( rKEvt.GetKeyCode().GetCode() == KEY_A) && rKEvt.GetKeyCode().IsMod1() && !rKEvt.GetKeyCode().IsMod2() )
pEditView->SetSelection( TextSelection( TextPaM( 0, 0 ), TextPaM( 0xFFFFFFFF, 0xFFFF ) ) );
else if ( ( rKEvt.GetKeyCode().GetCode() == KEY_Y ) && rKEvt.GetKeyCode().IsMod1() )
if ( ( rKEvt.GetKeyCode().GetCode() == KEY_Y ) && rKEvt.GetKeyCode().IsMod1() )
bDone = sal_True; // CTRL-Y schlucken, damit kein Vorlagenkatalog
else
{

1
cui/source/options/optsave.cxx
View File

@@ -544,7 +544,6 @@ IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox )
{
aAutoSaveEdit.Enable();
aMinuteFT.Enable();
aAutoSaveEdit.GrabFocus();
}
else
{