Get rid of unnecessary directory levels $D/inc/$D

Change-Id: Ibf313b8948a493043006ebf3a8281487c1f67b48
Reviewed-on: https://gerrit.libreoffice.org/25532
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>

15 files changed, 43 insertions, 43 deletions

diff --git a/xmlsecurity/inc/xmlsecurity/biginteger.hxx b/xmlsecurity/inc/biginteger.hxx
index 7b3cafa06648..73f6259c966b 100644
--- a/xmlsecurity/inc/xmlsecurity/biginteger.hxx
+++ b/xmlsecurity/inc/biginteger.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_BIGINTEGER_HXX
-#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_BIGINTEGER_HXX
+#ifndef INCLUDED_XMLSECURITY_INC_BIGINTEGER_HXX
+#define INCLUDED_XMLSECURITY_INC_BIGINTEGER_HXX
 
 #include <sal/config.h>
 #include <rtl/ustring.hxx>
diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/certificatechooser.hxx
index e24c457bfc81..ec555b6724ee 100644
--- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx
+++ b/xmlsecurity/inc/certificatechooser.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_CERTIFICATECHOOSER_HXX
-#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_CERTIFICATECHOOSER_HXX
+#ifndef INCLUDED_XMLSECURITY_INC_CERTIFICATECHOOSER_HXX
+#define INCLUDED_XMLSECURITY_INC_CERTIFICATECHOOSER_HXX
 
 #include <svtools/simptabl.hxx>
 #include <vcl/dialog.hxx>
@@ -36,7 +36,7 @@ namespace xml { namespace crypto {
 }}}
 
 #include <com/sun/star/uno/Sequence.hxx>
-#include <xmlsecurity/sigstruct.hxx>
+#include <sigstruct.hxx>
 
 class HeaderBar;
 
@@ -79,6 +79,6 @@ public:
     OUString UsageInClearText(int bits);
 };
 
-#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITY_CERTIFICATECHOOSER_HXX
+#endif // INCLUDED_XMLSECURITY_INC_CERTIFICATECHOOSER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/certificateviewer.hxx
index fa9e33f14f2b..c0072c5077ac 100644
--- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx
+++ b/xmlsecurity/inc/certificateviewer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_CERTIFICATEVIEWER_HXX
-#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_CERTIFICATEVIEWER_HXX
+#ifndef INCLUDED_XMLSECURITY_INC_CERTIFICATEVIEWER_HXX
+#define INCLUDED_XMLSECURITY_INC_CERTIFICATEVIEWER_HXX
 
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
@@ -145,6 +145,6 @@ public:
 };
 
 
-#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITY_CERTIFICATEVIEWER_HXX
+#endif // INCLUDED_XMLSECURITY_INC_CERTIFICATEVIEWER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/digitalsignaturesdialog.hxx
index 83370dbb8c6d..4c3a13fe722e 100644
--- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/digitalsignaturesdialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_DIGITALSIGNATURESDIALOG_HXX
-#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_DIGITALSIGNATURESDIALOG_HXX
+#ifndef INCLUDED_XMLSECURITY_INC_DIGITALSIGNATURESDIALOG_HXX
+#define INCLUDED_XMLSECURITY_INC_DIGITALSIGNATURESDIALOG_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
@@ -27,8 +27,8 @@
 #include <svtools/stdctrl.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
-#include <xmlsecurity/documentsignaturehelper.hxx>
-#include <xmlsecurity/xmlsignaturehelper.hxx>
+#include <documentsignaturehelper.hxx>
+#include <xmlsignaturehelper.hxx>
 #include <documentsignaturemanager.hxx>
 
 #include <vector>
@@ -124,6 +124,6 @@ public:
     bool    SignaturesChanged() const { return mbSignaturesChanged; }
 };
 
-#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITY_DIGITALSIGNATURESDIALOG_HXX
+#endif // INCLUDED_XMLSECURITY_INC_DIGITALSIGNATURESDIALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx b/xmlsecurity/inc/documentsignaturehelper.hxx
index 9ccbd3aff792..4767e585629a 100644
--- a/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx
+++ b/xmlsecurity/inc/documentsignaturehelper.hxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_DOCUMENTSIGNATUREHELPER_HXX
-#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_DOCUMENTSIGNATUREHELPER_HXX
+#ifndef INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREHELPER_HXX
+#define INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREHELPER_HXX
 
 #include <com/sun/star/uno/Reference.h>
 #include <rtl/ustring.hxx>
-#include "xmlsecurity/sigstruct.hxx"
+#include "sigstruct.hxx"
 #include "xmlsecuritydllapi.h"
 
 #include <vector>
@@ -97,6 +97,6 @@ public:
 
 };
 
-#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITY_DOCUMENTSIGNATUREHELPER_HXX
+#endif // INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/inc/documentsignaturemanager.hxx b/xmlsecurity/inc/documentsignaturemanager.hxx
index 361de61e3bec..a3881052fb88 100644
--- a/xmlsecurity/inc/documentsignaturemanager.hxx
+++ b/xmlsecurity/inc/documentsignaturemanager.hxx
@@ -21,11 +21,11 @@
 #define INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREMANAGER_HXX
 
 #include "xmlsecuritydllapi.h"
-#include <xmlsecurity/sigstruct.hxx>
-#include <xmlsecurity/xmlsignaturehelper.hxx>
+#include <sigstruct.hxx>
+#include <xmlsignaturehelper.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
-#include <xmlsecurity/documentsignaturehelper.hxx>
+#include <documentsignaturehelper.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
 /// Manages signatures (addition, removal), used by DigitalSignaturesDialog.
@@ -61,6 +61,6 @@ public:
     void write();
 };
 
-#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITY_DOCUMENTSIGNATUREMANAGER_HXX
+#endif // INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/inc/xmlsecurity/global.hrc b/xmlsecurity/inc/global.hrc
index 0b4b0ac7a58a..00dfdd33cc58 100644
--- a/xmlsecurity/inc/xmlsecurity/global.hrc
+++ b/xmlsecurity/inc/global.hrc
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_GLOBAL_HRC
-#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_GLOBAL_HRC
+#ifndef INCLUDED_XMLSECURITY_INC_GLOBAL_HRC
+#define INCLUDED_XMLSECURITY_INC_GLOBAL_HRC
 
 // global resource ids
 
diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/macrosecurity.hxx
index 4c6d5f37c4a5..fb308d5a6b97 100644
--- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
+++ b/xmlsecurity/inc/macrosecurity.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_MACROSECURITY_HXX
-#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_MACROSECURITY_HXX
+#ifndef INCLUDED_XMLSECURITY_INC_MACROSECURITY_HXX
+#define INCLUDED_XMLSECURITY_INC_MACROSECURITY_HXX
 
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
@@ -147,6 +147,6 @@ public:
 };
 
 
-#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITY_MACROSECURITY_HXX
+#endif // INCLUDED_XMLSECURITY_INC_MACROSECURITY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
index 3c566596ea91..dde0b196af29 100644
--- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
+++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
@@ -17,7 +17,7 @@
  ./bin/update_pch xmlsecurity xmlsecurity --cutoff=6 --exclude:system --include:module --include:local
 
  If after updating build fails, use the following command to locate conflicting headers:
- ./bin/update_pch_bisect ./xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx "make xmlsecurity.build" --find-conflicts
+ ./bin/update_pch_bisect ./inc/pch/precompiled_xmlsecurity.hxx "make xmlsecurity.build" --find-conflicts
 */
 
 #include <algorithm>
@@ -304,6 +304,6 @@
 #include <unotools/readwritemutexguard.hxx>
 #include <unotools/syslocale.hxx>
 #include <unotools/unotoolsdllapi.h>
-#include <xmlsecurity/sigstruct.hxx>
+#include <sigstruct.hxx>
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/inc/pch/precompiled_xsec_fw.hxx b/xmlsecurity/inc/pch/precompiled_xsec_fw.hxx
index 8ea24be36a43..fbfaea7b1566 100644
--- a/xmlsecurity/inc/pch/precompiled_xsec_fw.hxx
+++ b/xmlsecurity/inc/pch/precompiled_xsec_fw.hxx
@@ -17,7 +17,7 @@
  ./bin/update_pch xmlsecurity xsec_fw --cutoff=2 --exclude:system --include:module --exclude:local
 
  If after updating build fails, use the following command to locate conflicting headers:
- ./bin/update_pch_bisect ./xmlsecurity/inc/pch/precompiled_xsec_fw.hxx "/opt/lo/bin/make xmlsecurity.build" --find-conflicts
+ ./bin/update_pch_bisect ./inc/pch/precompiled_xsec_fw.hxx "/opt/lo/bin/make xmlsecurity.build" --find-conflicts
 */
 
 #include <cassert>
diff --git a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
index 089c2192c4ff..aee27c5fee2f 100644
--- a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
+++ b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
@@ -17,7 +17,7 @@
  ./bin/update_pch xmlsecurity xsec_xmlsec --cutoff=2 --exclude:system --include:module --include:local
 
  If after updating build fails, use the following command to locate conflicting headers:
- ./bin/update_pch_bisect ./xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx "make xmlsecurity.build" --find-conflicts
+ ./bin/update_pch_bisect ./inc/pch/precompiled_xsec_xmlsec.hxx "make xmlsecurity.build" --find-conflicts
 */
 
 #include <cassert>
@@ -114,7 +114,7 @@
 #include <uno/data.h>
 #include <uno/sequence2.h>
 #include <xmloff/dllapi.h>
-#include <xmlsecurity/biginteger.hxx>
+#include <biginteger.hxx>
 
 // Cleanup windows header macro pollution.
 #if defined(_WIN32) && defined(WINAPI)
diff --git a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx b/xmlsecurity/inc/sigstruct.hxx
index 5a7df3dedd76..8650a8f84ac2 100644
--- a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx
+++ b/xmlsecurity/inc/sigstruct.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_SIGSTRUCT_HXX
-#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_SIGSTRUCT_HXX
+#ifndef INCLUDED_XMLSECURITY_INC_SIGSTRUCT_HXX
+#define INCLUDED_XMLSECURITY_INC_SIGSTRUCT_HXX
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/util/DateTime.hpp>
diff --git a/xmlsecurity/inc/xmlsecurity/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h
index 9d20cedd6b4a..3d5c24b9b6f1 100644
--- a/xmlsecurity/inc/xmlsecurity/xmlsec-wrapper.h
+++ b/xmlsecurity/inc/xmlsec-wrapper.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_XMLSEC_WRAPPER_H
-#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_XMLSEC_WRAPPER_H
+#ifndef INCLUDED_XMLSECURITY_INC_XMLSEC_WRAPPER_H
+#define INCLUDED_XMLSECURITY_INC_XMLSEC_WRAPPER_H
 
 #include <sal/config.h>
 
diff --git a/xmlsecurity/inc/xmlsecuritydllapi.h b/xmlsecurity/inc/xmlsecuritydllapi.h
index f0540c799b48..2349d239b862 100644
--- a/xmlsecurity/inc/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_INC_XMLSECURITYDLLAPI_H
-#define INCLUDED_XMLSECURITY_INC_XMLSECURITYDLLAPI_H
+#ifndef INCLUDED_XMLSECURITY_INCDLLAPI_H
+#define INCLUDED_XMLSECURITY_INCDLLAPI_H
 
 #include <sal/types.h>
 
@@ -18,6 +18,6 @@
 #define XMLSECURITY_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
 #endif
 
-#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITYDLLAPI_H
+#endif // INCLUDED_XMLSECURITY_INCDLLAPI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsignaturehelper.hxx
index 869d66bbab6d..4118b6304b42 100644
--- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsignaturehelper.hxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_XMLSIGNATUREHELPER_HXX
-#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_XMLSIGNATUREHELPER_HXX
+#ifndef INCLUDED_XMLSECURITY_INC_XMLSIGNATUREHELPER_HXX
+#define INCLUDED_XMLSECURITY_INC_XMLSIGNATUREHELPER_HXX
 
 #include <vector>
 
 #include <tools/link.hxx>
 #include <rtl/ustring.hxx>
-#include <xmlsecurity/sigstruct.hxx>
+#include <sigstruct.hxx>
 #include <xmlsecuritydllapi.h>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -193,6 +193,6 @@ public:
     void ExportSignatureContentTypes(const css::uno::Reference<css::embed::XStorage>& xStorage, int nSignatureCount);
 };
 
-#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITY_XMLSIGNATUREHELPER_HXX
+#endif // INCLUDED_XMLSECURITY_INC_XMLSIGNATUREHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */