[Libreoffice-commits] core.git: vcl/Library_vcl.mk vcl/source

[Miklos Vajna]

 vcl/Library_vcl.mk                |    8 --------
 vcl/source/gdi/pdfwriter_impl.cxx |   14 --------------
 2 files changed, 22 deletions(-)

New commits:
commit b23cd7ea0607ea1c0ec2022e80349d96368e3923
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Aug 24 09:29:03 2017 +0200

    vcl PDF export: remove no longer direct NSS dependency
    
    The relevant code has been moved to svl.
    
    Change-Id: Id2b77c797745af21d3d5f954357a02d54fb67908
    Reviewed-on: https://gerrit.libreoffice.org/41498
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 00cbf3b6a23e..f6eaae2d4e13 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -63,14 +63,6 @@ $(eval $(call gb_Library_use_externals,vcl,\
 	$(if $(filter PDFIUM,$(BUILD_TYPE)),pdfium) \
 ))
 
-ifeq ($(TLS),NSS)
-$(eval $(call gb_Library_use_externals,vcl,\
-	$(if $(filter-out IOS WNT,$(OS)), \
-		nss3 \
-		plc4) \
-))
-endif
-
 $(eval $(call gb_Library_use_libraries,vcl,\
     $(call gb_Helper_optional,BREAKPAD, \
 		crashreport) \
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 63d9848e2a22..9e3db7068a25 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -85,20 +85,6 @@
 
 #include "pdfwriter_impl.hxx"
 
-#if HAVE_FEATURE_NSS && !defined(_WIN32)
-// NSS headers for PDF signing
-#include "nss.h"
-#include "cert.h"
-#include "hasht.h"
-#include "secerr.h"
-#include "sechash.h"
-#include "cms.h"
-#include "cmst.h"
-
-// We use curl for RFC3161 time stamp requests
-#include <curl/curl.h>
-#endif
-
 #ifdef _WIN32
 // WinCrypt headers for PDF signing
 // Note: this uses Windows 7 APIs and requires the relevant data types