[Libreoffice-commits] core.git: include/xmlsecurity xmlsecurity/inc xmlsecurity/qa xmlsecurity/source xmlsecurity/workben

Miklos Vajna vmiklos at collabora.co.uk
Wed Sep 6 07:06:44 UTC 2017 

 xmlsecurity/inc/documentsignaturehelper.hxx      |    2 +-
 xmlsecurity/inc/documentsignaturemanager.hxx     |    2 +-
 xmlsecurity/inc/pdfio/pdfdocument.hxx            |    8 ++++----
 xmlsecurity/inc/pdfsignaturehelper.hxx           |    2 +-
 xmlsecurity/inc/xmlsecuritydllapi.h              |    6 +++---
 xmlsecurity/inc/xmlsignaturehelper.hxx           |    2 +-
 xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx    |    2 +-
 xmlsecurity/source/helper/pdfsignaturehelper.cxx |    2 +-
 xmlsecurity/source/pdfio/pdfdocument.cxx         |    2 +-
 xmlsecurity/workben/pdfverify.cxx                |    2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit c210019f36ec4a640fe1967b562454a21c371d63
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Sep 5 22:57:54 2017 +0200

    xmlsecurity: no need to have pdfio/pdfdocument.hxx as a global header
    
    Which means xmlsecurity can be again a module that has no public
    headers.
    
    Change-Id: I3d0b03680398f80196fac187263e770fd44ed0ed
    Reviewed-on: https://gerrit.libreoffice.org/41966
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/xmlsecurity/inc/documentsignaturehelper.hxx b/xmlsecurity/inc/documentsignaturehelper.hxx
index 3997ae47260d..1c5d1b97a972 100644
--- a/xmlsecurity/inc/documentsignaturehelper.hxx
+++ b/xmlsecurity/inc/documentsignaturehelper.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <rtl/ustring.hxx>
 #include <svl/sigstruct.hxx>
-#include "xmlsecurity/xmlsecuritydllapi.h"
+#include "xmlsecuritydllapi.h"
 
 #include <vector>
 
diff --git a/xmlsecurity/inc/documentsignaturemanager.hxx b/xmlsecurity/inc/documentsignaturemanager.hxx
index 146943812eb0..71fd72bfeec5 100644
--- a/xmlsecurity/inc/documentsignaturemanager.hxx
+++ b/xmlsecurity/inc/documentsignaturemanager.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREMANAGER_HXX
 #define INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREMANAGER_HXX
 
-#include "xmlsecurity/xmlsecuritydllapi.h"
+#include "xmlsecuritydllapi.h"
 
 #include <memory>
 
diff --git a/include/xmlsecurity/pdfio/pdfdocument.hxx b/xmlsecurity/inc/pdfio/pdfdocument.hxx
similarity index 82%
rename from include/xmlsecurity/pdfio/pdfdocument.hxx
rename to xmlsecurity/inc/pdfio/pdfdocument.hxx
index 6f3b0f263add..622bc1ffb678 100644
--- a/include/xmlsecurity/pdfio/pdfdocument.hxx
+++ b/xmlsecurity/inc/pdfio/pdfdocument.hxx
@@ -8,14 +8,14 @@
  *
  */
 
-#ifndef INCLUDED_XMLSECURITY_PDFIO_PDFDOCUMENT_HXX
-#define INCLUDED_XMLSECURITY_PDFIO_PDFDOCUMENT_HXX
+#ifndef INCLUDED_XMLSECURITY_INC_PDFIO_PDFDOCUMENT_HXX
+#define INCLUDED_XMLSECURITY_INC_PDFIO_PDFDOCUMENT_HXX
 
 #include <vcl/filter/pdfdocument.hxx>
 
 #include <tools/stream.hxx>
 
-#include <xmlsecurity/xmlsecuritydllapi.h>
+#include <xmlsecuritydllapi.h>
 
 struct SignatureInformation;
 
@@ -34,6 +34,6 @@ XMLSECURITY_DLLPUBLIC bool ValidateSignature(SvStream& rStream, vcl::filter::PDF
 } // namespace pdfio
 } // namespace xmlsecurity
 
-#endif // INCLUDED_XMLSECURITY_PDFIO_PDFDOCUMENT_HXX
+#endif // INCLUDED_XMLSECURITY_INC_PDFIO_PDFDOCUMENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/inc/pdfsignaturehelper.hxx b/xmlsecurity/inc/pdfsignaturehelper.hxx
index 7da417c46e4f..50fb5dd71c05 100644
--- a/xmlsecurity/inc/pdfsignaturehelper.hxx
+++ b/xmlsecurity/inc/pdfsignaturehelper.hxx
@@ -11,7 +11,7 @@
 #ifndef INCLUDED_XMLSECURITY_INC_PDFSIGNATUREHELPER_HXX
 #define INCLUDED_XMLSECURITY_INC_PDFSIGNATUREHELPER_HXX
 
-#include <xmlsecurity/xmlsecuritydllapi.h>
+#include <xmlsecuritydllapi.h>
 
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/security/DocumentSignatureInformation.hpp>
diff --git a/include/xmlsecurity/xmlsecuritydllapi.h b/xmlsecurity/inc/xmlsecuritydllapi.h
similarity index 78%
rename from include/xmlsecurity/xmlsecuritydllapi.h
rename to xmlsecurity/inc/xmlsecuritydllapi.h
index 48da5464b727..f0540c799b48 100644
--- a/include/xmlsecurity/xmlsecuritydllapi.h
+++ b/xmlsecurity/inc/xmlsecuritydllapi.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_XMLSECURITY_XMLSECURITYDLLAPI_H
-#define INCLUDED_XMLSECURITY_XMLSECURITYDLLAPI_H
+#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITYDLLAPI_H
+#define INCLUDED_XMLSECURITY_INC_XMLSECURITYDLLAPI_H
 
 #include <sal/types.h>
 
@@ -18,6 +18,6 @@
 #define XMLSECURITY_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
 #endif
 
-#endif // INCLUDED_XMLSECURITY_XMLSECURITYDLLAPI_H
+#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITYDLLAPI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/inc/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsignaturehelper.hxx
index 93385202e171..60d6d164db61 100644
--- a/xmlsecurity/inc/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsignaturehelper.hxx
@@ -27,7 +27,7 @@
 #include <rtl/ref.hxx>
 #include <svl/sigstruct.hxx>
 #include <xsecctl.hxx>
-#include <xmlsecurity/xmlsecuritydllapi.h>
+#include <xmlsecuritydllapi.h>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/xml/sax/XWriter.hpp>
diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
index 37faa04aada7..39746ac2a233 100644
--- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
+++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
@@ -17,7 +17,7 @@
 #include <unotools/ucbstreamhelper.hxx>
 
 #include <documentsignaturemanager.hxx>
-#include <xmlsecurity/pdfio/pdfdocument.hxx>
+#include <pdfio/pdfdocument.hxx>
 
 using namespace com::sun::star;
 
diff --git a/xmlsecurity/source/helper/pdfsignaturehelper.cxx b/xmlsecurity/source/helper/pdfsignaturehelper.cxx
index 9bb6e59d0380..19efd7ae8195 100644
--- a/xmlsecurity/source/helper/pdfsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/pdfsignaturehelper.cxx
@@ -20,7 +20,7 @@
 #include <tools/stream.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 
-#include <xmlsecurity/pdfio/pdfdocument.hxx>
+#include <pdfio/pdfdocument.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx b/xmlsecurity/source/pdfio/pdfdocument.cxx
index d0d56f4bd409..08437b2f8cae 100644
--- a/xmlsecurity/source/pdfio/pdfdocument.cxx
+++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <xmlsecurity/pdfio/pdfdocument.hxx>
+#include <pdfio/pdfdocument.hxx>
 
 #include <map>
 #include <memory>
diff --git a/xmlsecurity/workben/pdfverify.cxx b/xmlsecurity/workben/pdfverify.cxx
index 673eb0171050..4f872a3dad1b 100644
--- a/xmlsecurity/workben/pdfverify.cxx
+++ b/xmlsecurity/workben/pdfverify.cxx
@@ -21,7 +21,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/graphicfilter.hxx>
 
-#include <xmlsecurity/pdfio/pdfdocument.hxx>
+#include <pdfio/pdfdocument.hxx>
 
 #include <svl/sigstruct.hxx>

More information about the Libreoffice-commits mailing list