mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#42949: clean up includes in include/oox/crypto with iwyu

Browse Source 
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>
This commit is contained in:
Jorenz Paragas 2016-04-25 23:41:12 -07:00 committed by Michael Stahl
parent c3572701cf
commit 6a4a15c87c
11 changed files with 66 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/oox/crypto/AgileEngine.hxx
View File

@ -11,8 +11,17 @@
#ifndef INCLUDED_OOX_CRYPTO_AGILEENGINE_HXX
#define INCLUDED_OOX_CRYPTO_AGILEENGINE_HXX
#include <vector>
#include <oox/crypto/CryptTools.hxx>
#include <oox/crypto/CryptoEngine.hxx>
#include <rtl/ustring.hxx>
#include <sal/types.h>
namespace oox {
class BinaryXInputStream;
class BinaryXOutputStream;
}
namespace oox {
namespace core {

5
include/oox/crypto/CryptTools.hxx
View File

@ -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 {

9
include/oox/crypto/CryptoEngine.hxx
View File

@ -13,8 +13,13 @@
#include <vector>
#include <oox/helper/binaryinputstream.hxx>
#include <oox/helper/binaryoutputstream.hxx>
#include <rtl/ustring.hxx>
#include <sal/types.h>
namespace oox {
class BinaryXInputStream;
class BinaryXOutputStream;
}
namespace oox {
namespace core {

28
include/oox/crypto/DocumentDecryption.hxx
View File

@ -13,20 +13,22 @@
#include <oox/dllapi.h>
#include <oox/ole/olestorage.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include <oox/helper/binaryoutputstream.hxx>
#include <com/sun/star/io/XStream.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <oox/crypto/CryptTools.hxx>
#include <oox/crypto/AgileEngine.hxx>
#include <oox/crypto/Standard2007Engine.hxx>
#include <memory>
#include <vector>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.h>
#include <oox/crypto/CryptoEngine.hxx>
#include <rtl/ustring.hxx>
namespace com { namespace sun { namespace star {
namespace beans { struct NamedValue; }
namespace io { class XInputStream; }
namespace io { class XStream; }
namespace uno { class XComponentContext; }
} } }
namespace oox { class BinaryInputStream; }
namespace oox { namespace ole { class OleStorage; } }
namespace oox {
namespace core {

13
include/oox/crypto/DocumentEncryption.hxx
View File

@ -13,16 +13,15 @@
#include <oox/dllapi.h>
#include <oox/ole/olestorage.hxx>
#include <com/sun/star/io/XStream.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <oox/crypto/CryptTools.hxx>
#include <com/sun/star/uno/Reference.h>
#include <oox/crypto/Standard2007Engine.hxx>
#include <rtl/ustring.hxx>
#include <vector>
namespace com { namespace sun { namespace star {
namespace io { class XStream; }
} } }
namespace oox { namespace ole { class OleStorage; } }
namespace oox {
namespace core {

8
include/oox/crypto/Standard2007Engine.hxx
View File

@ -11,8 +11,14 @@
#ifndef INCLUDED_OOX_CRYPTO_STANDARD2007ENGINE_HXX
#define INCLUDED_OOX_CRYPTO_STANDARD2007ENGINE_HXX
#include <oox/crypto/CryptTools.hxx>
#include <oox/crypto/CryptoEngine.hxx>
#include <rtl/ustring.hxx>
#include <sal/types.h>
namespace oox {
class BinaryXInputStream;
class BinaryXOutputStream;
}
namespace oox {
namespace core {

1
oox/source/core/xmlfilterbase.cxx
View File

@ -44,6 +44,7 @@
#include "oox/helper/containerhelper.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/helper/zipstorage.hxx"
#include <oox/ole/olestorage.hxx>
#include <oox/token/namespaces.hxx>
#include "oox/token/properties.hxx"
#include <oox/token/tokens.hxx>

3
oox/source/crypto/AgileEngine.cxx
View File

@ -10,6 +10,9 @@
#include "oox/crypto/AgileEngine.hxx"
#include <oox/helper/binaryinputstream.hxx>
#include <oox/helper/binaryoutputstream.hxx>
namespace oox {
namespace core {

6
oox/source/crypto/DocumentDecryption.cxx
View File

@ -15,11 +15,17 @@
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/io/XSeekable.hpp>
#include <com/sun/star/io/XStream.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/xml/sax/XFastParser.hpp>
#include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
#include <com/sun/star/xml/sax/FastParser.hpp>
#include <com/sun/star/xml/sax/FastToken.hpp>
#include <oox/crypto/AgileEngine.hxx>
#include <oox/crypto/Standard2007Engine.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include <oox/helper/binaryoutputstream.hxx>
#include <oox/ole/olestorage.hxx>
namespace oox {
namespace core {

9
oox/source/crypto/DocumentEncryption.cxx
View File

@ -10,15 +10,18 @@
#include "oox/crypto/DocumentEncryption.hxx"
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/io/XStream.hpp>
#include <com/sun/star/io/XSeekable.hpp>
#include "oox/helper/binaryinputstream.hxx"
#include "oox/helper/binaryoutputstream.hxx"
#include <oox/helper/binaryinputstream.hxx>
#include <oox/helper/binaryoutputstream.hxx>
#include <oox/ole/olestorage.hxx>
namespace oox {
namespace core {
using namespace css::beans;
using namespace css::io;
using namespace css::lang;
using namespace css::uno;

4
oox/source/crypto/Standard2007Engine.cxx
View File

@ -10,7 +10,11 @@
#include "oox/crypto/Standard2007Engine.hxx"
#include <oox/crypto/CryptTools.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include <oox/helper/binaryoutputstream.hxx>
#include <osl/time.h>
#include <rtl/digest.h>
#include <rtl/random.h>
namespace oox {