summaryrefslogtreecommitdiff
path: root/solenv/gbuild
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2014-03-01 20:03:41 +0200
committerKohei Yoshida <libreoffice@kohei.us>2014-03-01 14:45:45 -0600
commitd5890e87ab5e298e9a74ed0d552b01a98e59b1fa (patch)
treea512dcbedfa05b2258da876941ab8727dda2705a /solenv/gbuild
parentd739b01b9f20b1a7fd4b313b28e4dd4e5edd9193 (diff)
Merge HTML detection to text detection service
Setting the filter name explicitly is not really required, because TypeDetection::impl_checkResultsAndAddBestFilter is able to select the correct filter anyway. But it seems that other detection services also do it, so I followed that way. Change-Id: I6e73fa79c6867d82f98d63e8d2b7865446f088ef Reviewed-on: https://gerrit.libreoffice.org/8213 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
Diffstat (limited to 'solenv/gbuild')
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index ba7ad86aeaff..9cc207915e11 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -46,7 +46,6 @@ gb_EXTRAMERGEDLIBS := \
graphicfilter \
guesslang \
$(if $(ENABLE_JAVA),hsqldb) \
- htmlfd \
hyphen \
icd \
icg \