[Libreoffice-commits] .: Branch 'integration/dev300_m98' - writerfilter/source

[Norbert Thiebaud]

 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |    1 -
 writerfilter/source/dmapper/PropertyMapHelper.hxx        |    3 +--
 writerfilter/source/dmapper/StyleSheetTable.cxx          |    1 -
 writerfilter/source/ooxml/OOXMLDocumentImpl.hxx          |    2 --
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx    |    3 +--
 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx    |    3 +++
 6 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 1dd4521604845b8564c633d0848c4bd7b60215f8
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Mar 7 21:20:59 2011 -0600

    fix mis-merge in writerfilter

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 40a09a1..b6c3bd2 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -421,7 +421,6 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
         {
             aTableBorder.TopLine = aBorderLine;
             aTableBorder.IsTopLineValid = sal_True;
-                rInfo.pTableDefaults->erase( pIt );
         }
         if (lcl_extractTableBorderProperty(m_aTableProperties, PROP_BOTTOM_BORDER, rInfo, aBorderLine))
         {
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.hxx b/writerfilter/source/dmapper/PropertyMapHelper.hxx
index dd54a83..1de1f30 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.hxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.hxx
@@ -41,7 +41,6 @@ namespace writerfilter
 namespace dmapper
 {
 
-<<<<<<< HEAD:binfilter/bf_sfx2/source/inc/eacopier.hxx
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 =======
 XMLTag::Pointer_t lcl_TableColumnSeparatorsToTag(const uno::Any & rTableColumnSeparators);
@@ -55,4 +54,4 @@ XMLTag::Pointer_t lcl_PropertyValueSeqSeqToTag(PropertyValueSeqSeq_t & rPropValS
 }
 }
 #endif // DEBUG
->>>>>>> stage/ooo/dev300_m98_fixed:writerfilter/source/dmapper/PropertyMapHelper.hxx
+
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 5c58a48..fcf956e 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -567,7 +567,6 @@ void StyleSheetTable::sprm(Sprm & rSprm)
         break;
         case NS_ooxml::LN_CT_Style_tblPr: //contains table properties
         case NS_ooxml::LN_CT_Style_tblStylePr: //contains  to table properties
-        case NS_ooxml::LN_CT_DocDefaults_rPrDefault:
         case NS_ooxml::LN_CT_TblPrBase_tblInd: //table properties - at least width value and type
         case NS_ooxml::LN_EG_RPrBase_rFonts: //table fonts
         /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
index 6767b2f..8ad4615 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
@@ -52,8 +52,6 @@ class OOXMLDocumentImpl : public OOXMLDocument
 
     bool mbIsSubstream;
 
-    bool mbIsSubstream;
-
 protected:
     virtual void resolveFastSubStream(Stream & rStream,
                                       OOXMLStream::StreamType_t nType);
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index db03ff8..4fcb01f 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1217,8 +1217,7 @@ uno::Reference< uno::XComponentContext >
 OOXMLFastContextHandler::getComponentContext()
 {
     return m_xContext;
-  class OOXMLFastContextHandlerStream
- */
+}
 
 OOXMLFastContextHandlerStream::OOXMLFastContextHandlerStream
 (OOXMLFastContextHandler * pContext)
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index ace1ab9..63efee6 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -377,6 +377,9 @@ protected:
  };
  
 class OOXMLFastContextHandlerValue :
+    public OOXMLFastContextHandler
+{
+public:
     OOXMLFastContextHandlerValue
     (OOXMLFastContextHandler * pContext);
     virtual ~OOXMLFastContextHandlerValue();