cleanup includes

Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Conflicts:
Makefile_idl_compile
include.idl
offapi/com/sun/star/util/EventMultiplexer.idl

Change-Id: Id4b3e6e165cc9c40762f5d96dc734ad698690877

6 files changed, 26 insertions, 26 deletions

diff --git a/offapi/com/sun/star/security/DocumentDigitalSignatures.idl b/offapi/com/sun/star/security/DocumentDigitalSignatures.idl
index b406cfd4ab8f..2a1b0579b575 100644
--- a/offapi/com/sun/star/security/DocumentDigitalSignatures.idl
+++ b/offapi/com/sun/star/security/DocumentDigitalSignatures.idl
@@ -25,7 +25,7 @@
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/lang/XInitialization.idl>
-#include <XDocumentDigitalSignatures.idl>
+#include <com/sun/star/security/XDocumentDigitalSignatures.idl>
 
 module com { module sun { module star { module security {
 
diff --git a/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl b/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
index 81be04f308a6..d34ff4b2b9f8 100644
--- a/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
@@ -27,11 +27,11 @@
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/lang/XInitialization.idl>
-#include <XReferenceResolvedListener.idl>
-#include <XBlockerMonitor.idl>
-#include <XDecryptionResultBroadcaster.idl>
-#include <XKeyCollector.idl>
-#include <XMissionTaker.idl>
+#include <com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl>
+#include <com/sun/star/xml/crypto/sax/XBlockerMonitor.idl>
+#include <com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster.idl>
+#include <com/sun/star/xml/crypto/sax/XKeyCollector.idl>
+#include <com/sun/star/xml/crypto/sax/XMissionTaker.idl>
 
 module com { module sun { module star { module xml { module crypto { module sax {
 
diff --git a/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl b/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
index 8bb64d4aef63..bca86d3c1b08 100644
--- a/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
@@ -27,12 +27,12 @@
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/lang/XInitialization.idl>
-#include <XReferenceResolvedListener.idl>
-#include <XReferenceCollector.idl>
-#include <XBlockerMonitor.idl>
-#include <XEncryptionResultBroadcaster.idl>
-#include <XKeyCollector.idl>
-#include <XMissionTaker.idl>
+#include <com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl>
+#include <com/sun/star/xml/crypto/sax/XReferenceCollector.idl>
+#include <com/sun/star/xml/crypto/sax/XBlockerMonitor.idl>
+#include <com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.idl>
+#include <com/sun/star/xml/crypto/sax/XKeyCollector.idl>
+#include <com/sun/star/xml/crypto/sax/XMissionTaker.idl>
 
 module com { module sun { module star { module xml { module crypto { module sax {
 
diff --git a/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
index 1cbacf1190e1..a713a2940b0b 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
@@ -28,9 +28,9 @@
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
 #include <com/sun/star/lang/XInitialization.idl>
-#include <XSecuritySAXEventKeeper.idl>
-#include <XReferenceResolvedBroadcaster.idl>
-#include <XSAXEventKeeperStatusChangeBroadcaster.idl>
+#include <com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl>
+#include <com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.idl>
+#include <com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.idl>
 
 module com { module sun { module star { module xml { module crypto { module sax {
 
diff --git a/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl b/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
index 6a80df340c9f..5a43bae2cbe8 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
@@ -27,12 +27,12 @@
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/xml/crypto/XUriBinding.idl>
-#include <XReferenceResolvedListener.idl>
-#include <XReferenceCollector.idl>
-#include <XSignatureCreationResultBroadcaster.idl>
-#include <XBlockerMonitor.idl>
-#include <XKeyCollector.idl>
-#include <XMissionTaker.idl>
+#include <com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl>
+#include <com/sun/star/xml/crypto/sax/XReferenceCollector.idl>
+#include <com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.idl>
+#include <com/sun/star/xml/crypto/sax/XBlockerMonitor.idl>
+#include <com/sun/star/xml/crypto/sax/XKeyCollector.idl>
+#include <com/sun/star/xml/crypto/sax/XMissionTaker.idl>
 
 module com { module sun { module star { module xml { module crypto { module sax {
 
diff --git a/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl b/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
index 3bbe6e795792..eb67c5c8b426 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
@@ -28,11 +28,11 @@
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/lang/XInitialization.idl>
 #include <com/sun/star/xml/crypto/XUriBinding.idl>
-#include <XReferenceResolvedListener.idl>
-#include <XReferenceCollector.idl>
-#include <XSignatureVerifyResultBroadcaster.idl>
-#include <XKeyCollector.idl>
-#include <XMissionTaker.idl>
+#include <com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl>
+#include <com/sun/star/xml/crypto/sax/XReferenceCollector.idl>
+#include <com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.idl>
+#include <com/sun/star/xml/crypto/sax/XKeyCollector.idl>
+#include <com/sun/star/xml/crypto/sax/XMissionTaker.idl>
 
 module com { module sun { module star { module xml { module crypto { module sax {