[Libreoffice-commits] .: Branch 'feature/gbuild_extras' - configure.in extras/Package_extensions.mk ooo.lst.in

[Libreoffice Gerrit user]

 configure.in                 |    4 ----
 extras/Package_extensions.mk |    3 ---
 ooo.lst.in                   |    1 -
 3 files changed, 8 deletions(-)

New commits:
commit 2a8445e324294bb05b7577c959ce7f18b41be34c
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Aug 22 15:01:12 2012 +0200

    the downloaded ct2n oxt is not used
    
    Change-Id: I593f08e91f823e9c9eca2b42b9ec22190e8849f1

diff --git a/configure.in b/configure.in
index 1456938..80535eb 100644
--- a/configure.in
+++ b/configure.in
@@ -10448,17 +10448,13 @@ dnl ===================================================================
 dnl Test whether to include ConvertTextToNumber extension
 dnl ===================================================================
 AC_MSG_CHECKING([for ConvertTextToNumber extension integration])
-CT2N_EXTENSION_PACK=
 if test "x$enable_ext_ct2n" = "xyes" -a "x$enable_extension_integration" != "xno"; then
     BUILD_TYPE="$BUILD_TYPE CT2N"
     SCPDEFS="$SCPDEFS -DWITH_EXTENSION_CT2N"
-    CT2N_EXTENSION_PACK="451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt"
-    WITH_EXTRA_EXTENSIONS=YES
     AC_MSG_RESULT([yes])
 else
     AC_MSG_RESULT([no])
 fi
-AC_SUBST(CT2N_EXTENSION_PACK)
 
 dnl ===================================================================
 dnl Test whether to include Numbertext extension
diff --git a/extras/Package_extensions.mk b/extras/Package_extensions.mk
index 1c464e4..9579032 100644
--- a/extras/Package_extensions.mk
+++ b/extras/Package_extensions.mk
@@ -14,9 +14,6 @@ $(eval $(call gb_Package_Package,extras_extensions,$(SRCDIR)/src))
 ifneq ($(BARCODE_EXTENSION_PACK),)
 $(eval $(call gb_Package_add_file,extras_extensions,bin/Barcode.oxt,$(BARCODE_EXTENSION_PACK)))
 endif
-ifneq ($(CT2N_EXTENSION_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/ConvertTextToNumber.oxt,$(CT2N_EXTENSION_PACK)))
-endif
 ifneq ($(DIAGRAM_EXTENSION_PACK),)
 $(eval $(call gb_Package_add_file,extras_extensions,bin/SmART.oxt,$(DIAGRAM_EXTENSION_PACK)))
 endif
diff --git a/ooo.lst.in b/ooo.lst.in
index cc88ab1..c7f5c58 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -107,7 +107,6 @@ http://ooo.itc.hu/oxygenoffice/download/libreoffice/
 @OOOP_FONTS_PACK@
 @OOOP_SAMPLES_PACK@
 @OXYGENOFFICE_PACK@
- at CT2N_EXTENSION_PACK@
 @BARCODE_EXTENSION_PACK@
 @DIAGRAM_EXTENSION_PACK@
 @VALIDATOR_EXTENSION_PACK@