diff options
author | David Tardon <dtardon@redhat.com> | 2017-02-02 09:14:46 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2017-02-02 19:13:54 +0000 |
commit | 23f7e82c7bafd3af97466761e01667d583db6af8 (patch) | |
tree | 085f712043eba02983778ebe14701905f527594b | |
parent | 925552f77723271abeab5dec48b5859c0b9927c9 (diff) |
drop bundled ooo2gd (Google Docs) extension
LibreOffice has had direct support for Google Drive since (I think) 5.1,
via libcmis.
Change-Id: I7587923b3fd7dd505124b790066cdaa99a858af1
Reviewed-on: https://gerrit.libreoffice.org/33822
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
-rw-r--r-- | Makefile.fetch | 1 | ||||
-rw-r--r-- | config_host.mk.in | 1 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | external/misc_extensions/ExtensionPackageSet_misc_extensions.mk | 4 | ||||
-rw-r--r-- | scp2/source/extensions/file_extensions.scp | 13 | ||||
-rw-r--r-- | scp2/source/extensions/module_extensions.scp | 14 | ||||
-rw-r--r-- | scp2/source/extensions/module_extensions.ulf | 6 |
7 files changed, 0 insertions, 40 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index a350b2f29196..b01fdd6fe293 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -131,7 +131,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,FREETYPE,FREETYPE_TARBALL) \ $(call fetch_Optional,EPOXY,EPOXY_TARBALL) \ $(call fetch_Optional,GLM,GLM_TARBALL) \ - $(call fetch_Optional_pack,GOOGLE_DOCS_EXTENSION_PACK) \ $(call fetch_Optional,GRAPHITE,GRAPHITE_TARBALL) \ $(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \ $(call fetch_Optional,HSQLDB,HSQLDB_TARBALL) \ diff --git a/config_host.mk.in b/config_host.mk.in index c577e4c94ce7..951e170d30fc 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -216,7 +216,6 @@ export GNUPATCH=@GNUPATCH@ export GNUTAR=@GNUTAR@ export GOBJECT_CFLAGS=$(gb_SPACE)@GOBJECT_CFLAGS@ export GOBJECT_LIBS=$(gb_SPACE)@GOBJECT_LIBS@ -export GOOGLE_DOCS_EXTENSION_PACK=@GOOGLE_DOCS_EXTENSION_PACK@ export GPERF=@GPERF@ export GRAPHITE_CFLAGS=$(gb_SPACE)@GRAPHITE_CFLAGS@ export GRAPHITE_LIBS=$(gb_SPACE)@GRAPHITE_LIBS@ diff --git a/configure.ac b/configure.ac index 7ab1286dc0ab..6219c5d0a000 100644 --- a/configure.ac +++ b/configure.ac @@ -11466,7 +11466,6 @@ AC_SUBST([WITH_EXTRA_EXTENSIONS]) libo_CHECK_EXTENSION([ConvertTextToNumber],[CT2N],[ct2n],[ct2n],[]) libo_CHECK_EXTENSION([Numbertext],[NUMBERTEXT],[numbertext],[numbertext],[b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt]) -libo_CHECK_EXTENSION([Google Docs],[GOOGLE_DOCS],[google_docs],[google-docs],[27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt]) if test "x$with_java" != "xno"; then libo_CHECK_EXTENSION([NLPSolver],[NLPSOLVER],[nlpsolver],[nlpsolver],[]) libo_CHECK_EXTENSION([LanguageTool],[LANGUAGETOOL],[languagetool],[languagetool],[]) diff --git a/external/misc_extensions/ExtensionPackageSet_misc_extensions.mk b/external/misc_extensions/ExtensionPackageSet_misc_extensions.mk index d1c0984bc820..77b981479457 100644 --- a/external/misc_extensions/ExtensionPackageSet_misc_extensions.mk +++ b/external/misc_extensions/ExtensionPackageSet_misc_extensions.mk @@ -17,10 +17,6 @@ ifneq ($(DIAGRAM_EXTENSION_PACK),) $(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,SmART,$(DIAGRAM_EXTENSION_PACK))) endif -ifneq ($(GOOGLE_DOCS_EXTENSION_PACK),) -$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,gdocs,$(GOOGLE_DOCS_EXTENSION_PACK))) -endif - ifneq ($(HUNART_EXTENSION_PACK),) $(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,hunart,$(HUNART_EXTENSION_PACK))) endif diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 4f0a09b830b4..ebef87b8cf7b 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -35,19 +35,6 @@ End #endif -/* ** Google Docs ** */ - -#ifdef WITH_EXTENSION_GOOGLE_DOCS - -File gid_File_Oxt_Google_Docs - TXT_FILE_BODY; - Styles = (PACKED, FILELIST); - Dir = FILELIST_DIR; - Name = "gdocs.filelist"; -End - -#endif - /* ** NLPSolver ** */ #ifdef WITH_EXTENSION_NLPSOLVER diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index f0af98f7cf28..6db143fce8bc 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -77,20 +77,6 @@ Module gid_Module_Optional_Extensions_CT2N End #endif -/* ** Google Docs ** */ - -#ifdef WITH_EXTENSION_GOOGLE_DOCS -Module gid_Module_Optional_Extensions_Google_Docs - PackageInfo = "packinfo_extensions.txt"; - MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_GOOGLE_DOCS); - ParentID = gid_Module_Optional_Extensions; - Files = ( - gid_File_Oxt_Google_Docs ); - Default = YES; - Styles = ( ); -End -#endif - /* ** NLPSolver ** */ #ifdef WITH_EXTENSION_NLPSOLVER diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf index e9b90f4eed3c..02de867b4ac8 100644 --- a/scp2/source/extensions/module_extensions.ulf +++ b/scp2/source/extensions/module_extensions.ulf @@ -40,12 +40,6 @@ en-US = "Convert Text to Number" [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_CT2N] en-US = "Convert Text to Number" -[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_GOOGLE_DOCS] -en-US = "Google Docs & Zoho" - -[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_GOOGLE_DOCS] -en-US = "Google Docs & Zoho" - [STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER] en-US = "Solver for Nonlinear Programming" |