Move module-local includes to writerperfect/inc

Change-Id: I8e90a95d6ab8d8a696d4666e2ab4ddd9584b60f0
2015-05-19 10:55:43 +02:00
parent 867ccbc19b
commit fc5dfa8fd3
18 changed files with 26 additions and 20 deletions
--- a/writerperfect/CppunitTest_writerperfect_stream.mk
+++ b/writerperfect/CppunitTest_writerperfect_stream.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,writerperfect_stream))

 $(eval $(call gb_CppunitTest_set_include,writerperfect_stream,\
 	-I$(SRCDIR)/writerperfect/source/common \
+	-I$(SRCDIR)/writerperfect/inc \
 	$$(INCLUDE) \
 ))

--- a/writerperfect/Library_writerperfect.mk
+++ b/writerperfect/Library_writerperfect.mk
@@ -23,6 +23,11 @@ $(eval $(call gb_Library_add_defs,writerperfect,\
 	-DWRITERPERFECT_DLLIMPLEMENTATION \
 ))

+$(eval $(call gb_Library_set_include,writerperfect, \
+    -I$(SRCDIR)/writerperfect/inc \
+    $$(INCLUDE) \
+))
+
 $(eval $(call gb_Library_use_externals,writerperfect,\
 	boost_headers \
 	odfgen \
--- a/include/writerperfect/DirectoryStream.hxx
+++ b/include/writerperfect/DirectoryStream.hxx
@@ -14,7 +14,7 @@

 #include <com/sun/star/uno/Reference.h>

-#include <writerperfect/writerperfectdllapi.h>
+#include <writerperfectdllapi.h>

 namespace com { namespace sun { namespace star { namespace ucb {
    class XContent;
--- a/include/writerperfect/DocumentHandler.hxx
+++ b/include/writerperfect/DocumentHandler.hxx
@@ -24,7 +24,7 @@

 #include <com/sun/star/uno/Reference.h>

-#include <writerperfect/writerperfectdllapi.h>
+#include <writerperfectdllapi.h>

 namespace com { namespace sun { namespace star { namespace xml { namespace sax {
    class XDocumentHandler;
--- a/writerperfect/inc/ImportFilter.hxx
+++ b/writerperfect/inc/ImportFilter.hxx
@@ -33,8 +33,8 @@

 #include <unotools/mediadescriptor.hxx>

-#include <writerperfect/DocumentHandler.hxx>
-#include <writerperfect/WPXSvInputStream.hxx>
+#include <DocumentHandler.hxx>
+#include <WPXSvInputStream.hxx>

 #include <xmloff/attrlist.hxx>

--- a/include/writerperfect/WPFTEncodingDialog.hxx
+++ b/include/writerperfect/WPFTEncodingDialog.hxx
@@ -18,7 +18,7 @@
 #include <vcl/dialog.hxx>
 #include <vcl/lstbox.hxx>

-#include <writerperfect/writerperfectdllapi.h>
+#include <writerperfectdllapi.h>

 namespace writerperfect {

--- a/include/writerperfect/WPXSvInputStream.hxx
+++ b/include/writerperfect/WPXSvInputStream.hxx
@@ -14,7 +14,7 @@

 #include <com/sun/star/uno/Reference.h>

-#include <writerperfect/writerperfectdllapi.h>
+#include <writerperfectdllapi.h>

 namespace com { namespace sun { namespace star { namespace io {
    class XInputStream;
--- a/include/writerperfect/writerperfectdllapi.h
+++ b/include/writerperfect/writerperfectdllapi.h
--- a/writerperfect/qa/unit/DirectoryStreamTest.cxx
+++ b/writerperfect/qa/unit/DirectoryStreamTest.cxx
@@ -17,7 +17,7 @@

 #include <test/bootstrapfixture.hxx>

-#include <writerperfect/DirectoryStream.hxx>
+#include <DirectoryStream.hxx>

 namespace ucb = com::sun::star::ucb;
 namespace uno = com::sun::star::uno;
--- a/writerperfect/qa/unit/WPXSvStreamTest.cxx
+++ b/writerperfect/qa/unit/WPXSvStreamTest.cxx
@@ -26,7 +26,7 @@

 #include "test/bootstrapfixture.hxx"

-#include <writerperfect/WPXSvInputStream.hxx>
+#include <WPXSvInputStream.hxx>

 namespace io = com::sun::star::io;
 namespace ucb = com::sun::star::ucb;
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -14,7 +14,7 @@

 #include <libwps/libwps.h>

-#include "writerperfect/WPFTEncodingDialog.hxx"
+#include "WPFTEncodingDialog.hxx"
 #include "MSWorksCalcImportFilter.hxx"

 using com::sun::star::uno::Sequence;
--- a/writerperfect/source/common/DirectoryStream.cxx
+++ b/writerperfect/source/common/DirectoryStream.cxx
@@ -36,8 +36,8 @@

 #include <ucbhelper/content.hxx>

-#include <writerperfect/DirectoryStream.hxx>
-#include <writerperfect/WPXSvInputStream.hxx>
+#include <DirectoryStream.hxx>
+#include <WPXSvInputStream.hxx>

 namespace container = com::sun::star::container;
 namespace io = com::sun::star::io;
--- a/writerperfect/source/common/DocumentHandler.cxx
+++ b/writerperfect/source/common/DocumentHandler.cxx
@@ -7,7 +7,7 @@
 * For further information visit http://libwpd.sourceforge.net
 */

-#include <writerperfect/DocumentHandler.hxx>
+#include <DocumentHandler.hxx>

 #include <string.h>

--- a/writerperfect/source/common/WPFTEncodingDialog.cxx
+++ b/writerperfect/source/common/WPFTEncodingDialog.cxx
@@ -17,7 +17,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include <writerperfect/WPFTEncodingDialog.hxx>
+#include <WPFTEncodingDialog.hxx>

 namespace writerperfect
 {
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -7,7 +7,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include <writerperfect/WPXSvInputStream.hxx>
+#include <WPXSvInputStream.hxx>

 #include <com/sun/star/packages/zip/XZipFileAccess2.hpp>
 #include <com/sun/star/uno/Any.hxx>
--- a/writerperfect/source/impress/KeynoteImportFilter.cxx
+++ b/writerperfect/source/impress/KeynoteImportFilter.cxx
@@ -25,9 +25,9 @@
 #include <rtl/tencinfo.h>
 #include <ucbhelper/content.hxx>

-#include <writerperfect/DirectoryStream.hxx>
-#include <writerperfect/DocumentHandler.hxx>
-#include <writerperfect/WPXSvInputStream.hxx>
+#include <DirectoryStream.hxx>
+#include <DocumentHandler.hxx>
+#include <WPXSvInputStream.hxx>

 #include <xmloff/attrlist.hxx>

--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -15,7 +15,7 @@

 #include <libwps/libwps.h>

-#include "writerperfect/WPFTEncodingDialog.hxx"
+#include "WPFTEncodingDialog.hxx"
 #include "MSWorksImportFilter.hxx"

 using com::sun::star::uno::Sequence;
--- a/writerperfect/source/writer/WordPerfectImportFilter.cxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx
@@ -21,8 +21,8 @@
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <cppuhelper/supportsservice.hxx>

-#include <writerperfect/DocumentHandler.hxx>
-#include <writerperfect/WPXSvInputStream.hxx>
+#include <DocumentHandler.hxx>
+#include <WPXSvInputStream.hxx>

 #include <xmloff/attrlist.hxx>
 #include <sfx2/passwd.hxx>