[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - cui/source default_images/res officecfg/registry
Herbert Dürr
hdu at apache.org
Wed Jul 10 09:10:08 PDT 2013
cui/source/dialogs/cuifmsearch.cxx | 7 +++
cui/source/inc/cuifmsearch.hxx | 1
default_images/res/mainapp_16.png |binary
default_images/res/mainapp_16_8.png |binary
default_images/res/mainapp_32.png |binary
default_images/res/mainapp_32_8.png |binary
default_images/res/mainapp_48_8.png |binary
officecfg/registry/data/org/openoffice/Inet.xcu | 44 ------------------------
8 files changed, 8 insertions(+), 44 deletions(-)
New commits:
commit 704bca1331d902281c3029aba65d57baa89d3731
Author: Herbert Dürr <hdu at apache.org>
Date: Wed Jul 10 12:16:11 2013 +0000
#i122581# reestablish focus of the Record Search dialog to the search combobox
Patch by: Tsutomu Uchino <hanya.runo at gmail.com>
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index dddd5d3..9ed5619 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -252,6 +252,7 @@ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sI
m_cmbSearchText.SetModifyHdl(LINK(this, FmSearchDialog, OnSearchTextModified));
m_cmbSearchText.EnableAutocomplete(sal_False);
+ m_cmbSearchText.SetGetFocusHdl(LINK(this, FmSearchDialog, OnFocusGrabbed));
m_cbUseFormat.SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
m_cbBackwards.SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
@@ -443,6 +444,12 @@ IMPL_LINK(FmSearchDialog, OnSearchTextModified, ComboBox*, EMPTYARG)
}
//------------------------------------------------------------------------
+IMPL_LINK(FmSearchDialog, OnFocusGrabbed, ComboBox*, EMPTYARG)
+{
+ m_cmbSearchText.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
+}
+
+//------------------------------------------------------------------------
IMPL_LINK(FmSearchDialog, OnPositionSelected, ListBox*, pBox)
{
(void) pBox; // avoid warning
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index 1e98197..ef19a56 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -196,6 +196,7 @@ private:
DECL_LINK( OnPositionSelected, ListBox* );
DECL_LINK( OnFieldSelected, ListBox* );
+ DECL_LINK( OnFocusGrabbed, ComboBox* );
DECL_LINK( OnCheckBoxToggled, CheckBox* );
DECL_LINK( OnContextSelection, ListBox* );
commit 5cda41a1f28f10b630067fa34d74a51ece904f48
Author: Herbert Dürr <hdu at apache.org>
Date: Wed Jul 10 11:55:23 2013 +0000
#i122666# the AltaVista search engine was shut down on July 8, 2013
Patch by: Tsutomu Uchino <hanya.runo at gmail.com>
diff --git a/officecfg/registry/data/org/openoffice/Inet.xcu b/officecfg/registry/data/org/openoffice/Inet.xcu
index 6b69a6a..1489697 100644
--- a/officecfg/registry/data/org/openoffice/Inet.xcu
+++ b/officecfg/registry/data/org/openoffice/Inet.xcu
@@ -179,50 +179,6 @@
</prop>
</node>
</node>
- <node oor:name="AltaVista" oor:op="replace">
- <node oor:name="Or">
- <prop oor:name="ooInetPrefix" oor:type="xs:string">
- <value>http://www.altavista.com/web/results/?qbmode=&aqa=&aqp=&aqo=</value>
- </prop>
- <prop oor:name="ooInetSeparator" oor:type="xs:string">
- <value>+</value>
- </prop>
- <prop oor:name="ooInetSuffix" oor:type="xs:string">
- <value>&aqn=&kgs=0&kls=1&avkw=aapt</value>
- </prop>
- <prop oor:name="ooInetCaseMatch" oor:type="xs:int">
- <value>0</value>
- </prop>
- </node>
- <node oor:name="And">
- <prop oor:name="ooInetPrefix" oor:type="xs:string">
- <value>http://www.altavista.com/web/results/?qbmode=&aqa=</value>
- </prop>
- <prop oor:name="ooInetSuffix" oor:type="xs:string">
- <value>&aqp=&aqo=&aqn=&kgs=0&kls=1&avkw=aapt</value>
- </prop>
- <prop oor:name="ooInetCaseMatch" oor:type="xs:int">
- <value>0</value>
- </prop>
- <prop oor:name="ooInetSeparator" oor:type="xs:string">
- <value>+</value>
- </prop>
- </node>
- <node oor:name="Exact">
- <prop oor:name="ooInetPrefix" oor:type="xs:string">
- <value>http://www.altavista.com/web/results?q=%22</value>
- </prop>
- <prop oor:name="ooInetSuffix" oor:type="xs:string">
- <value>%22&kgs=0&kls=1&avkw=aapt</value>
- </prop>
- <prop oor:name="ooInetCaseMatch" oor:type="xs:int">
- <value>0</value>
- </prop>
- <prop oor:name="ooInetSeparator" oor:type="xs:string">
- <value>%20</value>
- </prop>
- </node>
- </node>
<node oor:name="Google" oor:op="replace">
<node oor:name="And">
<prop oor:name="ooInetSuffix" oor:type="xs:string">
commit eb8648bbad952a948a50daa4968e86e95580a713
Author: Jürgen Schmidt <jsc at apache.org>
Date: Wed Jul 10 10:07:58 2013 +0000
#122620# update mainapp*.png with new orb
diff --git a/default_images/res/mainapp_16.png b/default_images/res/mainapp_16.png
index 3aa8f08..b7fe099 100644
Binary files a/default_images/res/mainapp_16.png and b/default_images/res/mainapp_16.png differ
diff --git a/default_images/res/mainapp_16_8.png b/default_images/res/mainapp_16_8.png
index 3aa8f08..b7fe099 100644
Binary files a/default_images/res/mainapp_16_8.png and b/default_images/res/mainapp_16_8.png differ
diff --git a/default_images/res/mainapp_32.png b/default_images/res/mainapp_32.png
index 296c6f4..6f13d6e 100644
Binary files a/default_images/res/mainapp_32.png and b/default_images/res/mainapp_32.png differ
diff --git a/default_images/res/mainapp_32_8.png b/default_images/res/mainapp_32_8.png
index 296c6f4..6f13d6e 100644
Binary files a/default_images/res/mainapp_32_8.png and b/default_images/res/mainapp_32_8.png differ
diff --git a/default_images/res/mainapp_48_8.png b/default_images/res/mainapp_48_8.png
index 86bcf59..82ae546 100644
Binary files a/default_images/res/mainapp_48_8.png and b/default_images/res/mainapp_48_8.png differ
More information about the Libreoffice-commits
mailing list