From 2aa3f2043dac81b282b79574e3aa478f38a1697d Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Thu, 10 Jan 2008 10:36:06 +0000
Subject: [PATCH] INTEGRATION: CWS xmlfilter02 (1.2.12); FILE MERGED 2007/11/15
 10:01:06 os 1.2.12.3: paragraph border completed 2007/11/14 12:57:06 hbrinkm
 1.2.12.2: namespace clean up 2007/10/18 09:35:12 hbrinkm 1.2.12.1:
 WW8ResourceModel.hxx moved to inc/resourcemodel

---
 writerfilter/source/dmapper/BorderHandler.hxx | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx
index 411969770da7..5a34d18e1a77 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: BorderHandler.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2007-05-03 06:25:37 $
+ *  last change: $Author: obo $ $Date: 2008-01-10 11:36:06 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -38,16 +38,17 @@
 #ifndef INCLUDED_WRITERFILTERDLLAPI_H
 #include <WriterFilterDllApi.hxx>
 #endif
-#include <doctok/WW8ResourceModel.hxx>
+#include <resourcemodel/WW8ResourceModel.hxx>
 #include <boost/shared_ptr.hpp>
 #ifndef _COM_SUN_STAR_TABLE_BORDERLINE_HPP_
 #include <com/sun/star/table/BorderLine.hpp>
 #endif
 
+namespace writerfilter {
 namespace dmapper
 {
 class PropertyMap;
-class WRITERFILTER_DLLPRIVATE BorderHandler : public doctok::Properties
+class WRITERFILTER_DLLPRIVATE BorderHandler : public Properties
 {
 public:
     //todo: order is a guess
@@ -69,20 +70,22 @@ private:
     sal_Int32       m_nLineType;
     sal_Int32       m_nLineColor;
     sal_Int32       m_nLineDistance;
+    bool            m_bOOXML;
 
     ::com::sun::star::table::BorderLine         m_aBorderLines[BORDER_COUNT];
 
 public:
-    BorderHandler( );
+    BorderHandler( bool bOOXML );
     virtual ~BorderHandler();
 
     // Properties
-    virtual void attribute(doctok::Id Name, doctok::Value & val);
-    virtual void sprm(doctok::Sprm & sprm);
+    virtual void attribute(Id Name, Value & val);
+    virtual void sprm(Sprm & sprm);
 
     ::boost::shared_ptr<PropertyMap>            getProperties();
+    ::com::sun::star::table::BorderLine         getBorderLine();
 };
 typedef boost::shared_ptr< BorderHandler >          BorderHandlerPtr;
-}
+}}
 
 #endif //