[Libreoffice-commits] .: 2 commits - sw/source

[Cédric Bosdonnat]

 sw/source/core/bastyp/swcache.cxx            |   28 +++++++++++------------
 sw/source/filter/ww8/docxattributeoutput.cxx |   32 +++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 14 deletions(-)

New commits:
commit 1f377fc64d71d21b71546ac8fa42010bcfa100fe
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date:   Tue May 31 18:39:01 2011 +0200

    Translated debug messages in SwCache

diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx
index b30b59c..84efc95 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -128,34 +128,34 @@ SwCache::~SwCache()
 {
     {
         ByteString sOut( aName ); sOut += '\n';
-        (( sOut += "Anzahl neuer Eintraege:				" )
+        (( sOut += "Number of new entries:                 " )
                     += ByteString::CreateFromInt32( nAppend ))+= '\n';
-        (( sOut += "Anzahl Insert auf freie Plaetze:	" )
+        (( sOut += "Number of insert on free places:       " )
                     += ByteString::CreateFromInt32( nInsertFree ))+= '\n';
-        (( sOut += "Anzahl Ersetzungen:					" )
+        (( sOut += "Number of replacements:                " )
                     += ByteString::CreateFromInt32( nReplace ))+= '\n';
-        (( sOut += "Anzahl Erfolgreicher Get's:			" )
+        (( sOut += "Number of successful Get's:            " )
                     += ByteString::CreateFromInt32( nGetSuccess ))+= '\n';
-        (( sOut += "Anzahl Fehlgeschlagener Get's:		" )
+        (( sOut += "Number of failed Get's:                " )
                     += ByteString::CreateFromInt32( nGetFail ))+= '\n';
-        (( sOut += "Anzahl Umsortierungen (LRU):		" )
+        (( sOut += "Number or reordering (LRU):            " )
                     += ByteString::CreateFromInt32( nToTop ))+= '\n';
-        (( sOut += "Anzahl Loeschungen:					" )
+        (( sOut += "Number of suppressions:                " )
                     += ByteString::CreateFromInt32( nDelete ))+= '\n';
-        (( sOut += "Anzahl Get's ohne Index:			" )
+        (( sOut += "Number of Get's without Index:         " )
                     += ByteString::CreateFromInt32( nGetSeek ))+= '\n';
-        (( sOut += "Anzahl Seek fuer Get ohne Index:	" )
+        (( sOut += "Number of Seek for Get without Index:  " )
                     += ByteString::CreateFromInt32( nAverageSeekCnt ))+= '\n';
-        (( sOut += "Anzahl Flush-Aufrufe:				" )
+        (( sOut += "Number of Flush calls:                 " )
                     += ByteString::CreateFromInt32( nFlushCnt ))+= '\n';
-        (( sOut += "Anzahl geflush'ter Objekte:			" )
+        (( sOut += "Number of flushed objects:             " )
                     += ByteString::CreateFromInt32( nFlushedObjects ))+= '\n';
-        (( sOut += "Anzahl Cache-Erweiterungen:			" )
+        (( sOut += "Number of Cache expansions:            " )
                     += ByteString::CreateFromInt32( nIncreaseMax ))+= '\n';
-        (( sOut += "Anzahl Cache-Verkleinerungen:		" )
+        (( sOut += "Number of Cache reductions:            " )
                     += ByteString::CreateFromInt32( nDecreaseMax ))+= '\n';
 
-        OSL_FAIL( sOut.GetBuffer() );
+        OSL_TRACE( sOut.GetBuffer() );
     }
     Check();
 }
commit 1ef0a9f956f9e63e796e0b939d5f46a4cc8bd17b
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date:   Tue May 31 14:16:25 2011 +0200

    Docx: Fixed order of exported properties in tblPr

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 9f1d40e..bf090f1 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1664,6 +1664,35 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
     // Write the table properties
     m_pSerializer->startElementNS( XML_w, XML_tblPr, FSEND );
 
+    static const sal_Int32 aOrder[] =
+    {
+        FSNS( XML_w, XML_tblStyle ),
+        FSNS( XML_w, XML_tblpPr ),
+        FSNS( XML_w, XML_tblOverlap ),
+        FSNS( XML_w, XML_bidiVisual ),
+        FSNS( XML_w, XML_tblStyleRowBandSize ),
+        FSNS( XML_w, XML_tblStyleColBandSize ),
+        FSNS( XML_w, XML_tblW ),
+        FSNS( XML_w, XML_jc ),
+        FSNS( XML_w, XML_tblCellSpacing ),
+        FSNS( XML_w, XML_tblInd ),
+        FSNS( XML_w, XML_tblBorders ),
+        FSNS( XML_w, XML_shd ),
+        FSNS( XML_w, XML_tblLayout ),
+        FSNS( XML_w, XML_tblCellMar ),
+        FSNS( XML_w, XML_tblLook ),
+        FSNS( XML_w, XML_tblPrChange )
+    };
+
+    // postpone the output so that we can later []
+    // prepend the properties before the run
+    sal_Int32 len = sizeof ( aOrder ) / sizeof( sal_Int32 );
+    uno::Sequence< sal_Int32 > aSeqOrder( len );
+    for ( sal_Int32 i = 0; i < len; i++ )
+        aSeqOrder[i] = aOrder[i];
+
+    m_pSerializer->mark( aSeqOrder );
+
     sal_uInt32 nPageSize = 0;
     bool bRelBoxSize = false;
 
@@ -1720,6 +1749,9 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
                 FSNS( XML_w, XML_type ), "dxa",
                 FSEND );
 
+    // Merge the marks for the ordered elements
+    m_pSerializer->mergeTopMarks( );
+
     m_pSerializer->endElementNS( XML_w, XML_tblPr );
 
     // Write the table grid infos