include/writerperfect/DirectoryStream.hxx | 57 -- include/writerperfect/DocumentHandler.hxx | 54 -- include/writerperfect/WPFTEncodingDialog.hxx | 56 -- include/writerperfect/WPXSvInputStream.hxx | 55 -- include/writerperfect/writerperfectdllapi.h | 23 - writerperfect/CppunitTest_writerperfect_stream.mk | 1 writerperfect/Library_writerperfect.mk | 5 writerperfect/inc/DirectoryStream.hxx | 57 ++ writerperfect/inc/DocumentHandler.hxx | 54 ++ writerperfect/inc/DocumentHandlerFor.hxx | 28 + writerperfect/inc/ImportFilter.hxx | 207 ++++++++++ writerperfect/inc/WPFTEncodingDialog.hxx | 56 ++ writerperfect/inc/WPXSvInputStream.hxx | 55 ++ writerperfect/inc/writerperfect/DocumentHandlerFor.hxx | 28 - writerperfect/inc/writerperfect/ImportFilter.hxx | 207 ---------- writerperfect/inc/writerperfectdllapi.h | 23 + writerperfect/qa/unit/DirectoryStreamTest.cxx | 2 writerperfect/qa/unit/WPXSvStreamTest.cxx | 2 writerperfect/source/calc/DocumentHandlerForOds.hxx | 2 writerperfect/source/calc/MSWorksCalcImportFilter.cxx | 2 writerperfect/source/calc/MSWorksCalcImportFilter.hxx | 2 writerperfect/source/calc/MWAWCalcImportFilter.hxx | 2 writerperfect/source/common/DirectoryStream.cxx | 4 writerperfect/source/common/DocumentHandler.cxx | 2 writerperfect/source/common/WPFTEncodingDialog.cxx | 2 writerperfect/source/common/WPXSvInputStream.cxx | 2 writerperfect/source/draw/CDRImportFilter.hxx | 2 writerperfect/source/draw/CMXImportFilter.hxx | 2 writerperfect/source/draw/DocumentHandlerForOdg.hxx | 2 writerperfect/source/draw/FreehandImportFilter.hxx | 2 writerperfect/source/draw/MSPUBImportFilter.hxx | 2 writerperfect/source/draw/MWAWDrawImportFilter.hxx | 2 writerperfect/source/draw/PageMakerImportFilter.hxx | 2 writerperfect/source/draw/VisioImportFilter.hxx | 2 writerperfect/source/draw/WPGImportFilter.hxx | 2 writerperfect/source/impress/DocumentHandlerForOdp.hxx | 4 writerperfect/source/impress/KeynoteImportFilter.cxx | 6 writerperfect/source/impress/KeynoteImportFilter.hxx | 2 writerperfect/source/impress/MWAWPresentationImportFilter.hxx | 2 writerperfect/source/writer/AbiWordImportFilter.hxx | 2 writerperfect/source/writer/DocumentHandlerForOdt.hxx | 2 writerperfect/source/writer/EBookImportFilter.hxx | 2 writerperfect/source/writer/MSWorksImportFilter.cxx | 2 writerperfect/source/writer/MSWorksImportFilter.hxx | 2 writerperfect/source/writer/MWAWImportFilter.hxx | 2 writerperfect/source/writer/WordPerfectImportFilter.cxx | 4 46 files changed, 521 insertions(+), 515 deletions(-)
New commits: commit fc5dfa8fd34f93a74f590167cb755ef7831bc0d8 Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue May 19 10:55:43 2015 +0200 Move module-local includes to writerperfect/inc Change-Id: I8e90a95d6ab8d8a696d4666e2ab4ddd9584b60f0 diff --git a/writerperfect/CppunitTest_writerperfect_stream.mk b/writerperfect/CppunitTest_writerperfect_stream.mk index 2d32844..5bb0c4b 100644 --- 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) \ )) diff --git a/writerperfect/Library_writerperfect.mk b/writerperfect/Library_writerperfect.mk index 1343be6..165a7a0 100644 --- 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 \ diff --git a/include/writerperfect/DirectoryStream.hxx b/writerperfect/inc/DirectoryStream.hxx similarity index 97% rename from include/writerperfect/DirectoryStream.hxx rename to writerperfect/inc/DirectoryStream.hxx index 2a7bffd..bfa7d57 100644 --- a/include/writerperfect/DirectoryStream.hxx +++ b/writerperfect/inc/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; diff --git a/include/writerperfect/DocumentHandler.hxx b/writerperfect/inc/DocumentHandler.hxx similarity index 97% rename from include/writerperfect/DocumentHandler.hxx rename to writerperfect/inc/DocumentHandler.hxx index 2670096..608974b 100644 --- a/include/writerperfect/DocumentHandler.hxx +++ b/writerperfect/inc/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; diff --git a/writerperfect/inc/ImportFilter.hxx b/writerperfect/inc/ImportFilter.hxx index d3d1e04..595936d 100644 --- 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> diff --git a/include/writerperfect/WPFTEncodingDialog.hxx b/writerperfect/inc/WPFTEncodingDialog.hxx similarity index 96% rename from include/writerperfect/WPFTEncodingDialog.hxx rename to writerperfect/inc/WPFTEncodingDialog.hxx index ff35db1..e76fb88 100644 --- a/include/writerperfect/WPFTEncodingDialog.hxx +++ b/writerperfect/inc/WPFTEncodingDialog.hxx @@ -18,7 +18,7 @@ #include <vcl/dialog.hxx> #include <vcl/lstbox.hxx> -#include <writerperfect/writerperfectdllapi.h> +#include <writerperfectdllapi.h> namespace writerperfect { diff --git a/include/writerperfect/WPXSvInputStream.hxx b/writerperfect/inc/WPXSvInputStream.hxx similarity index 97% rename from include/writerperfect/WPXSvInputStream.hxx rename to writerperfect/inc/WPXSvInputStream.hxx index 03b5a7d..cd87f1b 100644 --- a/include/writerperfect/WPXSvInputStream.hxx +++ b/writerperfect/inc/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; diff --git a/include/writerperfect/writerperfectdllapi.h b/writerperfect/inc/writerperfectdllapi.h similarity index 100% rename from include/writerperfect/writerperfectdllapi.h rename to writerperfect/inc/writerperfectdllapi.h diff --git a/writerperfect/qa/unit/DirectoryStreamTest.cxx b/writerperfect/qa/unit/DirectoryStreamTest.cxx index 0a279cb..209fe15 100644 --- 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; diff --git a/writerperfect/qa/unit/WPXSvStreamTest.cxx b/writerperfect/qa/unit/WPXSvStreamTest.cxx index a2f6c14..cf2609e 100644 --- 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; diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx index f1363a5..2431e79 100644 --- 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; diff --git a/writerperfect/source/common/DirectoryStream.cxx b/writerperfect/source/common/DirectoryStream.cxx index b0ff9c4..1f46389 100644 --- 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; diff --git a/writerperfect/source/common/DocumentHandler.cxx b/writerperfect/source/common/DocumentHandler.cxx index 1d93bf5..3ea4d05 100644 --- 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> diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx b/writerperfect/source/common/WPFTEncodingDialog.cxx index 1e35993..de521c6 100644 --- 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 { diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx index 535c3e9..e0fff43 100644 --- 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> diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx b/writerperfect/source/impress/KeynoteImportFilter.cxx index 6a832c3..f4e2cba 100644 --- 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> diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx index ddfd785..96496fe 100644 --- 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; diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx index 8d484dd..389e5b5 100644 --- 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> commit 867ccbc19b419e688c81485257371e2681a7775a Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue May 19 10:48:43 2015 +0200 Remove redundant writerperfect/inc/writerperfect hierarchy segment Change-Id: Ib2c84536d829b3d4cf2f0112a9735cc132ee7d24 diff --git a/writerperfect/inc/writerperfect/DocumentHandlerFor.hxx b/writerperfect/inc/DocumentHandlerFor.hxx similarity index 100% rename from writerperfect/inc/writerperfect/DocumentHandlerFor.hxx rename to writerperfect/inc/DocumentHandlerFor.hxx diff --git a/writerperfect/inc/writerperfect/ImportFilter.hxx b/writerperfect/inc/ImportFilter.hxx similarity index 99% rename from writerperfect/inc/writerperfect/ImportFilter.hxx rename to writerperfect/inc/ImportFilter.hxx index 214f02e..d3d1e04 100644 --- a/writerperfect/inc/writerperfect/ImportFilter.hxx +++ b/writerperfect/inc/ImportFilter.hxx @@ -38,7 +38,7 @@ #include <xmloff/attrlist.hxx> -#include "writerperfect/DocumentHandlerFor.hxx" +#include "DocumentHandlerFor.hxx" namespace writerperfect { diff --git a/writerperfect/source/calc/DocumentHandlerForOds.hxx b/writerperfect/source/calc/DocumentHandlerForOds.hxx index 9eb0484..e10d452 100644 --- a/writerperfect/source/calc/DocumentHandlerForOds.hxx +++ b/writerperfect/source/calc/DocumentHandlerForOds.hxx @@ -10,7 +10,7 @@ #include <libodfgen/libodfgen.hxx> -#include "writerperfect/DocumentHandlerFor.hxx" +#include "DocumentHandlerFor.hxx" namespace writerperfect { diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.hxx b/writerperfect/source/calc/MSWorksCalcImportFilter.hxx index 6825463..6814a19 100644 --- a/writerperfect/source/calc/MSWorksCalcImportFilter.hxx +++ b/writerperfect/source/calc/MSWorksCalcImportFilter.hxx @@ -13,7 +13,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include "writerperfect/ImportFilter.hxx" +#include "ImportFilter.hxx" #include "DocumentHandlerForOds.hxx" diff --git a/writerperfect/source/calc/MWAWCalcImportFilter.hxx b/writerperfect/source/calc/MWAWCalcImportFilter.hxx index f33b8a3..0dc91ac 100644 --- a/writerperfect/source/calc/MWAWCalcImportFilter.hxx +++ b/writerperfect/source/calc/MWAWCalcImportFilter.hxx @@ -13,7 +13,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include "writerperfect/ImportFilter.hxx" +#include "ImportFilter.hxx" #include "DocumentHandlerForOds.hxx" diff --git a/writerperfect/source/draw/CDRImportFilter.hxx b/writerperfect/source/draw/CDRImportFilter.hxx index 7754ac8..1316aec 100644 --- a/writerperfect/source/draw/CDRImportFilter.hxx +++ b/writerperfect/source/draw/CDRImportFilter.hxx @@ -11,7 +11,7 @@ #ifndef _CDRIMPORTFILTER_HXX #define _CDRIMPORTFILTER_HXX -#include "writerperfect/ImportFilter.hxx" +#include "ImportFilter.hxx" #include "DocumentHandlerForOdg.hxx" diff --git a/writerperfect/source/draw/CMXImportFilter.hxx b/writerperfect/source/draw/CMXImportFilter.hxx index ac40cd8..03ffaff 100644 --- a/writerperfect/source/draw/CMXImportFilter.hxx +++ b/writerperfect/source/draw/CMXImportFilter.hxx @@ -11,7 +11,7 @@ #ifndef _CMXIMPORTFILTER_HXX #define _CMXIMPORTFILTER_HXX -#include "writerperfect/ImportFilter.hxx" +#include "ImportFilter.hxx" #include "DocumentHandlerForOdg.hxx" diff --git a/writerperfect/source/draw/DocumentHandlerForOdg.hxx b/writerperfect/source/draw/DocumentHandlerForOdg.hxx index c70c060..23cc66f 100644 --- a/writerperfect/source/draw/DocumentHandlerForOdg.hxx +++ b/writerperfect/source/draw/DocumentHandlerForOdg.hxx @@ -10,7 +10,7 @@ #include <libodfgen/libodfgen.hxx> -#include "writerperfect/DocumentHandlerFor.hxx" +#include "DocumentHandlerFor.hxx" namespace writerperfect { diff --git a/writerperfect/source/draw/FreehandImportFilter.hxx b/writerperfect/source/draw/FreehandImportFilter.hxx index 699f8c1..485c389 100644 --- a/writerperfect/source/draw/FreehandImportFilter.hxx +++ b/writerperfect/source/draw/FreehandImportFilter.hxx @@ -8,7 +8,7 @@ #ifndef _FREEHANDIMPORTFILTER_HXX #define _FREEHANDIMPORTFILTER_HXX -#include "writerperfect/ImportFilter.hxx" +#include "ImportFilter.hxx" #include "DocumentHandlerForOdg.hxx" diff --git a/writerperfect/source/draw/MSPUBImportFilter.hxx b/writerperfect/source/draw/MSPUBImportFilter.hxx index d8ed490..6e49353 100644 --- a/writerperfect/source/draw/MSPUBImportFilter.hxx +++ b/writerperfect/source/draw/MSPUBImportFilter.hxx @@ -8,7 +8,7 @@ #ifndef _MSPUBIMPORTFILTER_HXX #define _MSPUBIMPORTFILTER_HXX -#include "writerperfect/ImportFilter.hxx" +#include "ImportFilter.hxx" #include "DocumentHandlerForOdg.hxx" diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.hxx b/writerperfect/source/draw/MWAWDrawImportFilter.hxx index 29ce1e0..01bb2d2 100644 --- a/writerperfect/source/draw/MWAWDrawImportFilter.hxx +++ b/writerperfect/source/draw/MWAWDrawImportFilter.hxx @@ -13,7 +13,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include "writerperfect/ImportFilter.hxx" +#include "ImportFilter.hxx" #include "DocumentHandlerForOdg.hxx" diff --git a/writerperfect/source/draw/PageMakerImportFilter.hxx b/writerperfect/source/draw/PageMakerImportFilter.hxx index 6c63d63..1812877 100644 --- a/writerperfect/source/draw/PageMakerImportFilter.hxx +++ b/writerperfect/source/draw/PageMakerImportFilter.hxx @@ -8,7 +8,7 @@ #ifndef _PAGEMAKERIMPORTFILTER_HXX #define _PAGEMAKERIMPORTFILTER_HXX -#include "writerperfect/ImportFilter.hxx" +#include "ImportFilter.hxx" #include "DocumentHandlerForOdg.hxx" diff --git a/writerperfect/source/draw/VisioImportFilter.hxx b/writerperfect/source/draw/VisioImportFilter.hxx index 9b94620..b82e526 100644 --- a/writerperfect/source/draw/VisioImportFilter.hxx +++ b/writerperfect/source/draw/VisioImportFilter.hxx @@ -8,7 +8,7 @@ #ifndef _VISIOIMPORTFILTER_HXX #define _VISIOIMPORTFILTER_HXX -#include "writerperfect/ImportFilter.hxx" +#include "ImportFilter.hxx" #include "DocumentHandlerForOdg.hxx" diff --git a/writerperfect/source/draw/WPGImportFilter.hxx b/writerperfect/source/draw/WPGImportFilter.hxx index 1a0dd99..b7ac071 100644 --- a/writerperfect/source/draw/WPGImportFilter.hxx +++ b/writerperfect/source/draw/WPGImportFilter.hxx @@ -13,7 +13,7 @@ #ifndef _WPGIMPORTFILTER_HXX #define _WPGIMPORTFILTER_HXX -#include "writerperfect/ImportFilter.hxx" +#include "ImportFilter.hxx" #include "DocumentHandlerForOdg.hxx" diff --git a/writerperfect/source/impress/DocumentHandlerForOdp.hxx b/writerperfect/source/impress/DocumentHandlerForOdp.hxx index a8dfca5..fe8ae8d 100644 --- a/writerperfect/source/impress/DocumentHandlerForOdp.hxx +++ b/writerperfect/source/impress/DocumentHandlerForOdp.hxx @@ -10,7 +10,7 @@ #include <libodfgen/libodfgen.hxx> -#include "writerperfect/DocumentHandlerFor.hxx" +#include "DocumentHandlerFor.hxx" namespace writerperfect { @@ -28,4 +28,4 @@ struct DocumentHandlerFor<OdpGenerator> #endif -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/impress/KeynoteImportFilter.hxx b/writerperfect/source/impress/KeynoteImportFilter.hxx index 9db0cf7..d176643 100644 --- a/writerperfect/source/impress/KeynoteImportFilter.hxx +++ b/writerperfect/source/impress/KeynoteImportFilter.hxx @@ -11,7 +11,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include "writerperfect/ImportFilter.hxx" +#include "ImportFilter.hxx" #include "DocumentHandlerForOdp.hxx" #include <stdio.h> diff --git a/writerperfect/source/impress/MWAWPresentationImportFilter.hxx b/writerperfect/source/impress/MWAWPresentationImportFilter.hxx index 4f2743e..f8ff94a 100644 --- a/writerperfect/source/impress/MWAWPresentationImportFilter.hxx +++ b/writerperfect/source/impress/MWAWPresentationImportFilter.hxx @@ -13,7 +13,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include "writerperfect/ImportFilter.hxx" +#include "ImportFilter.hxx" #include "DocumentHandlerForOdp.hxx" diff --git a/writerperfect/source/writer/AbiWordImportFilter.hxx b/writerperfect/source/writer/AbiWordImportFilter.hxx index 2cee47b..4268d32 100644 --- a/writerperfect/source/writer/AbiWordImportFilter.hxx +++ b/writerperfect/source/writer/AbiWordImportFilter.hxx @@ -13,7 +13,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include "writerperfect/ImportFilter.hxx" +#include "ImportFilter.hxx" #include "DocumentHandlerForOdt.hxx" diff --git a/writerperfect/source/writer/DocumentHandlerForOdt.hxx b/writerperfect/source/writer/DocumentHandlerForOdt.hxx index baf1462..791a8e8 100644 --- a/writerperfect/source/writer/DocumentHandlerForOdt.hxx +++ b/writerperfect/source/writer/DocumentHandlerForOdt.hxx @@ -10,7 +10,7 @@ #include <libodfgen/libodfgen.hxx> -#include "writerperfect/DocumentHandlerFor.hxx" +#include "DocumentHandlerFor.hxx" namespace writerperfect { diff --git a/writerperfect/source/writer/EBookImportFilter.hxx b/writerperfect/source/writer/EBookImportFilter.hxx index 59184aa..9f1560f 100644 --- a/writerperfect/source/writer/EBookImportFilter.hxx +++ b/writerperfect/source/writer/EBookImportFilter.hxx @@ -13,7 +13,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include "writerperfect/ImportFilter.hxx" +#include "ImportFilter.hxx" #include "DocumentHandlerForOdt.hxx" diff --git a/writerperfect/source/writer/MSWorksImportFilter.hxx b/writerperfect/source/writer/MSWorksImportFilter.hxx index 40802b5..32f4d74 100644 --- a/writerperfect/source/writer/MSWorksImportFilter.hxx +++ b/writerperfect/source/writer/MSWorksImportFilter.hxx @@ -13,7 +13,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include "writerperfect/ImportFilter.hxx" +#include "ImportFilter.hxx" #include "DocumentHandlerForOdt.hxx" diff --git a/writerperfect/source/writer/MWAWImportFilter.hxx b/writerperfect/source/writer/MWAWImportFilter.hxx index f4e6f6f..fdece1e 100644 --- a/writerperfect/source/writer/MWAWImportFilter.hxx +++ b/writerperfect/source/writer/MWAWImportFilter.hxx @@ -13,7 +13,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include "writerperfect/ImportFilter.hxx" +#include "ImportFilter.hxx" #include "DocumentHandlerForOdt.hxx" _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits