diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-11-16 17:25:15 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-11-16 17:25:15 +0000 |
| commit | 55ac3ce82f56ff6fdd57174d12a501535f0eed25 (patch) | |
| tree | 8bad2ffb442e71e1165a4adfe33551284ca997e3 /officecfg/registry/schema/org/openoffice/Office/Common.xcs | |
| parent | b5fb85c6253501f340a669ff02f64553a6e09ae7 (diff) | |
| parent | 49d596bd5d1b5e0a1e02d74a51aab207410abae4 (diff) | |
controltextrendering: merge changes from DEV300_m61
Diffstat (limited to 'officecfg/registry/schema/org/openoffice/Office/Common.xcs')
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Common.xcs | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 72a296f4eb1b..ecf79b5814c9 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -920,6 +920,12 @@ <desc>Contains a list of passwords encoded with the master password.</desc> </info> </set> + <prop oor:name="AuthenticateUsingSystemCredentials" oor:type="oor:string-list"> + <info> + <author>KSO</author> + <desc>Contains a list of URLs that should be accessed using system credentials of the user.</desc> + </info> + </prop> </group> <group oor:name="_3D_Engine"> <info> @@ -1675,10 +1681,11 @@ </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> @@ -2376,11 +2383,16 @@ <desc>ODFVER_011</desc> </info> </enumeration> - <enumeration oor:value="3"> + <enumeration oor:value="4"> <info> <desc>ODFVER_012</desc> </info> </enumeration> + <enumeration oor:value="3"> + <info> + <desc>ODFVER_LATEST</desc> + </info> + </enumeration> </constraints> <value>3</value> </prop> @@ -6021,7 +6033,7 @@ <!-- UIHints: Edit Search/Replace --> <info> <author>mod</author> - <desc>Specifies if search includes notes(SwPostItFields)</desc> + <desc>Specifies if search includes comments(SwPostItFields)</desc> </info> <value>false</value> </prop> |