[Libreoffice-commits] .: officecfg/registry
Andras Timar
timar at kemper.freedesktop.org
Thu Jun 16 01:00:38 PDT 2011
officecfg/registry/data/org/openoffice/Inet.xcu | 310 ----------------------
officecfg/registry/schema/org/openoffice/Inet.xcs | 157 -----------
2 files changed, 1 insertion(+), 466 deletions(-)
New commits:
commit ac8c852ec533b143b6b86351cee5b48e90714f49
Author: Samuel Cantrell <samuelcantrell at gmail.com>
Date: Thu Jun 16 09:59:27 2011 +0200
remove Search Options page from Internet group on Options dialog fdo#38146
diff --git a/officecfg/registry/data/org/openoffice/Inet.xcu b/officecfg/registry/data/org/openoffice/Inet.xcu
index 2f8e44c..266b048 100644
--- a/officecfg/registry/data/org/openoffice/Inet.xcu
+++ b/officecfg/registry/data/org/openoffice/Inet.xcu
@@ -94,314 +94,4 @@
"com.sun.star.configuration.backend.WinInetBackend ooInetHTTPSProxyPort"/>
</prop>
</node>
- <node oor:name="SearchEngines">
- <node oor:name="Euroseek" oor:op="replace">
- <node oor:name="And">
- <prop oor:name="ooInetPrefix" oor:type="xs:string">
- <value>http://www.euroseek.com/system/search.cgi?mode=internet&string=</value>
- </prop>
- <prop oor:name="ooInetSuffix" oor:type="xs:string">
- <value>&language=en</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.euroseek.com/system/search.cgi?mode=internet&string=</value>
- </prop>
- <prop oor:name="ooInetSuffix" oor:type="xs:string">
- <value>&language=en</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 oor:name="Or">
- <prop oor:name="ooInetPrefix" oor:type="xs:string">
- <value>http://www.euroseek.com/system/search.cgi?mode=internet&string=</value>
- </prop>
- <prop oor:name="ooInetSuffix" oor:type="xs:string">
- <value>&language=en</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>
- <node oor:name="Lycos" oor:op="replace">
- <node oor:name="And">
- <prop oor:name="ooInetPrefix" oor:type="xs:string">
- <value>http://search.lycos.com/default.asp?loc=searchbox&query=&adv=1&tab=web&wfr=%2B&wfw=&wfq=</value>
- </prop>
- <prop oor:name="ooInetSuffix" oor:type="xs:string">
- <value>&wfr=&wfw=&wfq=&wfr=-&wfw=&wfq=&wfc=3&df0=i&dfq=&df1=e&dfq=&dfc=2&lang=&adf=-2&ca=&submit_button=Submit+Search</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://search.lycos.com/default.asp?lpv=1&loc=searchhp&tab=web&query=%22</value>
- </prop>
- <prop oor:name="ooInetSuffix" oor:type="xs:string">
- <value>%22</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 oor:name="Or">
- <prop oor:name="ooInetPrefix" oor:type="xs:string">
- <value>http://search.lycos.com/default.asp?loc=searchbox&query=&adv=1&tab=web&wfr=&wfw=&wfq=</value>
- </prop>
- <prop oor:name="ooInetSuffix" oor:type="xs:string">
- <value>&wfr=&wfw=&wfq=&wfr=-&wfw=&wfq=&wfc=3&df0=i&dfq=&df1=e&dfq=&dfc=2&lang=&adf=-2&ca=&submit_button=Submit+Search</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>
- <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">
- <value>&btnG=Google+Search</value>
- </prop>
- <prop oor:name="ooInetCaseMatch" oor:type="xs:int">
- <value>0</value>
- </prop>
- <prop oor:name="ooInetPrefix" oor:type="xs:string">
- <value>http://www.google.com/search?hl=en&lr=&ie=UTF-8&oe=UTF-8&q=</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.google.com/search?hl=en&ie=UTF-8&oe=UTF-8&q=%22</value>
- </prop>
- <prop oor:name="ooInetSuffix" oor:type="xs:string">
- <value>%22&btnG=Google+Search</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 oor:name="Or">
- <prop oor:name="ooInetPrefix" oor:type="xs:string">
- <value>http://www.google.com/search?as_q=&num=10&hl=en&ie=UTF-8&oe=UTF-8&btnG=Google+Search&as_epq=&as_oq=</value>
- </prop>
- <prop oor:name="ooInetSuffix" oor:type="xs:string">
- <value>&as_eq=&lr=&as_ft=i&as_filetype=&as_qdr=all&as_occt=any&as_dt=i&as_sitesearch=&safe=images</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>
- <node oor:name="Hotbot" oor:op="replace">
- <node oor:name="Or">
- <prop oor:name="ooInetPrefix" oor:type="xs:string">
- <value>http://www.hotbot.com/default.asp?prov=HotBot&query=</value>
- </prop>
- <prop oor:name="ooInetSuffix" oor:type="xs:string">
- <value>&ps=&loc=searchbox&tab=web</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="And">
- <prop oor:name="ooInetPrefix" oor:type="xs:string">
- <value>http://www.hotbot.com/adv.asp?prov=HotBot&query=</value>
- </prop>
- <prop oor:name="ooInetSuffix" oor:type="xs:string">
- <value>&ps=&loc=searchbox&tab=web&lang=&dfi=&dfe=&region=&wfc=2&wfr=%2B&wfw=&wfq=&wfr=&wfw=&wfq=&date=0&past=&dateop=after</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.hotbot.com/default.asp?prov=HotBot&query=%22</value>
- </prop>
- <prop oor:name="ooInetSuffix" oor:type="xs:string">
- <value>%22&ps=&loc=searchbox&tab=web&wfc=2&wfr=%22&wfr=&wfw=&wfw=&wfq=&wfq=</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="Excite" oor:op="replace">
- <node oor:name="And">
- <prop oor:name="ooInetCaseMatch" oor:type="xs:int">
- <value>0</value>
- </prop>
- <prop oor:name="ooInetPrefix" oor:type="xs:string">
- <value>http://msxml.excite.com/_1_2Z31TR6046OF684__info.xcite/dog/results?otmpl=dog/webresults.htm&qcat=web&ran=30967&qkw=</value>
- </prop>
- <prop oor:name="ooInetSeparator" oor:type="xs:string">
- <value>+</value>
- </prop>
- <prop oor:name="ooInetSuffix" oor:type="xs:string">
- <value>&submit=Search&method=0&dpcollation=1&eng1=About&eng2=askjeeves&eng3=Fast&eng4=FindWhat&eng5=LookSmart&eng6=OpenDirectory&eng7=Overture&eng8=Sprinks&eng9=MetaSearchPicks&eng10=paidinclusion&eng11=Google&eng12=Inktomi&eng13=SearchHippo&eng14=teoma&qk=20&rpe=10&timeout=0&top=1&start=&ver=28494</value>
- </prop>
- </node>
- <node oor:name="Exact">
- <prop oor:name="ooInetCaseMatch" oor:type="xs:int">
- <value>0</value>
- </prop>
- <prop oor:name="ooInetPrefix" oor:type="xs:string">
- <value>http://msxml.excite.com/_1_2MDNTR6046U4NZ2__info.xcite/dog/results?otmpl=dog/webresults.htm&qcat=web&qkw=%22</value>
- </prop>
- <prop oor:name="ooInetSeparator" oor:type="xs:string">
- <value>%20</value>
- </prop>
- <prop oor:name="ooInetSuffix" oor:type="xs:string">
- <value>%22&qk=20&method=&top=1&start=&ver=4734</value>
- </prop>
- </node>
- <node oor:name="Or">
- <prop oor:name="ooInetCaseMatch" oor:type="xs:int">
- <value>0</value>
- </prop>
- <prop oor:name="ooInetPrefix" oor:type="xs:string">
- <value>http://msxml.excite.com/_1_2V4FTR6046L4NP8__info.xcite/dog/results?otmpl=dog/webresults.htm&qcat=web&ran=30967&qkw=</value>
- </prop>
- <prop oor:name="ooInetSeparator" oor:type="xs:string">
- <value>+</value>
- </prop>
- <prop oor:name="ooInetSuffix" oor:type="xs:string">
- <value>&submit=Search&method=1&dpcollation=1&eng1=About&eng2=askjeeves&eng3=Fast&eng4=FindWhat&eng5=LookSmart&eng6=OpenDirectory&eng7=Overture&eng8=Sprinks&eng9=MetaSearchPicks&eng10=paidinclusion&eng11=Google&eng12=Inktomi&eng13=SearchHippo&eng14=teoma&qk=20&rpe=10&timeout=0&top=1&start=&ver=9634</value>
- </prop>
- </node>
- </node>
- <node oor:name="Yahoo" oor:op="replace">
- <node oor:name="And">
- <prop oor:name="ooInetPrefix" oor:type="xs:string">
- <value>http://search.yahoo.com/search?x=op&va=</value>
- </prop>
- <prop oor:name="ooInetSuffix" oor:type="xs:string">
- <value>&va_vt=any&vst=0&vd=all&fl=0&ei=ISO-8859-1&vm=p&n=20</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://search.yahoo.com/search?p=%22</value>
- </prop>
- <prop oor:name="ooInetSuffix" oor:type="xs:string">
- <value>%22&fr=fp-top</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 oor:name="Or">
- <prop oor:name="ooInetPrefix" oor:type="xs:string">
- <value>http://search.yahoo.com/search?x=op&vo=</value>
- </prop>
- <prop oor:name="ooInetSuffix" oor:type="xs:string">
- <value>&vo_vt=any&vst=0&vd=all&fl=0&ei=ISO-8859-1&vm=p&n=20</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>
- </node>
</oor:component-data>
diff --git a/officecfg/registry/schema/org/openoffice/Inet.xcs b/officecfg/registry/schema/org/openoffice/Inet.xcs
index b555c3f..3949dd7 100644
--- a/officecfg/registry/schema/org/openoffice/Inet.xcs
+++ b/officecfg/registry/schema/org/openoffice/Inet.xcs
@@ -27,144 +27,8 @@
************************************************************************ -->
<!DOCTYPE oor:component-schema SYSTEM "../../../component-schema.dtd">
<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Inet" oor:package="org.openoffice" xml:lang="en-US"> <info>
- <desc >Contains Internet-related configurations (proxies, search engines, etc.).</desc>
+ <desc >Contains Internet-related configurations (proxies, etc.).</desc>
</info>
- <templates>
- <info>
- <author>OS/TV</author>
- </info>
- <group oor:name="SearchEngine">
- <info>
- <desc>Specifies the search type, i.e. nexus or exact search.</desc>
- </info>
- <group oor:name="And">
- <info>
- <desc>Specifies the search options for 'AND' searches (all words must be found).</desc>
- </info>
- <prop oor:name="ooInetPrefix" oor:type="xs:string">
- <info>
- <desc>Specifies the search expression, i.e. URL and query command.</desc>
- </info>
- </prop>
- <prop oor:name="ooInetSuffix" oor:type="xs:string">
- <info>
- <desc>Specifies the suffix.</desc>
- </info>
- </prop>
- <prop oor:name="ooInetSeparator" oor:type="xs:string">
- <info>
- <desc>Specifies the separator</desc>
- </info>
- </prop>
- <prop oor:name="ooInetCaseMatch" oor:type="xs:int">
- <info>
- <desc>Specifies if upper and lower case spelling should be considered.</desc>
- </info>
- <constraints>
- <enumeration oor:value="0">
- <info>
- <desc>None</desc>
- </info>
- </enumeration>
- <enumeration oor:value="1">
- <info>
- <desc>Upper</desc>
- </info>
- </enumeration>
- <enumeration oor:value="2">
- <info>
- <desc>Lower</desc>
- </info>
- </enumeration>
- </constraints>
- </prop>
- </group>
- <group oor:name="Or">
- <info>
- <desc>Specifies the search options for 'OR' searches (at least one word must be found).</desc>
- </info>
- <prop oor:name="ooInetPrefix" oor:type="xs:string">
- <info>
- <desc>Specifies the search expression, i.e. URL and query command.</desc>
- </info>
- </prop>
- <prop oor:name="ooInetSuffix" oor:type="xs:string">
- <info>
- <desc>Specifies the suffix.</desc>
- </info>
- </prop>
- <prop oor:name="ooInetSeparator" oor:type="xs:string">
- <info>
- <desc>Specifies the separator</desc>
- </info>
- </prop>
- <prop oor:name="ooInetCaseMatch" oor:type="xs:int">
- <info>
- <desc>Specifies if upper and lower case spelling should be considered.</desc>
- </info>
- <constraints>
- <enumeration oor:value="0">
- <info>
- <desc>None</desc>
- </info>
- </enumeration>
- <enumeration oor:value="1">
- <info>
- <desc>Upper</desc>
- </info>
- </enumeration>
- <enumeration oor:value="2">
- <info>
- <desc>Lower</desc>
- </info>
- </enumeration>
- </constraints>
- </prop>
- </group>
- <group oor:name="Exact">
- <info>
- <desc>Specifies the search options for 'Exact' searches (the whole text must be found).</desc>
- </info>
- <prop oor:name="ooInetPrefix" oor:type="xs:string">
- <info>
- <desc>Specifies the search expression, i.e. URL and query command.</desc>
- </info>
- </prop>
- <prop oor:name="ooInetSuffix" oor:type="xs:string">
- <info>
- <desc>Specifies the suffix.</desc>
- </info>
- </prop>
- <prop oor:name="ooInetSeparator" oor:type="xs:string">
- <info>
- <desc>Specifies the separator</desc>
- </info>
- </prop>
- <prop oor:name="ooInetCaseMatch" oor:type="xs:int">
- <info>
- <desc>Specifies if upper and lower case spelling should be considered.</desc>
- </info>
- <constraints>
- <enumeration oor:value="0">
- <info>
- <desc>None</desc>
- </info>
- </enumeration>
- <enumeration oor:value="1">
- <info>
- <desc>Upper</desc>
- </info>
- </enumeration>
- <enumeration oor:value="2">
- <info>
- <desc>Lower</desc>
- </info>
- </enumeration>
- </constraints>
- </prop>
- </group>
- </group>
- </templates>
<component>
<group oor:name="Settings">
<info>
@@ -350,25 +214,6 @@
</constraints>
</prop>
</group>
- <group oor:name="DefaultSearchEngine">
- <info>
- <desc>Contains the name of the default search engine</desc>
- </info>
- <prop oor:name="Name" oor:type="xs:string">
- <info>
- <author>OS</author>
- <desc>The name of the default search engine</desc>
- </info>
- <value/>
- </prop>
- </group>
- <set oor:name="SearchEngines" oor:node-type="SearchEngine">
- <!--UI: Tools - Options - Internet - Search-->
- <info>
- <author>OS / TV</author>
- <desc>Serves for the configuration of search engines. A default group of (localized) search engines including their configuration should be written by the setup.</desc>
- </info>
- </set>
</component>
</oor:component-schema>
More information about the Libreoffice-commits
mailing list