Attachment 46362 Details for Bug 35706 – patch

[patch] patch

basic-findbar.diff (text/plain), 3.54 KB, created by Noel Power on 2011-05-05 08:57:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noel Power

Created: 2011-05-05 08:57:13 UTC

Size: 3.54 KB

patch

obsolete

>diff --git officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
>index 8ba1a72..a38592e 100644
>--- officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
>+++ officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
>@@ -146,6 +146,26 @@
>                     <value>true</value>
>                 </prop>
>             </node>
>+            <node oor:name="private:resource/toolbar/findbar" oor:op="replace">
>+                <prop oor:name="DockPos" oor:type="xs:string">
>+                    <value>1,0</value>
>+                </prop>
>+                <prop oor:name="Docked" oor:type="xs:boolean">
>+                    <value>true</value>
>+                </prop>
>+                <prop oor:name="DockingArea" oor:type="xs:int">
>+                    <value>1</value>
>+                </prop>
>+                <prop oor:name="UIName" oor:type="xs:string">
>+                    <value xml:lang="en-US">Find</value>
>+                </prop>
>+                <prop oor:name="Visible" oor:type="xs:boolean">
>+                    <value>false</value>
>+                </prop>
>+                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
>+                    <value>false</value>
>+                </prop>
>+            </node>    
>         </node>
>     </node>
> </oor:component-data>
>--- /dev/null	2011-05-05 07:52:52.262379129 +0100
>+++ basctl/uiconfig/basicide/toolbar/findbar.xml	2011-05-05 11:22:54.000000000 +0100
>@@ -0,0 +1,8 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
>+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
>+  <toolbar:toolbaritem xlink:href=".uno:FindText"/>
>+  <toolbar:toolbaritem xlink:href=".uno:DownSearch"/>
>+  <toolbar:toolbaritem xlink:href=".uno:UpSearch"/>
>+  <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:visible="false"/>
>+</toolbar:toolbar>
>diff --git basctl/source/basicide/baside2b.cxx basctl/source/basicide/baside2b.cxx
>index 5597691..6f1f7e3 100644
>--- basctl/source/basicide/baside2b.cxx
>+++ basctl/source/basicide/baside2b.cxx
>@@ -411,11 +411,13 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
>     long nLinSz = pModulWindow->GetHScrollBar()->GetLineSize(); (void)nLinSz;
>     long nThumb = pModulWindow->GetHScrollBar()->GetThumbPos(); (void)nThumb;
> #endif
>-    sal_Bool bDone = sal_False;
>     sal_Bool bWasModified = pEditEngine->IsModified();
>-    if ( !TextEngine::DoesKeyChangeText( rKEvt ) || ImpCanModify() )
>+    // see if there is an accelerator to be processed first
>+    sal_Bool bDone = SfxViewShell::Current()->KeyInput( rKEvt );
>+
>+    if ( !bDone && ( !TextEngine::DoesKeyChangeText( rKEvt ) || ImpCanModify()  ) )
>     {
>-        if ( ( rKEvt.GetKeyCode().GetCode() == KEY_A) && rKEvt.GetKeyCode().IsMod1() )
>+        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() )
>             bDone = sal_True; // CTRL-Y schlucken, damit kein Vorlagenkatalog
>@@ -442,7 +444,6 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
>     }
>     if ( !bDone )
>     {
>-        if ( !SfxViewShell::Current()->KeyInput( rKEvt ) )
>             Window::KeyInput( rKEvt );
>     }
>     else

Actions: View

Attachments on bug 35706: 46354 | 46362