diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-07-16 09:56:45 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-07-16 09:56:45 +0000 |
| commit | 12981b955e57687d5ac3e8c40f7b602b65d7dba0 (patch) | |
| tree | 8a01e701ffb3e6875e9d4e71896385c64ad0d111 /scp2/source/ooo | |
| parent | 4a9eb3a6059f9a6d2bc5074b7f79acb5cbf31882 (diff) | |
CWS-TOOLING: integrate CWS ooo311gsl05_DEV300
2009-06-30 17:18:18 +0200 pl r273524 : add patch flags for CWS ooo311gsl05
2009-06-30 16:22:06 +0200 pl r273519 : #i102485# correct landscape printing
2009-06-30 08:45:25 +0200 hdu r273486 : #i102378# fix PDF-export on PPC (thanks cloph!)
Diffstat (limited to 'scp2/source/ooo')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 1be88f725057..2434342df43d 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1547,11 +1547,7 @@ STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx ) File gid_File_Lib_Vcl Name = LIBNAME(vcl); TXT_FILE_BODY; -<<<<<<< .working Styles = (PACKED,UNO_COMPONENT,PATCH); -======= - Styles = (PACKED,PATCH,UNO_COMPONENT); ->>>>>>> .merge-right.r273775 Dir = gid_Dir_Program; RegistryID = gid_Starregistry_Services_Rdb; End |