cbosdo03: Fixed some merge issues

4 files changed, 21 insertions, 36 deletions

diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 501590cf08ad..670d5f2bf940 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -113,18 +113,20 @@ void ListLevel::SetValue( Id nId, sal_Int32 nValue )
         case NS_rtf::LN_FNORESTART:
             m_nFNoRestart = nValue;
         break;
-        case NS_rtf::LN_FPREV:
+        case NS_rtf::LN_FIDENTSAV:
             m_nFPrev = nValue;
         break;
-        case NS_rtf::LN_FPREVSPACE:
+        case NS_rtf::LN_FCONVERTED:
             m_nFPrevSpace = nValue;
         break;
+#if 0
         case NS_rtf::LN_FWORD6:
             m_nFWord6 = nValue;
         break;
+#endif
         case NS_rtf::LN_IXCHFOLLOW:
             m_nXChFollow = nValue;
-        break;
+  break;
         case NS_ooxml::LN_CT_TabStop_pos:
             m_nTabstop = nValue;
         break;
@@ -384,10 +386,10 @@ void AbstractListDef::SetValue( sal_uInt32 nSprmId, sal_Int32 nValue )
         case NS_rtf::LN_FSIMPLELIST:
             m_nSimpleList = nValue;
         break;
-        case NS_rtf::LN_FRESTARTHDN:
+        case NS_rtf::LN_fAutoNum:
             m_nRestart = nValue;
         break;
-        case NS_rtf::LN_UNSIGNED26_2:
+        case NS_rtf::LN_fHybrid:
             m_nUnsigned = nValue;
         break;
         default:
@@ -665,20 +667,18 @@ void ListsManager::attribute( Id nName, Value& rVal )
         /* WRITERFILTERSTATUS: done: 75, planned: 0, spent: 0 */
         case NS_rtf::LN_FNORESTART:
         /* WRITERFILTERSTATUS: done: 75, planned: 0, spent: 0 */
-        case NS_rtf::LN_FPREV:
+        case NS_rtf::LN_FIDENTSAV:
         /* WRITERFILTERSTATUS: done: 75, planned: 0, spent: 0 */
-        case NS_rtf::LN_FPREVSPACE:
+        case NS_rtf::LN_FCONVERTED:
+#if 0
         /* WRITERFILTERSTATUS: done: 75, planned: 0, spent: 0 */
         case NS_rtf::LN_FWORD6:
+#endif
         /* WRITERFILTERSTATUS: done: 75, planned: 0, spent: 0 */
         case NS_rtf::LN_IXCHFOLLOW:
             if ( pCurrentLvl.get( ) )
                 pCurrentLvl->SetValue( nName, sal_Int32( nIntValue ) );
         break;
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
-        case NS_rtf::LN_UNUSED5_7:
-            //unused
-        break;
         /* WRITERFILTERSTATUS: done: 75, planned: 0, spent: 0 */
         case NS_rtf::LN_RGISTD:
             m_pCurrentDefinition->AddRGISTD( rVal.getString() );
@@ -691,8 +691,8 @@ void ListsManager::attribute( Id nName, Value& rVal )
         break;
         case NS_rtf::LN_TPLC:
         case NS_rtf::LN_FSIMPLELIST:
-        case NS_rtf::LN_FRESTARTHDN:
-        case NS_rtf::LN_UNSIGNED26_2:
+        case NS_rtf::LN_fAutoNum:
+        case NS_rtf::LN_fHybrid:
             m_pCurrentDefinition->SetValue( nName, nIntValue );
         break;
         case NS_ooxml::LN_CT_NumLvl_ilvl:
@@ -851,11 +851,13 @@ void ListsManager::sprm( Sprm& rSprm )
             /* WRITERFILTERSTATUS: done: 75, planned: 0, spent: 0 */
             case NS_rtf::LN_FNORESTART:
             /* WRITERFILTERSTATUS: done: 75, planned: 0, spent: 0 */
-            case NS_rtf::LN_FPREV:
+            case NS_rtf::LN_FIDENTSAV:
             /* WRITERFILTERSTATUS: done: 75, planned: 0, spent: 0 */
-            case NS_rtf::LN_FPREVSPACE:
+            case NS_rtf::LN_FCONVERTED:
+#if 0
             /* WRITERFILTERSTATUS: done: 75, planned: 0, spent: 0 */
             case NS_rtf::LN_FWORD6:
+#endif
             /* WRITERFILTERSTATUS: done: 75, planned: 0, spent: 0 */
             case NS_rtf::LN_IXCHFOLLOW:
                 m_pCurrentDefinition->GetCurrentLevel( )->SetValue( nSprmId, nIntValue );
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx
index c368de285d4a..327736eda813 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -169,7 +169,7 @@ public:
 
 /** This class provides access to the defined numbering styles.
   */
-class WRITERFILTER_DLLPRIVATE ListsManager :
+class ListsManager :
     public Properties,
     public Table
 {
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index 10fc83e22dea..deb65c7c8cba 100755
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -28,11 +28,12 @@
  *
  ************************************************************************/
 
+#include <com/sun/star/beans/XPropertySet.hpp>
+
 #include <SettingsTable.hxx>
 #include <doctok/resourceids.hxx>
 #include <ooxml/resourceids.hxx>
 #include <stdio.h>
-#include <ListTable.hxx>
 #include <ConversionHelper.hxx>
 #include <rtl/ustring.hxx>
 
@@ -45,8 +46,6 @@ struct SettingsTable_Impl
     DomainMapper&       m_rDMapper;
     const uno::Reference< lang::XMultiServiceFactory > m_xTextFactory;
 
-    ListTablePtr        m_pListTable;
-
     ::rtl::OUString     m_sCharacterSpacing;
     ::rtl::OUString     m_sDecimalSymbol;
     ::rtl::OUString     m_sListSeparatorForFields; //2.15.1.56 listSeparator (List Separator for Field Code Evaluation)
@@ -67,14 +66,6 @@ struct SettingsTable_Impl
     , m_doNotIncludeSubdocsInStats(false)
     , m_bRecordChanges(false)
     {}
-
-    ListTablePtr GetListTable()
-    {
-    if(!m_pListTable)
-        m_pListTable.reset(
-                   new ListTable( m_rDMapper, m_xTextFactory ));
-    return m_pListTable;
-    }
 };
 
 SettingsTable::SettingsTable(DomainMapper& rDMapper, const uno::Reference< lang::XMultiServiceFactory > xTextFactory) :
@@ -151,14 +142,6 @@ void SettingsTable::sprm(Sprm& rSprm)
     }
     break;
     /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-    case NS_ooxml::LN_CT_Numbering_num: // 92613;
-    /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-    case NS_ooxml::LN_CT_Numbering_abstractNum: //  92612;
-    {
-        m_pImpl->GetListTable()->sprm( rSprm );
-    }
-    break;
-    /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
     case NS_ooxml::LN_CT_Settings_stylePaneFormatFilter: // 92493;
     break;
     /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx
index 6eef483289ec..e4441bcb05fe 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -87,7 +87,7 @@ public:
 typedef boost::shared_ptr<StyleSheetEntry> StyleSheetEntryPtr;
 
 class DomainMapper;
-class WRITERFILTER_DLLPRIVATE StyleSheetTable :
+class StyleSheetTable :
         public Properties,
         public Table
 {