diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-01-15 09:34:47 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-01-15 09:34:47 +0000 |
commit | ae4908f641b18d67d0c2723205d7007674e0b13b (patch) | |
tree | 3be376051333be77f14769dfe1f86831f6c70281 /scp2 | |
parent | 92cecb6a24282b355560f35e48644ebf552cb61b (diff) |
INTEGRATION: CWS so8s10u5_SRC680 (1.214.4.3.4); FILE MERGED
2008/01/09 13:34:03 is 1.214.4.3.4.1: #b6647223# configfile javasettings.xml
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/source/ooo/file_ooo.scp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index f74650569079..b10cc7616b43 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -4,9 +4,9 @@ * * $RCSfile: file_ooo.scp,v $ * - * $Revision: 1.226 $ + * $Revision: 1.227 $ * - * last change: $Author: ihi $ $Date: 2007-11-27 12:16:07 $ + * last change: $Author: rt $ $Date: 2008-01-15 10:34:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -3374,7 +3374,12 @@ File gid_File_Config_Javasettingsunopkginstall USER_FILE_BODY; Dir = gid_Dir_Config; Name = "javasettingsunopkginstall.xml"; + #ifdef SOLARIS + Styles = (PACKED,PATCH,CONFIGFILE); + #else Styles = (PACKED,PATCH); + #endif + SolarisGroup = "other"; End #if defined( BUILD_SPECIAL ) |