table attributes

10 files changed, 245 insertions, 89 deletions

diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx
index 98ea06beed56..7515c55457fb 100644
--- a/writerfilter/source/dmapper/BorderHandler.cxx
+++ b/writerfilter/source/dmapper/BorderHandler.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: BorderHandler.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fridrich_strba $ $Date: 2007-04-25 14:04:47 $
+ *  last change: $Author: os $ $Date: 2007-05-03 06:25:37 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -64,13 +64,6 @@ BorderHandler::BorderHandler() :
     m_nLineColor(0),
     m_nLineDistance(0)
 {
-    m_aTableBorder.IsTopLineValid = sal_False;;
-    m_aTableBorder.IsBottomLineValid = sal_False;;
-    m_aTableBorder.IsLeftLineValid = sal_False;;
-    m_aTableBorder.IsRightLineValid = sal_False;;
-    m_aTableBorder.IsHorizontalLineValid = sal_False;;
-    m_aTableBorder.IsVerticalLineValid = sal_False;;
-    m_aTableBorder.IsDistanceValid = sal_False;
 }
 /*-- 24.04.2007 09:06:35---------------------------------------------------
 
@@ -93,36 +86,37 @@ void BorderHandler::attribute(doctok::Id rName, doctok::Value & rVal)
             {
                 pProperties->resolve(*this);
                 //
-                table::BorderLine* pToFill = 0;
-                switch(m_nCurrentBorderPosition)
-                {
-                    case BORDER_TOP:
-                        pToFill = &m_aTableBorder.TopLine;
-                        m_aTableBorder.IsTopLineValid = sal_True;
-                    break;
-                    case BORDER_LEFT:
-                        pToFill = &m_aTableBorder.LeftLine;
-                        m_aTableBorder.IsLeftLineValid = sal_True;
-                    break;
-                    case BORDER_BOTTOM:
-                        pToFill = &m_aTableBorder.BottomLine;
-                        m_aTableBorder.IsBottomLineValid = sal_True;;
-                    break;
-                    case BORDER_RIGHT:
-                        pToFill = &m_aTableBorder.RightLine;
-                        m_aTableBorder.IsRightLineValid = sal_True;
-                    break;
-                    case BORDER_HORIZONTAL:
-                        pToFill = &m_aTableBorder.HorizontalLine;
-                        m_aTableBorder.IsHorizontalLineValid = sal_True;;
-                    break;
-                    case BORDER_VERTICAL:
-                        m_aTableBorder.IsVerticalLineValid = sal_True;;
-                    default:
-                        pToFill = &m_aTableBorder.VerticalLine; break;
-                }
-                ConversionHelper::MakeBorderLine( m_nLineWidth,   m_nLineType, m_nLineColor,  *pToFill );
-                OSL_ENSURE(m_nCurrentBorderPosition <= BORDER_VERTICAL, "too many border values");
+//                table::BorderLine* pToFill = 0;
+//                switch(m_nCurrentBorderPosition)
+//                {
+//                    case BORDER_TOP:
+//                        pToFill = &m_aTableBorder.TopLine;
+//                        m_aTableBorder.IsTopLineValid = sal_True;
+//                    break;
+//                    case BORDER_LEFT:
+//                        pToFill = &m_aTableBorder.LeftLine;
+//                        m_aTableBorder.IsLeftLineValid = sal_True;
+//                    break;
+//                    case BORDER_BOTTOM:
+//                        pToFill = &m_aTableBorder.BottomLine;
+//                        m_aTableBorder.IsBottomLineValid = sal_True;;
+//                    break;
+//                    case BORDER_RIGHT:
+//                        pToFill = &m_aTableBorder.RightLine;
+//                        m_aTableBorder.IsRightLineValid = sal_True;
+//                    break;
+//                    case BORDER_HORIZONTAL:
+//                        pToFill = &m_aTableBorder.HorizontalLine;
+//                        m_aTableBorder.IsHorizontalLineValid = sal_True;;
+//                    break;
+//                    case BORDER_VERTICAL:
+//                        m_aTableBorder.IsVerticalLineValid = sal_True;;
+//                    default:
+//                        pToFill = &m_aTableBorder.VerticalLine; break;
+//                }
+                ConversionHelper::MakeBorderLine( m_nLineWidth,   m_nLineType, m_nLineColor,
+                                                                                m_aBorderLines[m_nCurrentBorderPosition] );
+                OSL_ENSURE(m_nCurrentBorderPosition < BORDER_COUNT, "too many border values");
                 ++m_nCurrentBorderPosition;
             }
         }
@@ -162,8 +156,18 @@ void BorderHandler::sprm(doctok::Sprm & rSprm)
   -----------------------------------------------------------------------*/
 PropertyMapPtr  BorderHandler::getProperties()
 {
+    static const PropertyIds aPropNames[BORDER_COUNT] =
+    {
+        PROP_TOP_BORDER,
+        PROP_LEFT_BORDER,
+        PROP_BOTTOM_BORDER,
+        PROP_RIGHT_BORDER,
+        META_PROP_HORIZONTAL_BORDER,
+        META_PROP_VERTICAL_BORDER
+    };
     PropertyMapPtr pPropertyMap(new PropertyMap);
-    pPropertyMap->Insert( PROP_TABLE_BORDER, uno::makeAny( m_aTableBorder ) );
+    for( sal_Int32 nProp = 0; nProp < BORDER_COUNT; ++nProp)
+        pPropertyMap->Insert( aPropNames[nProp], uno::makeAny( m_aBorderLines[nProp] ) );
     return pPropertyMap;
 }
 } //namespace dmapper
diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx
index 3a3ac44a3e15..411969770da7 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: BorderHandler.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: os $ $Date: 2007-04-25 11:28:59 $
+ *  last change: $Author: os $ $Date: 2007-05-03 06:25:37 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -40,7 +40,9 @@
 #endif
 #include <doctok/WW8ResourceModel.hxx>
 #include <boost/shared_ptr.hpp>
-#include <com/sun/star/table/TableBorder.hpp>
+#ifndef _COM_SUN_STAR_TABLE_BORDERLINE_HPP_
+#include <com/sun/star/table/BorderLine.hpp>
+#endif
 
 namespace dmapper
 {
@@ -56,7 +58,8 @@ public:
         BORDER_BOTTOM,
         BORDER_RIGHT,
         BORDER_HORIZONTAL,
-        BORDER_VERTICAL
+        BORDER_VERTICAL,
+        BORDER_COUNT
     };
 
 private:
@@ -67,7 +70,7 @@ private:
     sal_Int32       m_nLineColor;
     sal_Int32       m_nLineDistance;
 
-    ::com::sun::star::table::TableBorder        m_aTableBorder;
+    ::com::sun::star::table::BorderLine         m_aBorderLines[BORDER_COUNT];
 
 public:
     BorderHandler( );
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 44c5d78dfc4f..b27aa819d40f 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: DomainMapper.cxx,v $
  *
- *  $Revision: 1.38 $
+ *  $Revision: 1.39 $
  *
- *  last change: $Author: fridrich_strba $ $Date: 2007-05-02 18:06:21 $
+ *  last change: $Author: os $ $Date: 2007-05-03 06:25:37 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -1471,17 +1471,11 @@ void DomainMapper::attribute(doctok::Id nName, doctok::Value & val)
             /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
             break;
         case NS_rtf::LN_cellTopColor:
-            /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
-            break;
         case NS_rtf::LN_cellLeftColor:
-            /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
-            break;
         case NS_rtf::LN_cellBottomColor:
-            /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
-            break;
         case NS_rtf::LN_cellRightColor:
-            /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
-            break;
+            OSL_ASSERT("handled by DomainMapperTableManager");
+        break;
 
         case NS_rtf::LN_LISTTABLE:
             /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index ffbc953a248c..0552f29e9871 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: DomainMapperTableHandler.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: os $ $Date: 2007-04-25 11:30:51 $
+ *  last change: $Author: os $ $Date: 2007-05-03 06:25:37 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -72,7 +72,7 @@ void DomainMapperTableHandler::startTable(unsigned int nRows,
 {
     m_aTableProperties = pProps;
     m_pTableSeq = TableSequencePointer_t(new TableSequence_t(nRows));
-    m_nTableIndex = 0;
+    m_nRowIndex = 0;
 
 #ifdef DEBUG
     char sBuffer[256];
@@ -85,16 +85,100 @@ void DomainMapperTableHandler::startTable(unsigned int nRows,
 void DomainMapperTableHandler::endTable()
 {
 #ifdef DEBUG
+{
     clog << "</table>" << endl;
+    sal_uInt32 nCells = 0;
+    sal_uInt32 nRows = m_aRowProperties.size();
+    if( nRows == m_aCellProperties.size() )
+    {
+        for( sal_uInt32 nRow = 0; nRow < nRows; ++nRow )
+            nCells += m_aCellProperties[nRow].size();
+    }
+    sal_uInt32 nTblPropSize = m_aTableProperties.get() ? m_aTableProperties->size() : 0;
+    (void)nTblPropSize;
+}
 #endif
-    CellPropertyValuesSeq_t     aCellProperties;
-    RowPropertyValuesSeq_t      aRowProperties;
+
+
+    //  expands to uno::Sequence< Sequence< beans::PropertyValues > >
+    CellPropertyValuesSeq_t     aCellProperties( m_aCellProperties.size() );
+
+    // std::vector< std::vector<PropertyMapPtr> > m_aCellProperties
+    PropertyMapVector2::const_iterator aRowOfCellsIterator = m_aCellProperties.begin();
+    PropertyMapVector2::const_iterator aRowOfCellsIteratorEnd = m_aCellProperties.end();
+    sal_Int32 nRow = 0;
+    //it's a uno::Sequence< beans::PropertyValues >*
+    RowPropertyValuesSeq_t* pCellProperties = aCellProperties.getArray();
+    while( aRowOfCellsIterator != aRowOfCellsIteratorEnd )
+    {
+        //aRowOfCellsIterator points to a vector of PropertyMapPtr
+        PropertyMapVector1::const_iterator aCellIterator = aRowOfCellsIterator->begin();
+        PropertyMapVector1::const_iterator aCellIteratorEnd = aRowOfCellsIterator->end();
+
+        sal_Int32 nCell = 0;
+        pCellProperties[nRow].realloc( aRowOfCellsIterator->size() );
+        beans::PropertyValues* pSingleCellProperties = pCellProperties->getArray();
+        while( aCellIterator != aCellIteratorEnd )
+        {
+            //TODO: aCellIterator contains HorizontalBorder and VerticalBorder
+            // they have to be removed, depending on the position of the cell they
+            // have to be moved to BottomBorder/RightBorder respectively
+            //aCellIterator points to a PropertyMapPtr;
+            if( aCellIterator->get() )
+            {
+
+                PropertyNameSupplier& rPropSupplier = PropertyNameSupplier::GetPropertyNameSupplier();
+                const PropertyMap::iterator aVerticalIter =
+                                aCellIterator->get()->find( rPropSupplier.GetName(META_PROP_VERTICAL_BORDER) );
+                const PropertyMap::iterator aHorizontalIter =
+                                aCellIterator->get()->find( rPropSupplier.GetName(META_PROP_HORIZONTAL_BORDER) );
+                const PropertyMap::const_iterator aRightIter =
+                                aCellIterator->get()->find( rPropSupplier.GetName(PROP_RIGHT_BORDER) );
+                const PropertyMap::const_iterator aBottomIter =
+                                aCellIterator->get()->find( rPropSupplier.GetName(PROP_BOTTOM_BORDER) );
+                aCellIterator->get()->erase( aVerticalIter );
+                aCellIterator->get()->erase( aHorizontalIter );
+
+                pSingleCellProperties[nCell] = aCellIterator->get()->GetPropertyValues();
+            }
+            ++nCell;
+            ++aCellIterator;
+        }
+        ++nRow;
+        ++aRowOfCellsIterator;
+    }
+
+    RowPropertyValuesSeq_t      aRowProperties( m_aRowProperties.size() );
+    PropertyMapVector1::const_iterator aRowIter = m_aRowProperties.begin();
+    PropertyMapVector1::const_iterator aRowIterEnd = m_aRowProperties.end();
+    nRow = 0;
+    while( aRowIter != aRowIterEnd )
+    {
+        if( aRowIter->get() )
+            aRowProperties[nRow] = aRowIter->get()->GetPropertyValues();
+        ++nRow;
+        ++aRowIter;
+    }
+
     TablePropertyValues_t       aTableProperties;
+    if( m_aTableProperties.get() )
+        aTableProperties = m_aTableProperties->GetPropertyValues();
 
     if (m_pTableSeq->getLength() > 0)
     {
         try
         {
+#ifdef DEBUG
+    {
+        sal_Int32 nCellPropertiesRows = aCellProperties.getLength();
+        sal_Int32 nCellPropertiesCells = aCellProperties[0].getLength();
+        sal_Int32 nCellPropertiesProperties = aCellProperties[0][0].getLength();
+        (void) nCellPropertiesRows;
+        (void) nCellPropertiesCells;
+        (void) nCellPropertiesProperties;
+        ++nCellPropertiesProperties;
+    }
+#endif
             m_xText->convertToTable(*m_pTableSeq,
                                     aCellProperties,
                                     aRowProperties,
@@ -124,14 +208,14 @@ void DomainMapperTableHandler::startRow(unsigned int nCells,
 #endif
 
     m_pRowSeq = RowSequencePointer_t(new RowSequence_t(nCells));
-    m_nRowIndex = 0;
+    m_nCellIndex = 0;
 }
 
 void DomainMapperTableHandler::endRow()
 {
-    (*m_pTableSeq)[m_nTableIndex] = *m_pRowSeq;
-    ++m_nTableIndex;
-
+    (*m_pTableSeq)[m_nRowIndex] = *m_pRowSeq;
+    ++m_nRowIndex;
+    m_nCellIndex = 0;
 #ifdef DEBUG
     clog << "</table.row>" << endl;
 #endif
@@ -166,8 +250,8 @@ void DomainMapperTableHandler::endCell(const Handle_t & end)
 #endif
 
     (*m_pCellSeq)[1] = end->getEnd();
-    (*m_pRowSeq)[m_nRowIndex] = *m_pCellSeq;
-    ++m_nRowIndex;
+    (*m_pRowSeq)[m_nCellIndex] = *m_pCellSeq;
+    ++m_nCellIndex;
 }
 
 }
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
index 2bb904a1d70d..909ace76c778 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: DomainMapperTableHandler.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: os $ $Date: 2007-04-25 11:30:51 $
+ *  last change: $Author: os $ $Date: 2007-05-03 06:25:37 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -76,15 +76,16 @@ class DomainMapperTableHandler : public doctok::TableDataHandler<Handle_t , Prop
     PropertyMapVector1      m_aRowProperties;
     PropertyMapPtr          m_aTableProperties;
 
-    //sal_Int32 m_nHandleIndex;
+    sal_Int32 m_nCellIndex;
     sal_Int32 m_nRowIndex;
-    sal_Int32 m_nTableIndex;
 
 public:
     typedef boost::shared_ptr<DomainMapperTableHandler> Pointer_t;
 
     DomainMapperTableHandler(TextReference_t xText)
-    : m_xText(xText)
+    : m_xText(xText),
+        m_nCellIndex(0),
+        m_nRowIndex(0)
     {
     }
     virtual ~DomainMapperTableHandler() {}
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 3fd76f471969..8751f7c4ee29 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: DomainMapperTableManager.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: os $ $Date: 2007-04-25 11:27:43 $
+ *  last change: $Author: os $ $Date: 2007-05-03 06:25:38 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -37,6 +37,9 @@
 #ifndef INCLUDED_BORDERHANDLER_HXX
 #include <BorderHandler.hxx>
 #endif
+#ifndef INCLUDED_CELLCOLORHANDLER_HXX
+#include <CellColorHandler.hxx>
+#endif
 #ifndef _COM_SUN_STAR_TEXT_HORIORIENTATION_HDL_
 #include <com/sun/star/text/HoriOrientation.hpp>
 #endif
@@ -49,7 +52,10 @@ using namespace ::std;
 /*-- 23.04.2007 14:57:49---------------------------------------------------
 
   -----------------------------------------------------------------------*/
-DomainMapperTableManager::DomainMapperTableManager()
+DomainMapperTableManager::DomainMapperTableManager() :
+    m_nRow(0),
+    m_nCell(0),
+    m_nCellBorderIndex(0)
 {
 }
 /*-- 23.04.2007 14:57:49---------------------------------------------------
@@ -122,8 +128,23 @@ bool DomainMapperTableManager::sprm(doctok::Sprm & rSprm)
                 {
                     BorderHandlerPtr pBorderHandler( new BorderHandler );
                     pProperties->resolve(*pBorderHandler);
-                    //todo: applyBorder()?;
-                    cellPropsByCell(0, PropertyMapPtr( pBorderHandler->getProperties()) );
+                    cellPropsByCell( m_nCellBorderIndex, PropertyMapPtr( pBorderHandler->getProperties()) );
+                    ++m_nCellBorderIndex;
+                }
+            }
+            break;
+            case 0xd61a : // sprmTCellTopColor
+            case 0xd61b : // sprmTCellLeftColor
+            case 0xd61c : // sprmTCellBottomColor
+            case 0xd61d : // sprmTCellRightColor
+            {
+                // each color sprm contains as much colors as cells are in a row
+                doctok::Reference<doctok::Properties>::Pointer_t pProperties = rSprm.getProps();
+                if( pProperties.get())
+                {
+                    CellColorHandlerPtr pCellColorHandler( new CellColorHandler );
+                    pProperties->resolve( *pCellColorHandler );
+//                    cellPropsByCell(0, PropertyMapPtr( pColorHandler->getProperties()) );
                 }
             }
             break;
@@ -132,5 +153,48 @@ bool DomainMapperTableManager::sprm(doctok::Sprm & rSprm)
     }
     return bRet;
 }
+/*-- 26.04.2007 08:20:08---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+//void DomainMapperTableManager::attribute(doctok::Id nName, doctok::Value & rVal)
+//{
+//    sal_Int32 nIntValue = rVal.getInt();
+//    rtl::OUString sStringValue = val.getString();
+//    /* WRITERFILTERSTATUS: table: tablemanager_attributedata */
+//    switch( nName )
+//    {
+//        case NS_rtf::LN_cellTopColor:
+//            /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
+//            break;
+//        case NS_rtf::LN_cellLeftColor:
+//            /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
+//            break;
+//        case NS_rtf::LN_cellBottomColor:
+//            /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
+//            break;
+//        case NS_rtf::LN_cellRightColor:
+//            /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
+//            break;
+//    }
+
+/*-- 02.05.2007 14:36:26---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+void DomainMapperTableManager::endCell()
+{
+    DomainMapperTableManager_Base_t::endCell();
+    ++m_nCell;
+}
+/*-- 02.05.2007 14:36:26---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+void DomainMapperTableManager::endRow()
+{
+    DomainMapperTableManager_Base_t::endRow();
+    ++m_nRow;
+    m_nCell = 0;
+    m_nCellBorderIndex = 0;
+}
+
 
 }
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index 20d4c507e620..4d77641a37cb 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: DomainMapperTableManager.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: os $ $Date: 2007-04-25 11:28:13 $
+ *  last change: $Author: os $ $Date: 2007-05-03 06:25:38 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -51,6 +51,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > H
 typedef doctok::TableManager<Handle_t , PropertyMapPtr > DomainMapperTableManager_Base_t;
 class DomainMapperTableManager : public DomainMapperTableManager_Base_t
 {
+    sal_uInt32       m_nRow;
+    sal_uInt32       m_nCell;
+    sal_uInt32       m_nCellBorderIndex; //borders are provided for all cells and need counting
 public:
 
     DomainMapperTableManager();
@@ -58,6 +61,8 @@ public:
 
     virtual bool sprm(doctok::Sprm & rSprm);
 
+    virtual void endCell();
+    virtual void endRow();
 };
 
 }
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx
index fa1750e88762..6256d7c63c85 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: PropertyIds.cxx,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: os $ $Date: 2007-04-25 11:30:51 $
+ *  last change: $Author: os $ $Date: 2007-05-03 06:25:38 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -294,8 +294,8 @@ const rtl::OUString& PropertyNameSupplier::GetName( PropertyIds eId ) const
             case PROP_CREATE_FROM_MARKS      :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateFromMarks")); break;
             case PROP_STANDARD               :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard")); break;
             case PROP_IS_SPLIT_ALLOWED       :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsSplitAllowed")); break;
-//            case       :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break;
-//            case       :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break;
+            case META_PROP_VERTICAL_BORDER   :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VerticalBorder")); break;
+            case META_PROP_HORIZONTAL_BORDER :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HorizontalBorder")); break;
 //            case       :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break;
 //            case       :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break;
 //            case       :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break;
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx
index 089c3965e218..3fb747892fb3 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: PropertyIds.hxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: os $ $Date: 2007-04-25 11:30:52 $
+ *  last change: $Author: os $ $Date: 2007-05-03 06:25:38 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -236,8 +236,8 @@ enum PropertyIds
 /*194*/ ,PROP_CHAR_ROTATION_IS_FIT_TO_LINE
 /*195*/ ,PROP_CHAR_FLASH
 /*196*/ ,PROP_IS_SPLIT_ALLOWED
-///*197*/ ,PROP_
-///*198*/ ,PROP_
+/*197*/ ,META_PROP_VERTICAL_BORDER
+/*198*/ ,META_PROP_HORIZONTAL_BORDER
 ///*199*/ ,PROP_
 ///*200*/ ,PROP_
 ///*201*/ ,PROP_
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index dacc4d1969ef..297c3b249747 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: PropertyMap.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: os $ $Date: 2007-04-25 11:30:52 $
+ *  last change: $Author: os $ $Date: 2007-05-03 06:25:38 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -793,8 +793,9 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
                 }
             }
         }
-        catch( const uno::Exception& )
+        catch( const uno::Exception& rEx)
         {
+            (void)rEx;
         }
     }
 }