writerfilter: only dmapper needs LoggedResources

Change-Id: Ic8c691c4185ec8b808e75885f9354c35d68be58c

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 \
 ))

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>

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>
 

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>

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>
 

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 {

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>
 

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>
 

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

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>

writerfilter/source/resourcemodel/LoggedResources.cxx → 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;

writerfilter/inc/resourcemodel/LoggedResources.hxx → 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: */

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>

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>
 

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>

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>

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>
 

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>

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;

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{

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>
 

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>
 

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>

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>

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>

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>