diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-09-16 16:17:27 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-09-16 16:17:27 +0000 |
| commit | 8c895561f63ed7161947a04da8e6a3d3fb195fa7 (patch) | |
| tree | 0c1c450c45fdeb8cdc550eebe3e58ae2f58e57cd /officecfg | |
| parent | cb6a7b19436d658990b582c98612d95da8d17afd (diff) | |
CWS-TOOLING: integrate CWS fwk116
2009-09-03 Mikhail Voytenko #i101453# write the default values for old entries
2009-09-03 Mikhail Voytenko #i101453# let the new default value be used
2009-09-03 Mikhail Voytenko #i101453# revert the change for xslt-transformation, the duplicate nodes should not be allowed
2009-09-03 Mikhail Voytenko #i101453# allow duplicate nodes for different modules
2009-09-03 Mikhail Voytenko #i101453# fix the special mac installation
2009-09-02 Mikhail Voytenko #i101453# correct the usage of configuration files
2009-09-02 Mikhail Voytenko #i10000# fix warning
2009-09-02 Mikhail Voytenko #i10000# fix warning
2009-09-02 Mikhail Voytenko #i96918# try to open the file for editing always
2009-09-02 Mikhail Voytenko #i51058# remove unused strings
2009-09-02 Mikhail Voytenko #i51058# remove unused strings
2009-09-01 Mikhail Voytenko #i10000# fix typo
2009-08-30 Mikhail Voytenko Rebase on DEV300_m56
2009-08-19 Mikhail Voytenko #i101732# do not generate a transparent bitmap for thumbnail
2009-08-13 Mikhail Voytenko #i101453# do not use system temporary location on Mac
2009-08-13 Mikhail Voytenko #i101453# do not use system temporary location on Mac
2009-08-07 Mikhail Voytenko #i103617# fix warning
2009-07-31 Carsten Driesner #i103924# Fix wrong number of arguments
2009-07-31 Mikhail Voytenko #i101207# integrate the patch
2009-07-31 Mikhail Voytenko #i103783# integrate the patch; get rid of CRLF
2009-07-31 Mikhail Voytenko #i97969# integrate the patch
2009-07-27 Carsten Driesner #i103423# Use correct request count in the ctor. Don't descrease value before checking the request count
Diffstat (limited to 'officecfg')
4 files changed, 18 insertions, 5 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu index 6e25dedba37e..c9747dc9dea0 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu @@ -567,4 +567,13 @@ </prop> </node> </node> + <node oor:name="Path"> + <node oor:name="Current"> + <prop oor:name="Temp" oor:type="xs:string"> + <value install:module="macosx">$(userurl)/temp</value> + <value install:module="unx">$(temp)</value> + <value install:module="wnt">$(temp)</value> + </prop> + </node> + </node> </oor:component-data> diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu index e4bec2eaee19..b979f0f097c3 100644 --- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu @@ -179,12 +179,13 @@ <node oor:name="Temp" oor:op="fuse" oor:mandatory="true"> <prop oor:name="IsSinglePath" oor:finalized="true"> - <value>true</value> + <value>true</value> </prop> - <node oor:name="InternalPaths" oor:finalized="true" /> - <prop oor:name="UserPaths" oor:finalized="true" /> + <node oor:name="InternalPaths" oor:finalized="true"/> + <prop oor:name="UserPaths" oor:finalized="true"/> <prop oor:name="WritePath"> - <value>$(temp)</value> + <value install:module="macosx">$(userurl)/temp</value> + <value install:module="unxwnt">$(temp)</value> </prop> </node> diff --git a/officecfg/registry/data/org/openoffice/Office/makefile.mk b/officecfg/registry/data/org/openoffice/Office/makefile.mk index 52f31ee38261..50b67954aeef 100644 --- a/officecfg/registry/data/org/openoffice/Office/makefile.mk +++ b/officecfg/registry/data/org/openoffice/Office/makefile.mk @@ -86,6 +86,8 @@ MODULEFILES= \ Common-cjk.xcu \ Common-ctl.xcu \ Common-korea.xcu \ + Paths-macosx.xcu \ + Paths-unxwnt.xcu \ Writer-cjk.xcu \ Writer-defaultfontarial.xcu \ Writer-directcursor.xcu \ diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index e834f97d4df9..18668aea5f64 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -1657,10 +1657,11 @@ Dymamic border coloring means that when the mouse is hovered over a control, and </prop> <prop oor:name="Temp" oor:type="xs:string"> <info> + <deprecated>Replaced by org.openoffice.Office.Paths/Temp</deprecated> <author>MBA</author> <desc>Specifies the base directory used by the Office to store temp files.</desc> </info> - <value>$(temp)</value> + <value/> </prop> <prop oor:name="Template" oor:type="oor:string-list"> <info> |