[Libreoffice-commits] .: 7 commits - basctl/sdi basctl/source cui/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Mon Jun 6 05:12:45 PDT 2011
basctl/sdi/baside.sdi | 5 +++++
basctl/source/basicide/baside2.cxx | 9 +++++++++
basctl/source/basicide/baside2b.cxx | 4 +---
cui/source/options/optsave.cxx | 1 -
4 files changed, 15 insertions(+), 4 deletions(-)
New commits:
commit c98fd98904215bf2f9d388a55653159f3c3cd880
Merge: 45d93e4... b276cc9...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Jun 6 12:53:09 2011 +0200
Merge remote-tracking branch 'origin/libreoffice-3-4'
commit b276cc9c46e6bcc3265a879e578e87896ce7dfcb
Author: Jean-Baptiste Faure <jbf.faure at orange.fr>
Date: Wed Jun 1 13:14:49 2011 +0200
fix for bug fdo 36519
Use human readable format name instead of internal filter names in Load/save options UI
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 4e98d90..eba8cf1 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -557,20 +557,13 @@ IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox )
OUString lcl_ExtracUIName(const Sequence<PropertyValue> rProperties)
{
OUString sRet;
- sal_Int32 nFlags;
const PropertyValue* pProperties = rProperties.getConstArray();
for(int nProp = 0; nProp < rProperties.getLength(); nProp++)
{
if(!pProperties[nProp].Name.compareToAscii("UIName"))
{
pProperties[nProp].Value >>= sRet;
- }
- else if(!pProperties[nProp].Name.compareToAscii("Flags"))
- {
- if ( pProperties[nProp].Value >>= nFlags )
- {
- nFlags &= 0x100;
- }
+ break;
}
else if(!pProperties[nProp].Name.compareToAscii("Name"))
{
commit 51adaf7fc085fbed4f02d3276dcd36726caab286
Author: Andre Schnabel <andre.schnabel at gmx.net>
Date: Tue May 31 18:56:12 2011 +0200
fix for fdo#37761: Keyboard navigation broken in tools - options
prevent that aAutoSaveEdit will grab the focus in options dialog
Signed-off-by: Noel Power <noel.power at novell.com>
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index c0719b4..4e98d90 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -544,7 +544,6 @@ IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox )
{
aAutoSaveEdit.Enable();
aMinuteFT.Enable();
- aAutoSaveEdit.GrabFocus();
}
else
{
commit b41854cdbcd0338a99c6d92113d8e9630d5f9a0b
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Tue May 24 00:50:21 2011 +0200
3rd update to Mac dmg background.
This time, wrong path - now hopefully working everywhere.
Signed-off-by: Christian Lohmaier <lohmaier at googlemail.com>
diff --git a/setup_native/source/mac/ooo/DS_Store b/setup_native/source/mac/ooo/DS_Store
index fe6912c..9431578 100644
Binary files a/setup_native/source/mac/ooo/DS_Store and b/setup_native/source/mac/ooo/DS_Store differ
commit 44c6333a2b6923add66d70be6329a6ad4f3aa66d
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Tue May 17 11:04:48 2011 +0200
Polish branding - fix langpack mac installer icon
Fix for fdo#33229 - the lang pack installer icon on mac was still
showing seagulls.
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
diff --git a/setup_native/source/mac/ooo3_installer.icns b/setup_native/source/mac/ooo3_installer.icns
index bacdd17..45fca0f 100644
Binary files a/setup_native/source/mac/ooo3_installer.icns and b/setup_native/source/mac/ooo3_installer.icns differ
commit 577361cd7aba1e72e6bb0c99c3407dbcdc2a8bb7
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Fri May 20 16:47:48 2011 +0200
Update Mac dmg background again.
"In Mac OS X Snow Leopard, disk images created with background images
do not display properly on Mac OS X Leopard and earlier. This is
because of a change in Finder itself that affects all disk images
created on Snow Leopard."
So. redid that on Tiger...
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
diff --git a/setup_native/source/mac/ooo/DS_Store b/setup_native/source/mac/ooo/DS_Store
index c6064f0..fe6912c 100644
Binary files a/setup_native/source/mac/ooo/DS_Store and b/setup_native/source/mac/ooo/DS_Store differ
commit 7a385f2256b88c6ee52c0beb1375d0a945f38d51
Author: Noel Power <nopower at novell.com>
Date: Wed May 18 11:15:14 2011 +0200
Fix 'Ctrl+A' in the Basic IDE - fdo#37211.
Signed-off-by: Jan Holesovsky <kendy at suse.cz>
diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index 36adfc8..e127b67 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -57,6 +57,11 @@ shell BasicIDEShell
StateMethod = GetState;
]
+ SID_SELECTALL
+ [
+ ExecMethod = ExecuteCurrent;
+ ]
+
SID_CUT
[
ExecMethod = ExecuteCurrent;
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 772094d..b80cfb2 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -999,6 +999,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();
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 6f1f7e3..df99a5b 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -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
{
More information about the Libreoffice-commits
mailing list