2 files changed, 19 insertions, 17 deletions
diff --git a/writerfilter/source/dmapper/CellMarginHandler.cxx b/writerfilter/source/dmapper/CellMarginHandler.cxx
index bfea8a6b25f9..645755cc4c63 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.cxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.cxx
@@ -29,6 +29,7 @@
 #include <doctok/resourceids.hxx>
 #include <ConversionHelper.hxx>
 #include <ooxml/resourceids.hxx>
+#include "dmapperLoggers.hxx"
 
 namespace writerfilter {
 namespace dmapper {
@@ -41,15 +42,16 @@ using namespace ::writerfilter;
 
   -----------------------------------------------------------------------*/
 CellMarginHandler::CellMarginHandler() :
-    m_nValue( 0 ),
-    m_nLeftMargin( 0 ),
-    m_bLeftMarginValid( false ),
-    m_nRightMargin( 0 ),
-    m_bRightMarginValid( false ),
-    m_nTopMargin( 0 ),
-    m_bTopMarginValid( false ),
-    m_nBottomMargin( 0 ),
-    m_bBottomMarginValid( false )
+LoggedProperties(dmapper_logger, "CellMarginHandler"),
+m_nValue( 0 ),
+m_nLeftMargin( 0 ),
+m_bLeftMarginValid( false ),
+m_nRightMargin( 0 ),
+m_bRightMarginValid( false ),
+m_nTopMargin( 0 ),
+m_bTopMarginValid( false ),
+m_nBottomMargin( 0 ),
+m_bBottomMarginValid( false )
 {
 }
 /*-- 18.02.2008 12:36:51---------------------------------------------------
@@ -61,7 +63,7 @@ CellMarginHandler::~CellMarginHandler()
 /*-- 18.02.2008 12:36:51---------------------------------------------------
 
   -----------------------------------------------------------------------*/
-void CellMarginHandler::attribute(Id rName, Value & rVal)
+void CellMarginHandler::lcl_attribute(Id rName, Value & rVal)
 {
     sal_Int32 nIntValue = rVal.getInt();
     (void)nIntValue;
@@ -82,7 +84,7 @@ void CellMarginHandler::attribute(Id rName, Value & rVal)
 /*-- 18.02.2008 12:36:51---------------------------------------------------
 
   -----------------------------------------------------------------------*/
-void CellMarginHandler::sprm(Sprm & rSprm)
+void CellMarginHandler::lcl_sprm(Sprm & rSprm)
 {
     writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
     if( pProperties.get())
diff --git a/writerfilter/source/dmapper/CellMarginHandler.hxx b/writerfilter/source/dmapper/CellMarginHandler.hxx
index 5f01df47a347..3d2512675683 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.hxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.hxx
@@ -30,18 +30,22 @@
 #ifndef INCLUDED_WRITERFILTERDLLAPI_H
 #include <WriterFilterDllApi.hxx>
 #endif
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <resourcemodel/LoggedResources.hxx>
 #include <boost/shared_ptr.hpp>
 
 namespace writerfilter {
 namespace dmapper
 {
 class TablePropertyMap;
-class WRITERFILTER_DLLPRIVATE CellMarginHandler : public Properties
+class WRITERFILTER_DLLPRIVATE CellMarginHandler : public LoggedProperties
 {
 private:
     sal_Int32   m_nValue;
 
+    // Properties
+    virtual void lcl_attribute(Id Name, Value & val);
+    virtual void lcl_sprm(Sprm & sprm);
+
 public:
     sal_Int32   m_nLeftMargin;
     bool        m_bLeftMarginValid;
@@ -56,10 +60,6 @@ public:
     CellMarginHandler( );
     virtual ~CellMarginHandler();
 
-    // Properties
-    virtual void attribute(Id Name, Value & val);
-    virtual void sprm(Sprm & sprm);
-
     ::boost::shared_ptr<TablePropertyMap>            getProperties();
 
 };