[Libreoffice-commits] .: 5 commits - writerfilter/inc writerfilter/source

[Lubos Lunak]

 writerfilter/inc/resourcemodel/util.hxx                  |    4 ++--
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |    6 +++---
 writerfilter/source/dmapper/PropertyMap.cxx              |    2 +-
 writerfilter/source/dmapper/PropertyMap.hxx              |    2 +-
 writerfilter/source/ooxml/model.xml                      |    6 ------
 5 files changed, 7 insertions(+), 13 deletions(-)

New commits:
commit 0080c4c21926b56df0ca0f84e926e15ac005bcc4
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Jul 21 17:01:42 2011 +0200

    remove duplicate definitions for w:sdt and w:sdtContent (bnc#705949)
    
    The duplicates are merged somehow (and thus it doesn't work).

diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 742d5b3..bdc4fcf 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -22709,12 +22709,6 @@
       <element name="sdtEndPr" tokenid="ooxml:CT_SdtEndPr"/>
       <element name="sdtContent" tokenid="ooxml:CT_SdtContentRun"/>
     </resource>
-    <resource name="CT_SdtBlock" resource="Properties">
-      <element name="sdtPr" tokenid="ooxml:CT_SdtPr"/>
-      <element name="sdtEndPr" tokenid="ooxml:CT_SdtEndPr"/>
-      <element name="sdtContent" tokenid="ooxml:CT_SdtContentBlock"/>
-    </resource>
-    <resource name="CT_SdtContentBlock" resource="Properties"/>
     <resource name="EG_PContent" resource="Properties" tag="content">
       <element name="fldSimple" tokenid="ooxml:EG_PContent_fldSimple"/>
       <element name="hyperlink" tokenid="ooxml:EG_PContent_hyperlink"/>
commit c0355aabf6e183919a78511c33b138222d89d918
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Wed Jul 13 15:55:16 2011 +0200

    proper #ifdef for dumpXml()

diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 18b0ef3..866a3a5 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -161,7 +161,7 @@ void PropertyMap::Insert( PropertyIds eId, bool bIsTextProperty, const uno::Any&
     Invalidate();
 }
 
-#ifdef DEBUG_DOMAINMAPPER
+#if OSL_DEBUG_LEVEL > 1
 void PropertyMap::dumpXml( const TagLogger::Pointer_t pLogger ) const
 {
     pLogger->startElement("PropertyMap");
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index cac273e..39064a8 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -132,7 +132,7 @@ public:
 
     virtual void insertTableProperties( const PropertyMap* );
 
-#ifdef DEBUG_DOMAINMAPPER
+#if OSL_DEBUG_LEVEL > 1
     virtual void dumpXml( const TagLogger::Pointer_t pLogger ) const;
 #endif
     
commit bbe620ad35c1900177ba77797ffc4dc0cbbba506
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Wed Jul 13 15:53:38 2011 +0200

    export needed symbols from a lib

diff --git a/writerfilter/inc/resourcemodel/util.hxx b/writerfilter/inc/resourcemodel/util.hxx
index 5bfd15b..c112198 100644
--- a/writerfilter/inc/resourcemodel/util.hxx
+++ b/writerfilter/inc/resourcemodel/util.hxx
@@ -44,8 +44,8 @@ namespace writerfilter
     string WRITERFILTER_RESOURCEMODEL_DLLPUBLIC propertysetToString
     (uno::Reference<beans::XPropertySet> const & rProps);
     
-    string toString(uno::Reference< text::XTextRange > textRange);
-    string toString(const string & rString);
+    string WRITERFILTER_RESOURCEMODEL_DLLPUBLIC toString(uno::Reference< text::XTextRange > textRange);
+    string WRITERFILTER_RESOURCEMODEL_DLLPUBLIC toString(const string & rString);
 #endif
 }
 #endif // INCLUDED_RESOURCEMODEL_UTIL_HXX
commit 604615b5d099fdd0a70484776e3a984b137ec322
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Wed Jul 13 15:13:37 2011 +0200

     #if -> #ifdef for conditional compilation

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index e2d9ccd..4ee042b 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -747,7 +747,7 @@ void DomainMapperTableHandler::startRow(unsigned int nCells,
     m_aRowProperties.push_back( pProps );
     m_aCellProperties.push_back( PropertyMapVector1() );
     
-#if DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->startElement("table.row");
     dmapper_logger->attribute("cells", nCells);
     if (pProps != NULL)
@@ -782,7 +782,7 @@ void DomainMapperTableHandler::startCell(const Handle_t & start,
         m_aCellProperties[nRow - 1].push_back( pEmptyProps );
     }
     
-#if DEBUG_DMAPPER_TABLE_HANDLER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->startElement("table.cell");
     dmapper_logger->startElement("table.cell.start");
     dmapper_logger->chars(toString(start));
commit cfbedd3b2f0b174f5669c750bf8b7e240b659696
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Wed Jul 13 12:03:33 2011 +0200

    avoid iterator retreating before the start of an empty list

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 91c3c75..e2d9ccd 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -504,7 +504,6 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
         //aRowOfCellsIterator points to a vector of PropertyMapPtr
         PropertyMapVector1::const_iterator aCellIterator = aRowOfCellsIterator->begin();
         PropertyMapVector1::const_iterator aCellIteratorEnd = aRowOfCellsIterator->end();
-        PropertyMapVector1::const_iterator aLastCellIterator = aRowOfCellsIterator->end() - 1;
         
         // Get the row style properties
         sal_Int32 nRowStyleMask = sal_Int32( 0 );
@@ -531,6 +530,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
         {
             PropertyMapPtr pAllCellProps( new PropertyMap );
             
+            PropertyMapVector1::const_iterator aLastCellIterator = aRowOfCellsIterator->end() - 1;
             bool bIsEndCol = aCellIterator == aLastCellIterator;
             bool bIsEndRow = aRowOfCellsIterator == aLastRowIterator;