[Libreoffice-commits] .: 7 commits - officecfg/registry svx/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Thu Mar 3 14:58:00 PST 2011
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 97 ++++++----
officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu | 4
officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu | 2
officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu | 2
officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu | 4
officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu | 4
officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu | 4
officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu | 4
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 32 ++-
9 files changed, 99 insertions(+), 54 deletions(-)
New commits:
commit 0e5cd78e1402527bec19c2ffe99c09a9acd6d4da
Author: Jan Holesovsky <kendy at noe.suse.cz>
Date: Thu Mar 3 23:38:40 2011 +0100
findbar: Findbar should be hidden by default.
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index f0f5167..dcdce12 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -307,7 +307,7 @@
<value xml:lang="en-US">Find</value>
</prop>
<prop oor:name="Visible" oor:type="xs:boolean">
- <value>true</value>
+ <value>false</value>
</prop>
<prop oor:name="ContextSensitive" oor:type="xs:boolean">
<value>false</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
index a38ed77..e944cf9 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
@@ -66,7 +66,7 @@
<value xml:lang="en-US">Find</value>
</prop>
<prop oor:name="Visible" oor:type="xs:boolean">
- <value>true</value>
+ <value>false</value>
</prop>
<prop oor:name="ContextSensitive" oor:type="xs:boolean">
<value>false</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
index 085ca68..49859d2 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
@@ -66,7 +66,7 @@
<value xml:lang="en-US">Find</value>
</prop>
<prop oor:name="Visible" oor:type="xs:boolean">
- <value>true</value>
+ <value>false</value>
</prop>
<prop oor:name="ContextSensitive" oor:type="xs:boolean">
<value>false</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index 2984eb7..558d215 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -66,7 +66,7 @@
<value xml:lang="en-US">Find</value>
</prop>
<prop oor:name="Visible" oor:type="xs:boolean">
- <value>true</value>
+ <value>false</value>
</prop>
<prop oor:name="ContextSensitive" oor:type="xs:boolean">
<value>false</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
index bb5bdec..ba22217 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
@@ -67,7 +67,7 @@
<value xml:lang="en-US">Find</value>
</prop>
<prop oor:name="Visible" oor:type="xs:boolean">
- <value>true</value>
+ <value>false</value>
</prop>
<prop oor:name="ContextSensitive" oor:type="xs:boolean">
<value>false</value>
commit 5e458bf533a8531cafcbb267138338cecdfb107d
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Mar 3 20:45:30 2011 +0100
findbar: Localized access to the Search dialog.
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index ad607d3..04141b3 100755
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -40,6 +40,11 @@
<value xml:lang="es">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
+ <node oor:name="B_MOD1_MOD2" oor:op="replace">
+ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="es">.uno:SearchDialog</value>
+ </prop>
+ </node>
<node oor:name="C_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="en-US">.uno:Copy</value>
@@ -80,6 +85,11 @@
<value xml:lang="en-US">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
+ <node oor:name="F_MOD1_MOD2" oor:op="replace">
+ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="en-US">.uno:SearchDialog</value>
+ </prop>
+ </node>
<node oor:name="G_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="es">.uno:Save</value>
@@ -225,6 +235,11 @@
<value xml:lang="en-US">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
+ <node oor:name="F_MOD1_MOD2" oor:op="replace">
+ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="en-US">.uno.SearchDialog</value>
+ </prop>
+ </node>
<node oor:name="N_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="en-US">.uno:AddDirect</value>
@@ -397,6 +412,11 @@
<value xml:lang="es">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
+ <node oor:name="B_MOD1_MOD2" oor:op="replace">
+ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="es">.uno:SearchDialog</value>
+ </prop>
+ </node>
<node oor:name="B_SHIFT_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="en-US">.uno:SubScript</value>
@@ -578,11 +598,6 @@
<value xml:lang="en-US">.uno:CalculateHard</value>
</prop>
</node>
- <node oor:name="F_MOD1_MOD2" oor:op="replace">
- <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
- <value xml:lang="en-US">.uno:SearchDialog</value>
- </prop>
- </node>
<node oor:name="F_SHIFT_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="de">.uno:Bold</value>
@@ -1029,6 +1044,11 @@
<value xml:lang="es">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
+ <node oor:name="B_MOD1_MOD2" oor:op="replace">
+ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="es">.uno:SearchDialog</value>
+ </prop>
+ </node>
<node oor:name="B_SHIFT_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="en-US">.uno:SubScript</value>
@@ -1125,11 +1145,6 @@
<value xml:lang="en-US">.uno:TextFitToSize</value>
</prop>
</node>
- <node oor:name="F_MOD1_MOD2" oor:op="replace">
- <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
- <value xml:lang="en-US">.uno:SearchDialog</value>
- </prop>
- </node>
<node oor:name="F_SHIFT_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="de">.uno:Bold</value>
@@ -1385,6 +1400,11 @@
<value xml:lang="es">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
+ <node oor:name="B_MOD1_MOD2" oor:op="replace">
+ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="es">.uno:SearchDialog</value>
+ </prop>
+ </node>
<node oor:name="B_SHIFT_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="en-US">.uno:SubScript</value>
@@ -1606,11 +1626,6 @@
<value xml:lang="en-US">.uno:UpdateInputFields</value>
</prop>
</node>
- <node oor:name="F_MOD1_MOD2" oor:op="replace">
- <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
- <value xml:lang="en-US">.uno:SearchDialog</value>
- </prop>
- </node>
<node oor:name="F_SHIFT_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="de">.uno:Bold</value>
@@ -1988,6 +2003,11 @@
<value xml:lang="es">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
+ <node oor:name="B_MOD1_MOD2" oor:op="replace">
+ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="es">.uno:SearchDialog</value>
+ </prop>
+ </node>
<node oor:name="B_SHIFT_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="en-US">.uno:SubScript</value>
@@ -2099,11 +2119,6 @@
<value xml:lang="en-US">.uno:TextFitToSize</value>
</prop>
</node>
- <node oor:name="F_MOD1_MOD2" oor:op="replace">
- <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
- <value xml:lang="en-US">.uno:SearchDialog</value>
- </prop>
- </node>
<node oor:name="F_SHIFT_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="de">.uno:Bold</value>
@@ -2426,6 +2441,11 @@
<value xml:lang="es">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
+ <node oor:name="B_MOD1_MOD2" oor:op="replace">
+ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="es">.uno:SearchDialog</value>
+ </prop>
+ </node>
<node oor:name="B_SHIFT_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="en-US">.uno:SubScript</value>
@@ -2647,11 +2667,6 @@
<value xml:lang="en-US">.uno:UpdateInputFields</value>
</prop>
</node>
- <node oor:name="F_MOD1_MOD2" oor:op="replace">
- <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
- <value xml:lang="en-US">.uno:SearchDialog</value>
- </prop>
- </node>
<node oor:name="F_SHIFT_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="de">.uno:Bold</value>
@@ -3046,6 +3061,11 @@
<value xml:lang="es">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
+ <node oor:name="B_MOD1_MOD2" oor:op="replace">
+ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="es">.uno:SearchDialog</value>
+ </prop>
+ </node>
<node oor:name="B_SHIFT_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="en-US">.uno:SubScript</value>
@@ -3671,6 +3691,11 @@
<value xml:lang="es">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
+ <node oor:name="B_MOD1_MOD2" oor:op="replace">
+ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="es">.uno:SearchDialog</value>
+ </prop>
+ </node>
<node oor:name="B_SHIFT_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="en-US">.uno:SubScript</value>
@@ -4276,6 +4301,11 @@
<value xml:lang="es">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
+ <node oor:name="B_MOD1_MOD2" oor:op="replace">
+ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="es">.uno:SearchDialog</value>
+ </prop>
+ </node>
<node oor:name="B_SHIFT_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="en-US">.uno:SubScript</value>
@@ -4497,11 +4527,6 @@
<value xml:lang="en-US">.uno:UpdateInputFields</value>
</prop>
</node>
- <node oor:name="F_MOD1_MOD2" oor:op="replace">
- <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
- <value xml:lang="en-US">.uno:SearchDialog</value>
- </prop>
- </node>
<node oor:name="F_SHIFT_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="de">.uno:Bold</value>
@@ -4891,6 +4916,11 @@
<value xml:lang="es">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
+ <node oor:name="B_MOD1_MOD2" oor:op="replace">
+ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="es">.uno:SearchDialog</value>
+ </prop>
+ </node>
<node oor:name="B_SHIFT_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="en-US">.uno:SubScript</value>
@@ -5112,11 +5142,6 @@
<value xml:lang="en-US">.uno:UpdateInputFields</value>
</prop>
</node>
- <node oor:name="F_MOD1_MOD2" oor:op="replace">
- <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
- <value xml:lang="en-US">.uno:SearchDialog</value>
- </prop>
- </node>
<node oor:name="F_SHIFT_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="de">.uno:Bold</value>
commit fb7350a865ba606e85ac1933e2be1c2e1affcbae
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Mar 3 20:20:40 2011 +0100
findbar: Show the find bar on Ctrl-f, hide on Escape.
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 79f8145..3b46848 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -139,6 +139,21 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt )
{
nRet = 1;
GrabFocusToDocument();
+
+ // hide the findbar
+ css::uno::Reference< css::beans::XPropertySet > xPropSet(m_xFrame, css::uno::UNO_QUERY);
+ if (xPropSet.is())
+ {
+ css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
+ css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ) ) );
+ aValue >>= xLayoutManager;
+ if (xLayoutManager.is())
+ {
+ const ::rtl::OUString sResourceURL( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/findbar" ) );
+ xLayoutManager->hideElement( sResourceURL );
+ xLayoutManager->destroyElement( sResourceURL );
+ }
+ }
}
if ( KEY_RETURN == nCode )
@@ -804,10 +819,17 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css
if (!xLayoutManager.is())
return;
- const ::rtl::OUString sResourceURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/findbar" ));
+ const ::rtl::OUString sResourceURL( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/findbar" ) );
css::uno::Reference< css::ui::XUIElement > xUIElement = xLayoutManager->getElement(sResourceURL);
if (!xUIElement.is())
- return;
+ {
+ // show the findbar if necessary
+ xLayoutManager->createElement( sResourceURL );
+ xLayoutManager->showElement( sResourceURL );
+ xUIElement = xLayoutManager->getElement( sResourceURL );
+ if ( !xUIElement.is() )
+ return;
+ }
css::uno::Reference< css::awt::XWindow > xWindow(xUIElement->getRealInterface(), css::uno::UNO_QUERY);
Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
commit 8bd88e63cea0a338b7bd5478d11d3328615056fa
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Mar 3 11:16:20 2011 +0100
findbar: Make Escape the only key to return back to the document.
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 230f9af..79f8145 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -132,12 +132,10 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt )
case EVENT_KEYINPUT:
{
const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent();
- sal_Bool bCtrl = pKeyEvent->GetKeyCode().IsMod1();
- sal_Bool bAlt = pKeyEvent->GetKeyCode().IsMod2();
sal_Bool bShift = pKeyEvent->GetKeyCode().IsShift();
sal_uInt16 nCode = pKeyEvent->GetKeyCode().GetCode();
- if ( (bCtrl && bAlt && KEY_F == nCode) || KEY_ESCAPE == nCode )
+ if ( KEY_ESCAPE == nCode )
{
nRet = 1;
GrabFocusToDocument();
commit ba1ccb676f64978c27c5cdc3d7efaf899e9da7d2
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Mar 3 10:44:50 2011 +0100
findbar: Swap the keybindings of the search dialog and findbar.
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index eab8583..ad607d3 100755
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -37,7 +37,7 @@
</node>
<node oor:name="B_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
- <value xml:lang="es">.uno:SearchDialog</value>
+ <value xml:lang="es">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
<node oor:name="C_MOD1" oor:op="replace">
@@ -77,7 +77,7 @@
</node>
<node oor:name="F_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
- <value xml:lang="en-US">.uno:SearchDialog</value>
+ <value xml:lang="en-US">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
<node oor:name="G_MOD1" oor:op="replace">
@@ -222,7 +222,7 @@
</node>
<node oor:name="F_MOD1" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
- <value xml:lang="en-US">.uno:SearchDialog</value>
+ <value xml:lang="en-US">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
<node oor:name="N_MOD1" oor:op="replace">
@@ -394,7 +394,7 @@
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="de">.uno:AlignBlock</value>
<value xml:lang="en-US">.uno:Bold</value>
- <value xml:lang="es">.uno:SearchDialog</value>
+ <value xml:lang="es">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
<node oor:name="B_SHIFT_MOD1" oor:op="replace">
@@ -580,7 +580,7 @@
</node>
<node oor:name="F_MOD1_MOD2" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
- <value xml:lang="en-US">vnd.sun.star.findbar:FocusToFindbar</value>
+ <value xml:lang="en-US">.uno:SearchDialog</value>
</prop>
</node>
<node oor:name="F_SHIFT_MOD1" oor:op="replace">
@@ -1026,7 +1026,7 @@
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="de">.uno:JustifyPara</value>
<value xml:lang="en-US">.uno:Bold</value>
- <value xml:lang="es">.uno:SearchDialog</value>
+ <value xml:lang="es">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
<node oor:name="B_SHIFT_MOD1" oor:op="replace">
@@ -1127,7 +1127,7 @@
</node>
<node oor:name="F_MOD1_MOD2" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
- <value xml:lang="en-US">vnd.sun.star.findbar:FocusToFindbar</value>
+ <value xml:lang="en-US">.uno:SearchDialog</value>
</prop>
</node>
<node oor:name="F_SHIFT_MOD1" oor:op="replace">
@@ -1382,7 +1382,7 @@
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="de">.uno:JustifyPara</value>
<value xml:lang="en-US">.uno:Bold</value>
- <value xml:lang="es">.uno:SearchDialog</value>
+ <value xml:lang="es">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
<node oor:name="B_SHIFT_MOD1" oor:op="replace">
@@ -1608,7 +1608,7 @@
</node>
<node oor:name="F_MOD1_MOD2" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
- <value xml:lang="en-US">vnd.sun.star.findbar:FocusToFindbar</value>
+ <value xml:lang="en-US">.uno:SearchDialog</value>
</prop>
</node>
<node oor:name="F_SHIFT_MOD1" oor:op="replace">
@@ -1985,7 +1985,7 @@
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="de">.uno:JustifyPara</value>
<value xml:lang="en-US">.uno:Bold</value>
- <value xml:lang="es">.uno:SearchDialog</value>
+ <value xml:lang="es">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
<node oor:name="B_SHIFT_MOD1" oor:op="replace">
@@ -2101,7 +2101,7 @@
</node>
<node oor:name="F_MOD1_MOD2" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
- <value xml:lang="en-US">vnd.sun.star.findbar:FocusToFindbar</value>
+ <value xml:lang="en-US">.uno:SearchDialog</value>
</prop>
</node>
<node oor:name="F_SHIFT_MOD1" oor:op="replace">
@@ -2423,7 +2423,7 @@
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="de">.uno:JustifyPara</value>
<value xml:lang="en-US">.uno:Bold</value>
- <value xml:lang="es">.uno:SearchDialog</value>
+ <value xml:lang="es">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
<node oor:name="B_SHIFT_MOD1" oor:op="replace">
@@ -2649,7 +2649,7 @@
</node>
<node oor:name="F_MOD1_MOD2" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
- <value xml:lang="en-US">vnd.sun.star.findbar:FocusToFindbar</value>
+ <value xml:lang="en-US">.uno:SearchDialog</value>
</prop>
</node>
<node oor:name="F_SHIFT_MOD1" oor:op="replace">
@@ -3043,7 +3043,7 @@
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="de">.uno:JustifyPara</value>
<value xml:lang="en-US">.uno:Bold</value>
- <value xml:lang="es">.uno:SearchDialog</value>
+ <value xml:lang="es">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
<node oor:name="B_SHIFT_MOD1" oor:op="replace">
@@ -3668,7 +3668,7 @@
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="de">.uno:JustifyPara</value>
<value xml:lang="en-US">.uno:Bold</value>
- <value xml:lang="es">.uno:SearchDialog</value>
+ <value xml:lang="es">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
<node oor:name="B_SHIFT_MOD1" oor:op="replace">
@@ -4273,7 +4273,7 @@
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="de">.uno:JustifyPara</value>
<value xml:lang="en-US">.uno:Bold</value>
- <value xml:lang="es">.uno:SearchDialog</value>
+ <value xml:lang="es">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
<node oor:name="B_SHIFT_MOD1" oor:op="replace">
@@ -4499,7 +4499,7 @@
</node>
<node oor:name="F_MOD1_MOD2" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
- <value xml:lang="en-US">vnd.sun.star.findbar:FocusToFindbar</value>
+ <value xml:lang="en-US">.uno:SearchDialog</value>
</prop>
</node>
<node oor:name="F_SHIFT_MOD1" oor:op="replace">
@@ -4888,7 +4888,7 @@
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="de">.uno:JustifyPara</value>
<value xml:lang="en-US">.uno:Bold</value>
- <value xml:lang="es">.uno:SearchDialog</value>
+ <value xml:lang="es">vnd.sun.star.findbar:FocusToFindbar</value>
</prop>
</node>
<node oor:name="B_SHIFT_MOD1" oor:op="replace">
@@ -5114,7 +5114,7 @@
</node>
<node oor:name="F_MOD1_MOD2" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
- <value xml:lang="en-US">vnd.sun.star.findbar:FocusToFindbar</value>
+ <value xml:lang="en-US">.uno:SearchDialog</value>
</prop>
</node>
<node oor:name="F_SHIFT_MOD1" oor:op="replace">
commit 68f3cc1c8c273b154a6101374a0c361558c2e9c0
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Oct 6 10:00:58 2010 +0200
findbar: Move findbar to the bottom docking area.
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index 85687bb..f0f5167 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -301,7 +301,7 @@
<value>true</value>
</prop>
<prop oor:name="DockingArea" oor:type="xs:int">
- <value>0</value>
+ <value>1</value>
</prop>
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Find</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
index 57a14b4..abaa9fc 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
@@ -114,7 +114,7 @@
<value>true</value>
</prop>
<prop oor:name="DockingArea" oor:type="xs:int">
- <value>0</value>
+ <value>1</value>
</prop>
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Find</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index e4ab860..e6f386f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -878,7 +878,7 @@
<value>true</value>
</prop>
<prop oor:name="DockingArea" oor:type="xs:int">
- <value>0</value>
+ <value>1</value>
</prop>
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Find</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
index 4b41812..a38ed77 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
@@ -60,7 +60,7 @@
<value>true</value>
</prop>
<prop oor:name="DockingArea" oor:type="xs:int">
- <value>0</value>
+ <value>1</value>
</prop>
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Find</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
index 5b0ddd3..085ca68 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
@@ -60,7 +60,7 @@
<value>true</value>
</prop>
<prop oor:name="DockingArea" oor:type="xs:int">
- <value>0</value>
+ <value>1</value>
</prop>
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Find</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index f1d14cd..2984eb7 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -60,7 +60,7 @@
<value>true</value>
</prop>
<prop oor:name="DockingArea" oor:type="xs:int">
- <value>0</value>
+ <value>1</value>
</prop>
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Find</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
index a77f3fa..bb5bdec 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
@@ -61,7 +61,7 @@
<value>true</value>
</prop>
<prop oor:name="DockingArea" oor:type="xs:int">
- <value>0</value>
+ <value>1</value>
</prop>
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Find</value>
commit 08f6a2585fb72ef44e37d45ac672eb1dbd048611
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Oct 6 10:00:38 2010 +0200
findbar: Make the combobox wider.
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index ee63424..230f9af 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -388,7 +388,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL FindTextToolbarController::cre
ToolBox* pToolbar = ( ToolBox* )pParent;
m_pFindTextFieldControl = new FindTextFieldControl( pToolbar, WinBits( WB_DROPDOWN | WB_VSCROLL), m_xFrame, m_xServiceManager );
- Size aSize(100, m_pFindTextFieldControl->GetTextHeight() + 200);
+ Size aSize(250, m_pFindTextFieldControl->GetTextHeight() + 200);
m_pFindTextFieldControl->SetSizePixel( aSize );
m_pFindTextFieldControl->SetModifyHdl(LINK(this, FindTextToolbarController, EditModifyHdl));
}
More information about the Libreoffice-commits
mailing list