incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1209018 - in /incubator/ooo/trunk/main: configure.in dictionaries/ postprocess/prj/build.lst scp2/source/ooo/common_brand.scp scp2/source/ooo/file_ooo.scp set_soenv.in
Date Thu, 01 Dec 2011 10:07:07 GMT
Author: af
Date: Thu Dec  1 10:07:05 2011
New Revision: 1209018

URL: http://svn.apache.org/viewvc?rev=1209018&view=rev
Log:
118636: Removed the dictionaries module, adapted configure.in

Removed:
    incubator/ooo/trunk/main/dictionaries/
Modified:
    incubator/ooo/trunk/main/configure.in
    incubator/ooo/trunk/main/postprocess/prj/build.lst
    incubator/ooo/trunk/main/scp2/source/ooo/common_brand.scp
    incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp
    incubator/ooo/trunk/main/set_soenv.in

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1209018&r1=1209017&r2=1209018&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Thu Dec  1 10:07:05 2011
@@ -311,12 +311,6 @@ AC_ARG_ENABLE(randr-link,
 [  --disable-randr-link    disable linking with libXrandr, instead dynamically 
                            open it at runtime
 ],,enable_randr_link=yes)
-AC_ARG_WITH(myspell-dicts,
-[  --without-myspell-dicts Removes myspell dictionaries from openoffice.org
-                          installation set, for people building for specific
-                          distributions where the myspell dictionaries are
-                          installed from other sources
-],,)
 AC_ARG_WITH(system-dicts,
 [  --with-system-dicts    Use dictionaries from system paths- Specify
                          them via --with-{dict,hyph,thes}-path=/path
@@ -1264,7 +1258,6 @@ if test "$enable_copyleft" != "yes"; the
    enable_mozilla="no"
    enable_nss_module="no"
    enable_gstreamer="no"
-   with_myspell_dicts="no"
 
    DISABLE_SAXON="TRUE"
 
@@ -1374,49 +1367,36 @@ fi
 AC_MSG_RESULT([$ENABLE_RPATH])
 AC_SUBST(ENABLE_RPATH)
 
-dnl Test whether to include MySpell dictionaries
+dnl Test whether to include system dictionaries
 dnl ===================================================================
-AC_MSG_CHECKING([whether to include MySpell dictionaries])
-if test -z "$with_myspell_dicts" || test "$with_myspell_dicts" = "yes"; then
+AC_MSG_CHECKING([whether to use dicts from external paths])
+if test -n "$with_system_dicts" -a "$with_system_dicts" = "yes"; then
   AC_MSG_RESULT([yes])
-  WITH_MYSPELL_DICTS=YES
-  BUILD_TYPE="$BUILD_TYPE DICTIONARIES"
-else
-  AC_MSG_RESULT([no])
-  WITH_MYSPELL_DICTS=NO
-fi
-AC_SUBST(WITH_MYSPELL_DICTS)
-
-if test "$WITH_MYSPELL_DICTS" = "NO"; then
-  AC_MSG_CHECKING([whether to use dicts from external paths])
-  if test -n "$with_system_dicts" -a "$with_system_dicts" = "yes"; then
-	AC_MSG_RESULT([yes])
-	SYSTEM_DICTS=YES
-	AC_MSG_CHECKING([for spelling dictionary directory])
-	if test -n "$with_external_dict_dir"; then
-		DICT_SYSTEM_DIR=file://$with_external_dict_dir
-	else
-		DICT_SYSTEM_DIR=file:///usr/share/hunspell
-	fi
-	AC_MSG_RESULT([$DICT_SYSTEM_DIR])
-	AC_MSG_CHECKING([for hyphenation patterns directory])
-	if test -n "$with_external_hyph_dir"; then
-		HYPH_SYSTEM_DIR=file://$with_external_hyph_dir
-	else
-		HYPH_SYSTEM_DIR=file:///usr/share/hyphen
-	fi
-	AC_MSG_RESULT([$HYPH_SYSTEM_DIR])
-	AC_MSG_CHECKING([for thesaurus directory])
-	if test -n "$with_external_thes_dir"; then
-		THES_SYSTEM_DIR=file://$with_external_thes_dir
-	else
-		THES_SYSTEM_DIR=file:///usr/share/mythes
-	fi
-	AC_MSG_RESULT([$THES_SYSTEM_DIR])
+  SYSTEM_DICTS=YES
+  AC_MSG_CHECKING([for spelling dictionary directory])
+  if test -n "$with_external_dict_dir"; then
+      DICT_SYSTEM_DIR=file://$with_external_dict_dir
+  else
+      DICT_SYSTEM_DIR=file:///usr/share/hunspell
+  fi
+  AC_MSG_RESULT([$DICT_SYSTEM_DIR])
+  AC_MSG_CHECKING([for hyphenation patterns directory])
+  if test -n "$with_external_hyph_dir"; then
+      HYPH_SYSTEM_DIR=file://$with_external_hyph_dir
   else
-  	AC_MSG_RESULT([no])
-  	SYSTEM_DICTS=NO
+      HYPH_SYSTEM_DIR=file:///usr/share/hyphen
   fi
+  AC_MSG_RESULT([$HYPH_SYSTEM_DIR])
+  AC_MSG_CHECKING([for thesaurus directory])
+  if test -n "$with_external_thes_dir"; then
+      THES_SYSTEM_DIR=file://$with_external_thes_dir
+  else
+      THES_SYSTEM_DIR=file:///usr/share/mythes
+  fi
+  AC_MSG_RESULT([$THES_SYSTEM_DIR])
+else
+  AC_MSG_RESULT([no])
+  SYSTEM_DICTS=NO
 fi
 AC_SUBST(SYSTEM_DICTS)
 AC_SUBST(DICT_SYSTEM_DIR)

Modified: incubator/ooo/trunk/main/postprocess/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/prj/build.lst?rev=1209018&r1=1209017&r2=1209018&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/prj/build.lst (original)
+++ incubator/ooo/trunk/main/postprocess/prj/build.lst Thu Dec  1 10:07:05 2011
@@ -1,4 +1,4 @@
-po      postprocess     ::      accessibility automation basctl bean BINFILTER:binfilter
chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm
eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io
JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package
padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath
sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts
DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport
REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext smoketestdoc uui writerfilter
oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
+po      postprocess     ::      accessibility automation basctl bean BINFILTER:binfilter
chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm
eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io
JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package
padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath
sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts
OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder
reportdesign SDEXT:sdext SWEXT:swext smoketestdoc uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt
NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL

Modified: incubator/ooo/trunk/main/scp2/source/ooo/common_brand.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/common_brand.scp?rev=1209018&r1=1209017&r2=1209018&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/common_brand.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/common_brand.scp Thu Dec  1 10:07:05 2011
@@ -235,166 +235,6 @@ Directory gid_Brand_Dir_Share_Extensions
     DosName = "install";
 End
 
-Directory gid_Brand_Dir_Share_Extensions_Dict_Af
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-af";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Ca
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-ca";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Cs
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-cs";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Da
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-da";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_De_At
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-de-AT";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_De_Ch
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-de-CH";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_De_De
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-de-DE";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_En
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-en";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Es
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-es";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Et
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-et";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Fr
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-fr";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Gl
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-gl";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_He
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-he";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Hu
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-hu";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_It
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-it";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Ku_Tr
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-ku-TR";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Lt
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-lt";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Ne
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-ne";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Nl
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-nl";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_No
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-no";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Pl
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-pl";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Pt
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-pt";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Ro
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-ro";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Ru
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-ru";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Sk
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-sk";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Sl
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-sl";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Sr
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-sr";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Sv
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-sv";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Sw
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-sw";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Th
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-th";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Vi
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-vi";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Zu
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-zu";
-End
-
 Directory gid_Brand_Dir_Share_Extensions_Oooimprovement
     ParentID = gid_Brand_Dir_Share_Extensions;
     DosName = "OOoImprovement";

Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp?rev=1209018&r1=1209017&r2=1209018&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp Thu Dec  1 10:07:05 2011
@@ -1808,296 +1808,6 @@ File gid_File_Share_Registry_Lingucompon
     Name = "lingucomponent.xcd";
 End
 
-// Dictionary extensions
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Af
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Af;
-	Name = "dict-af.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Ca
-    Dir = gid_Brand_Dir_Share_Extensions_Dict_Ca;
-    Name = "dict-ca.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-    UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Cs
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Cs;
-	Name = "dict-cs.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Da
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Da;
-	Name = "dict-da.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_De_AT
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_De_At;
-	Name = "dict-de-AT.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_De_CH
-    Dir = gid_Brand_Dir_Share_Extensions_Dict_De_Ch;
-    Name = "dict-de-CH.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-    UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_De_DE
-    Dir = gid_Brand_Dir_Share_Extensions_Dict_De_De;
-    Name = "dict-de-DE.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-    UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_En
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_En;
-	Name = "dict-en.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Es
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Es;
-	Name = "dict-es.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Et
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Et;
-	Name = "dict-et.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Fr
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Fr;
-	Name = "dict-fr.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Gl
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Gl;
-	Name = "dict-gl.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_He
-    Dir = gid_Brand_Dir_Share_Extensions_Dict_He;
-    Name = "dict-he.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-    UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Hu
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Hu;
-	Name = "dict-hu.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_It
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_It;
-	Name = "dict-it.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Ku_Tr
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Ku_Tr;
-	Name = "dict-ku-TR.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Lt
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Lt;
-	Name = "dict-lt.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Ne
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Ne;
-	Name = "dict-ne.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Nl
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Nl;
-	Name = "dict-nl.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_No
-    Dir = gid_Brand_Dir_Share_Extensions_Dict_No;
-    Name = "dict-no.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-    UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Pl
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Pl;
-	Name = "dict-pl.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Pt
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Pt;
-	Name = "dict-pt.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Ro
-    Dir = gid_Brand_Dir_Share_Extensions_Dict_Ro;
-    Name = "dict-ro.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-    UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Ru
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Ru;
-	Name = "dict-ru.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Sk
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sk;
-	Name = "dict-sk.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Sl
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sl;
-	Name = "dict-sl.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Sr
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sr;
-	Name = "dict-sr.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Sv
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sv;
-	Name = "dict-sv.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Sw
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sw;
-	Name = "dict-sw.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Th
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Th;
-	Name = "dict-th.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Vi
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Vi;
-	Name = "dict-vi.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Zu
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Zu;
-	Name = "dict-zu.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
 // #ifdef BUILD_SPECIAL
 // File gid_File_Extension_Oxt_Oooimprovement
 //    Name = "OOoImprovement.oxt";

Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1209018&r1=1209017&r2=1209018&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Thu Dec  1 10:07:05 2011
@@ -1849,7 +1849,6 @@ ToFile( "SYSTEM_GRAPHITE",   "@SYSTEM_GR
 ToFile( "GRAPHITE_LIBS",     "@GRAPHITE_LIBS@",     "e");
 ToFile( "GRAPHITE_CFLAGS",   "@GRAPHITE_CFLAGS@",   "e");
 ToFile( "VC_STANDARD",       "@VC_STANDARD@",      "e" );
-ToFile( "WITH_MYSPELL_DICTS","@WITH_MYSPELL_DICTS@","e");
 ToFile( "SYSTEM_DICTS",      "@SYSTEM_DICTS@",     "e");
 ToFile( "DICT_SYSTEM_DIR",   "@DICT_SYSTEM_DIR@",  "e");
 ToFile( "HYPH_SYSTEM_DIR",   "@HYPH_SYSTEM_DIR@",  "e");



Mime
View raw message