5 files changed, 59 insertions, 2 deletions
diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx b/writerfilter/inc/dmapper/DomainMapper.hxx
index d119e0e84312..99602ceab924 100644
--- a/writerfilter/inc/dmapper/DomainMapper.hxx
+++ b/writerfilter/inc/dmapper/DomainMapper.hxx
@@ -145,8 +145,6 @@ private:
     rtl::OUString getBracketStringFromEnum(const sal_Int32 nIntValue, const bool bIsPrefix = true);
     com::sun::star::style::TabAlign getTabAlignFromValue(const sal_Int32 nIntValue);
     sal_Unicode getFillCharFromValue(const sal_Int32 nIntValue);
-    void resolveAttributeProperties(Value & val);
-    void resolveSprmProps(Sprm & sprm_);
     sal_Int32 mnBackgroundColor;
     bool mbIsHighlightSet;
 };
diff --git a/writerfilter/inc/resourcemodel/Protocol.hxx b/writerfilter/inc/resourcemodel/Protocol.hxx
index d0405861f695..2f4c9f6261ba 100644
--- a/writerfilter/inc/resourcemodel/Protocol.hxx
+++ b/writerfilter/inc/resourcemodel/Protocol.hxx
@@ -30,6 +30,8 @@
 #ifndef INCLUDE_WRITERFILTER_PROTOCOL_HXX
 #define INCLUDE_WRITERFILTER_PROTOCOL_HXX
 
+#ifdef DEBUG
+
 #include <boost/shared_ptr.hpp>
 #include "WW8ResourceModel.hxx"
 #include "TagLogger.hxx"
@@ -95,4 +97,6 @@ public:
 };
 
 }
+
+#endif // DEBUG
 #endif // INCLUDE_WRITERFILTER_PROTOCOL_HXX
diff --git a/writerfilter/inc/resourcemodel/ResourceModelHelper.hxx b/writerfilter/inc/resourcemodel/ResourceModelHelper.hxx
new file mode 100644
index 000000000000..c1c500545055
--- /dev/null
+++ b/writerfilter/inc/resourcemodel/ResourceModelHelper.hxx
@@ -0,0 +1,40 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef INCLUDED_RESOURCE_MODEL_HELPER_HXX
+#define INCLUDED_RESOURCE_MODEL_HELPER_HXX
+
+#include <resourcemodel/WW8ResourceModel.hxx>
+
+namespace writerfilter {
+namespace resourcemodel {
+
+void WRITERFILTER_DLLPUBLIC resolveSprmProps(Properties & rHandler, Sprm & rSprm);
+void  WRITERFILTER_DLLPUBLIC resolveAttributeProperties(Properties & rHandler, Value & rValue);
+
+}}
+
+#endif // INCLUDED_RESOURCE_MODEL_HELPER_HXX
diff --git a/writerfilter/inc/resourcemodel/TagLogger.hxx b/writerfilter/inc/resourcemodel/TagLogger.hxx
index cf58dc3be8c3..055656832761 100644
--- a/writerfilter/inc/resourcemodel/TagLogger.hxx
+++ b/writerfilter/inc/resourcemodel/TagLogger.hxx
@@ -28,7 +28,10 @@
 #ifndef INCLUDED_TAG_LOGGER_HXX
 #define INCLUDED_TAG_LOGGER_HXX
 
+#ifdef DEBUG
+
 #include <rtl/ustring.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <WriterFilterDllApi.hxx>
 #include <resourcemodel/WW8ResourceModel.hxx>
 #include <string>
@@ -76,8 +79,10 @@ namespace writerfilter
         void addAttr(string name, string value);
         void addAttr(string name, const ::rtl::OUString & value);
         void addAttr(string name, sal_uInt32 nValue);
+        void addAttr(string name, uno::Any rAny);
         void addTag(Pointer_t pTag);
         void chars(const string & rChars);
+        void chars(const ::rtl::OUString & rChars);
         const string & getTag() const;
         string toString() const;
 
@@ -93,6 +98,7 @@ namespace writerfilter
         stack<XMLTag::Pointer_t> mTags;
         XMLTag::Pointer_t currentTag() const;
         XMLTag::Pointer_t mpRoot;
+        string mFileName;
 
         TagLogger();
 
@@ -101,12 +107,15 @@ namespace writerfilter
 
         static Pointer_t getInstance(const char * name);
 
+        void setFileName(const string & rName);
+
         void startDocument();
         void element(const string & name);
         void startElement(const string & name);
         void attribute(const string & name, const string & value);
         void attribute(const string & name, const ::rtl::OUString & value);
         void attribute(const string & name, sal_uInt32 value);
+        void attribute(const string & name, const uno::Any aAny);
         void addTag(XMLTag::Pointer_t pTag);
         void chars(const string & chars);
         void chars(const ::rtl::OUString & chars);
@@ -142,5 +151,9 @@ namespace writerfilter
         virtual void attribute(Id name, Value & val);
         virtual void sprm(Sprm & sprm);
     };
+
+WRITERFILTER_DLLPUBLIC XMLTag::Pointer_t unoPropertySetToTag(uno::Reference<beans::XPropertySet> rPropSet);
 }
+
+#endif // DEBUG
 #endif // INCLUDED_TAG_LOGGER_HXX
diff --git a/writerfilter/inc/resourcemodel/util.hxx b/writerfilter/inc/resourcemodel/util.hxx
index 360dfc3d4113..0a700513576a 100644
--- a/writerfilter/inc/resourcemodel/util.hxx
+++ b/writerfilter/inc/resourcemodel/util.hxx
@@ -39,10 +39,12 @@ namespace writerfilter
 
     string WRITERFILTER_DLLPUBLIC xmlify(const string & str);
 
+#ifdef DEBUG
     string WRITERFILTER_DLLPUBLIC propertysetToString
     (uno::Reference<beans::XPropertySet> const & rProps);
 
     string toString(uno::Reference< text::XTextRange > textRange);
     string toString(const string & rString);
+#endif
 }
 #endif // INCLUDED_RESOURCEMODEL_UTIL_HXX