diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-13 20:45:30 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-13 20:45:30 +0100 |
commit | 2ffeaecdf0bbef478408fb6753ec6cf9ea043b16 (patch) | |
tree | 02804ccb518945db7481b0127eea69287c023de8 /writerfilter | |
parent | writerfilter: only dmapper needs DomainMapper.hxx (diff) | |
download | core-2ffeaecdf0bbef478408fb6753ec6cf9ea043b16.tar.gz core-2ffeaecdf0bbef478408fb6753ec6cf9ea043b16.zip |
writerfilter: only dmapper needs LoggedResources
Change-Id: Ic8c691c4185ec8b808e75885f9354c35d68be58c
Diffstat (limited to 'writerfilter')
26 files changed, 30 insertions, 30 deletions
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 2c6d01ecbef1..35167775bf59 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -88,6 +88,7 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\ writerfilter/source/dmapper/GraphicHelpers \ writerfilter/source/dmapper/GraphicImport \ writerfilter/source/dmapper/LatentStyleHandler \ + writerfilter/source/dmapper/LoggedResources \ writerfilter/source/dmapper/MeasureHandler \ writerfilter/source/dmapper/TrackChangesHandler \ writerfilter/source/dmapper/ModelEventListener \ @@ -124,7 +125,6 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\ writerfilter/source/ooxml/OOXMLPropertySetImpl \ writerfilter/source/ooxml/OOXMLStreamImpl \ writerfilter/source/ooxml/qnametostrcore \ - writerfilter/source/resourcemodel/LoggedResources \ writerfilter/source/resourcemodel/ResourceModelHelper \ writerfilter/source/resourcemodel/TagLogger \ )) diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx index 4f2ce9cdad52..1318901f869c 100644 --- a/writerfilter/source/dmapper/BorderHandler.hxx +++ b/writerfilter/source/dmapper/BorderHandler.hxx @@ -20,7 +20,7 @@ #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_BORDERHANDLER_HXX #include <vector> -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" #include <boost/shared_ptr.hpp> #include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx b/writerfilter/source/dmapper/CellColorHandler.hxx index 041272d2b2a6..a46542870ab5 100644 --- a/writerfilter/source/dmapper/CellColorHandler.hxx +++ b/writerfilter/source/dmapper/CellColorHandler.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_CELLCOLORHANDLER_HXX #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_CELLCOLORHANDLER_HXX -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" #include <boost/shared_ptr.hpp> #include <vector> diff --git a/writerfilter/source/dmapper/CellMarginHandler.hxx b/writerfilter/source/dmapper/CellMarginHandler.hxx index 6a59b8459530..fab55d154ace 100644 --- a/writerfilter/source/dmapper/CellMarginHandler.hxx +++ b/writerfilter/source/dmapper/CellMarginHandler.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_CELLMARGINHANDLER_HXX #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_CELLMARGINHANDLER_HXX -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" #include <boost/shared_ptr.hpp> #include <vector> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx index 1f200383d264..b1b0ba7a570b 100644 --- a/writerfilter/source/dmapper/DomainMapper.hxx +++ b/writerfilter/source/dmapper/DomainMapper.hxx @@ -20,7 +20,7 @@ #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_DOMAINMAPPER_HXX #include <dmapper/DomainMapperFactory.hxx> -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/style/TabAlign.hpp> diff --git a/writerfilter/source/dmapper/FFDataHandler.hxx b/writerfilter/source/dmapper/FFDataHandler.hxx index d01cab59ff52..cea658743b08 100644 --- a/writerfilter/source/dmapper/FFDataHandler.hxx +++ b/writerfilter/source/dmapper/FFDataHandler.hxx @@ -18,7 +18,7 @@ */ #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_FFDATAHANDLER_HXX #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_FFDATAHANDLER_HXX -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" #include <rtl/ustring.hxx> #include <vector> namespace writerfilter { diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx index 8a05dce18128..9b691abe64e1 100644 --- a/writerfilter/source/dmapper/FontTable.hxx +++ b/writerfilter/source/dmapper/FontTable.hxx @@ -21,7 +21,7 @@ #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_FONTTABLE_HXX #include <boost/shared_ptr.hpp> -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/io/XInputStream.hpp> diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx b/writerfilter/source/dmapper/GraphicHelpers.hxx index f77efc0d4ceb..545dd9550dac 100644 --- a/writerfilter/source/dmapper/GraphicHelpers.hxx +++ b/writerfilter/source/dmapper/GraphicHelpers.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_GRAPHICHELPERS_HXX #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_GRAPHICHELPERS_HXX -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" #include <boost/shared_ptr.hpp> diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx index 75dad4fd7bfa..3552d261abc9 100644 --- a/writerfilter/source/dmapper/GraphicImport.hxx +++ b/writerfilter/source/dmapper/GraphicImport.hxx @@ -22,7 +22,7 @@ #include <queue> #include <boost/scoped_ptr.hpp> -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" namespace com { namespace sun { namespace star { namespace uno diff --git a/writerfilter/source/dmapper/LatentStyleHandler.hxx b/writerfilter/source/dmapper/LatentStyleHandler.hxx index b7c412849842..07f3017200f9 100644 --- a/writerfilter/source/dmapper/LatentStyleHandler.hxx +++ b/writerfilter/source/dmapper/LatentStyleHandler.hxx @@ -9,7 +9,7 @@ #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_LATENTSTYLEHANDLER_HXX #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_LATENTSTYLEHANDLER_HXX -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" #include <boost/shared_ptr.hpp> #include <vector> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/writerfilter/source/resourcemodel/LoggedResources.cxx b/writerfilter/source/dmapper/LoggedResources.cxx index 6aa834b2b801..4d8051e1ceb0 100644 --- a/writerfilter/source/resourcemodel/LoggedResources.cxx +++ b/writerfilter/source/dmapper/LoggedResources.cxx @@ -18,7 +18,7 @@ */ #include <rtl/ustrbuf.hxx> -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" #include <ooxml/QNameToString.hxx> using namespace ::com::sun::star; diff --git a/writerfilter/inc/resourcemodel/LoggedResources.hxx b/writerfilter/source/dmapper/LoggedResources.hxx index ccb33635316a..514751188749 100644 --- a/writerfilter/inc/resourcemodel/LoggedResources.hxx +++ b/writerfilter/source/dmapper/LoggedResources.hxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_LOGGEDRESOURCES_HXX -#define INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_LOGGEDRESOURCES_HXX +#ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_LOGGEDRESOURCES_HXX +#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_LOGGEDRESOURCES_HXX -#include "WW8ResourceModel.hxx" -#include "TagLogger.hxx" +#include <resourcemodel/WW8ResourceModel.hxx> +#include <resourcemodel/TagLogger.hxx> namespace writerfilter @@ -126,6 +126,6 @@ protected: }; } -#endif // INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_LOGGEDRESOURCES_HXX +#endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_LOGGEDRESOURCES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/MeasureHandler.hxx b/writerfilter/source/dmapper/MeasureHandler.hxx index 8a52e7007ccd..47b7e5f09fe1 100644 --- a/writerfilter/source/dmapper/MeasureHandler.hxx +++ b/writerfilter/source/dmapper/MeasureHandler.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_MEASUREHANDLER_HXX #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_MEASUREHANDLER_HXX -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" #include <boost/shared_ptr.hpp> #include <vector> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx index 1c25da66d4cd..d06910624502 100644 --- a/writerfilter/source/dmapper/NumberingManager.hxx +++ b/writerfilter/source/dmapper/NumberingManager.hxx @@ -23,7 +23,7 @@ #include "PropertyMap.hxx" #include <DomainMapper.hxx> -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" #include <editeng/numitem.hxx> diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx index 551b8df4784d..02442c61b79a 100644 --- a/writerfilter/source/dmapper/OLEHandler.hxx +++ b/writerfilter/source/dmapper/OLEHandler.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_OLEHANDLER_HXX #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_OLEHANDLER_HXX -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" #include <boost/shared_ptr.hpp> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/awt/Point.hpp> diff --git a/writerfilter/source/dmapper/PageBordersHandler.hxx b/writerfilter/source/dmapper/PageBordersHandler.hxx index a3a6325e7387..bfcd27d18bd5 100644 --- a/writerfilter/source/dmapper/PageBordersHandler.hxx +++ b/writerfilter/source/dmapper/PageBordersHandler.hxx @@ -22,7 +22,7 @@ #include "BorderHandler.hxx" #include "PropertyMap.hxx" -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" #include <boost/shared_ptr.hpp> #include <com/sun/star/table/BorderLine2.hpp> diff --git a/writerfilter/source/dmapper/SectionColumnHandler.hxx b/writerfilter/source/dmapper/SectionColumnHandler.hxx index d3fac364ca62..fe2f42219480 100644 --- a/writerfilter/source/dmapper/SectionColumnHandler.hxx +++ b/writerfilter/source/dmapper/SectionColumnHandler.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_SECTIONCOLUMNHANDLER_HXX #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_SECTIONCOLUMNHANDLER_HXX -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" #include <boost/shared_ptr.hpp> #include <vector> diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx index 9c30791ca11d..739bfc534e46 100644 --- a/writerfilter/source/dmapper/SettingsTable.hxx +++ b/writerfilter/source/dmapper/SettingsTable.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_SETTINGSTABLE_HXX #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_SETTINGSTABLE_HXX -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/text/XTextDocument.hpp> #include <map> diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx index 5e2ba514bb7f..2250ae4f8415 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.hxx +++ b/writerfilter/source/dmapper/StyleSheetTable.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/beans/PropertyValues.hpp> #include "PropertyMap.hxx" #include "FontTable.hxx" -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" namespace com{ namespace sun { namespace star { namespace text{ class XTextDocument; diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/writerfilter/source/dmapper/TDefTableHandler.hxx index abc9ac03c671..d8e034ef1716 100644 --- a/writerfilter/source/dmapper/TDefTableHandler.hxx +++ b/writerfilter/source/dmapper/TDefTableHandler.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TDEFTABLEHANDLER_HXX #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TDEFTABLEHANDLER_HXX -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" #include <boost/shared_ptr.hpp> #include <vector> namespace com{ namespace sun{ namespace star{ diff --git a/writerfilter/source/dmapper/TablePositionHandler.hxx b/writerfilter/source/dmapper/TablePositionHandler.hxx index babb1809d2a8..ff44104d707c 100644 --- a/writerfilter/source/dmapper/TablePositionHandler.hxx +++ b/writerfilter/source/dmapper/TablePositionHandler.hxx @@ -9,7 +9,7 @@ #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TABLEPOSITIONHANDLER_HXX #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TABLEPOSITIONHANDLER_HXX -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" #include <boost/shared_ptr.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx b/writerfilter/source/dmapper/TblStylePrHandler.hxx index 8ec2dcc76fae..36b1f2c1c0bb 100644 --- a/writerfilter/source/dmapper/TblStylePrHandler.hxx +++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx @@ -23,7 +23,7 @@ #include "TablePropertiesHandler.hxx" #include <DomainMapper.hxx> -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" #include <boost/shared_ptr.hpp> #include <comphelper/sequenceasvector.hxx> diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx index c1f0a377d4e2..043b94b8982f 100644 --- a/writerfilter/source/dmapper/TextEffectsHandler.hxx +++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx @@ -11,7 +11,7 @@ #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TEXTEFFECTSHANDLER_HXX #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TEXTEFFECTSHANDLER_HXX -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/XComponent.hpp> diff --git a/writerfilter/source/dmapper/ThemeTable.hxx b/writerfilter/source/dmapper/ThemeTable.hxx index 58b55b765af7..50856b258058 100644 --- a/writerfilter/source/dmapper/ThemeTable.hxx +++ b/writerfilter/source/dmapper/ThemeTable.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_THEMETABLE_HXX #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_THEMETABLE_HXX -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <i18nlangtag/languagetag.hxx> diff --git a/writerfilter/source/dmapper/TrackChangesHandler.hxx b/writerfilter/source/dmapper/TrackChangesHandler.hxx index 419c488c2edd..7d48db039be1 100644 --- a/writerfilter/source/dmapper/TrackChangesHandler.hxx +++ b/writerfilter/source/dmapper/TrackChangesHandler.hxx @@ -9,7 +9,7 @@ #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TRACKCHANGESHANDLER_HXX #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TRACKCHANGESHANDLER_HXX -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" #include <boost/shared_ptr.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <DomainMapper_Impl.hxx> diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx index af6fdde535fe..38e5c172adb5 100644 --- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx +++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx @@ -22,7 +22,7 @@ #include <deque> #include <com/sun/star/drawing/PointSequenceSequence.hpp> -#include <resourcemodel/LoggedResources.hxx> +#include "LoggedResources.hxx" #include <tools/fract.hxx> #include <comphelper/sequenceasvector.hxx> |