diff options
| author | Jorenz Paragas <j.paragas.237@gmail.com> | 2016-04-25 23:41:12 -0700 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-04-26 11:53:52 +0000 |
| commit | 6a4a15c87c03feffb90cc416ce22d2819e41442d (patch) | |
| tree | 3a580524af4fbbbd43ad0f3d0586d654d424f2bf /include/oox/crypto/CryptTools.hxx | |
| parent | c3572701cf5481edc7432b062e0fa69697c212be (diff) | |
tdf#42949: clean up includes in include/oox/crypto with iwyu
The includes in CryptTools.hxx that are within #if/#endif directives
are not altered. iwyu suggested replacing the includes for nss.h,
pk11pub.h, and sechash.h with hasht.h, pkcs11t.h, seccomon.h,
and secmodt.h. I decided not to because it might make CryptTools.hxx
harder to refactor in exchange for little gain.
Before creating this commit, I ran 'make check' after passing
--with-tls=openssl to ./autogen.sh to ensure that building with
either OpenSSL or NSS (the default except on iOS and Android) works.
Change-Id: I20260d18f073ffd8077bbcc597e7a8e4954e2ec5
Reviewed-on: https://gerrit.libreoffice.org/24386
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'include/oox/crypto/CryptTools.hxx')
| -rw-r--r-- | include/oox/crypto/CryptTools.hxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/oox/crypto/CryptTools.hxx b/include/oox/crypto/CryptTools.hxx index d93fef62e336..23e48c29d86b 100644 --- a/include/oox/crypto/CryptTools.hxx +++ b/include/oox/crypto/CryptTools.hxx @@ -22,8 +22,6 @@ #include <config_oox.h> -#include <rtl/ustring.hxx> - #if USE_TLS_OPENSSL #include <openssl/evp.h> #include <openssl/sha.h> @@ -35,9 +33,10 @@ #include <sechash.h> #endif // USE_TLS_NSS -#include <rtl/digest.h> #include <vector> +#include <sal/types.h> + namespace oox { namespace core { |