[Libreoffice-commits] .: Branch 'libreoffice-3-3-1' - patches/dev300

[Fridrich Strba]

 patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff |   21 +++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

New commits:
commit 431f9d57ae36ebe7554a294fd146f2444064bb02
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Feb 22 12:00:15 2011 +0100

    Fix bundled dictionaries in Novell build

diff --git a/patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff b/patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff
index b035209..37afe1e 100644
--- a/patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff
+++ b/patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff
@@ -1,4 +1,4 @@
---- scp2/source/ooo/file_ooo.scp.org	2008-07-17 08:37:09.000000000 +0200
+--- scp2/source/ooo/file_ooo.scp	2008-07-17 08:37:09.000000000 +0200
 +++ scp2/source/ooo/file_ooo.scp	2008-07-18 07:23:31.000000000 +0200
 @@ -1868,6 +1868,19 @@
  
@@ -8,9 +8,9 @@
 +
 +#ifndef WITHOUT_MYSPELL_DICTS
 +File gid_File_Extension_Dictionary_Bundle
-+    Dir = gid_Brand_Dir_Share_Extensions_Install;
++    Dir = gid_Brand_Dir_Share_Extensions_Dict_Bundle;
 +    Name = "dict-bundle.oxt";
-+    Styles = (PACKED);
++    Styles = (PACKED, ARCHIVE);
 +    UnixRights = 444;
 +End
 +#endif
@@ -29,3 +29,18 @@
  // #ifdef BUILD_SPECIAL
  // File gid_File_Extension_Oxt_Oooimprovement
  //    Name = "OOoImprovement.oxt";
+--- scp2/source/ooo/common_brand.scp
++++ scp2/source/ooo/common_brand.scp
+@@ -211,9 +211,9 @@ Directory gid_Brand_Dir_Share_Prereg
+     Styles = (CREATE);
+ End
+ 
+-Directory gid_Brand_Dir_Share_Extensions_Install
+-    ParentID = gid_Brand_Dir_Share_Extension;
+-    DosName = "install";
++Directory gid_Brand_Dir_Share_Extensions_Dict_Bundle
++    ParentID = gid_Brand_Dir_Share_Extensions;
++    DosName = "dict-bundle";
+ End
+ 
+ Directory gid_Brand_Dir_Share_Extensions_Dict_Af