diff options
| author | Noel Power <noel.power@novell.com> | 2010-10-13 13:22:42 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2010-10-13 13:22:42 +0100 |
| commit | 50a13b7f4166ec2b305226cc81520ccc6010ff69 (patch) | |
| tree | c3ef2cb9f135003cecc60d1373f59dca34475b8c /officecfg | |
| parent | 4e7e749fc2306995eaab3411c0cfc4c8785a5172 (diff) | |
| parent | a7458f68ae3b7a5c07e5c4455f44d2509ddd63bc (diff) | |
Merge commit 'origin/master'
Conflicts:
vbahelper/source/vbahelper/vbadialogbase.cxx
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/DataAccess.xcu | 8 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/Writer.xcu | 26 |
2 files changed, 34 insertions, 0 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu index d185b67fcc6e..f4c3c3f8c21d 100644 --- a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu +++ b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu @@ -153,6 +153,14 @@ </node> </node> <node oor:name="RegisteredNames"> + <node oor:name="EvolutionLocal" oor:op="replace"> + <prop oor:name="Location" oor:type="xs:string"> + <value>$(userurl)/database/evolocal.odb</value> + </prop> + <prop oor:name="Name" oor:type="xs:string"> + <value>EvolutionLocal</value> + </prop> + </node> <node oor:name="org.openoffice.Bibliography" oor:op="replace"> <prop oor:name="Location" oor:type="xs:string"> <value>$(userurl)/database/biblio.odb</value> diff --git a/officecfg/registry/data/org/openoffice/Office/Writer.xcu b/officecfg/registry/data/org/openoffice/Office/Writer.xcu index b318614ef789..bdc54ceb1ea1 100644 --- a/officecfg/registry/data/org/openoffice/Office/Writer.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Writer.xcu @@ -40,6 +40,32 @@ <prop oor:name="IsHideEmptyParagraphs" > <value>true</value> </prop> + <node oor:name="DataSource"> + <prop oor:name="DataSourceName" oor:type="xs:string"> + <value>EvolutionLocal</value> + </prop> + <prop oor:name="DataTableName" oor:type="xs:string"> + <value>Personal</value> + </prop> + </node> + <node oor:name="AddressDataAssignments"> + <node oor:name="_0" oor:op="replace"> + <prop oor:name="DBColumnAssignments" oor:type="oor:string-list"> + <value oor:separator=",">title,full_name,family_name,org,addr_line1,addr_line2,city,state,zip,country,home_phone,business_phone,email_1,</value> + </prop> + <node oor:name="DataSource"> + <prop oor:name="DataCommandType" oor:type="xs:short"> + <value>0</value> + </prop> + <prop oor:name="DataSourceName" oor:type="xs:string"> + <value>EvolutionLocal</value> + </prop> + <prop oor:name="DataTableName" oor:type="xs:string"> + <value>Personal</value> + </prop> + </node> + </node> + </node> <prop oor:name="EMailSupported"> <value>true</value> </prop> |