[ooo-build-commit] .: 2 commits - sw/source

Tue Sep 14 08:08:45 PDT 2010

sw/source/filter/basflt/shellio.cxx |   10 ++++++++++
 sw/source/filter/html/swhtml.cxx    |   16 ++++++++++++++++
 2 files changed, 26 insertions(+)

New commits:
commit 9ec22325aba338803a96a373db97f3f4e2bc2b12
Author: Michel Loiseleur <mloiseleur at linagora.com>
Date:   Tue Sep 14 17:04:28 2010 +0200

    sw-html-insert-unknown-tags.diff: paste html text between 2 unknown tags
    
    i#59064

diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index a15300b..caa655c 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -1237,6 +1237,21 @@ void __EXPORT SwHTMLParser::NextToken( int nToken )
         }
         else if( aUnknownToken.Len() )
         {
+            // Fix i#59064 : Paste content of unknown tags.
+            if (aToken.Len() > 0)
+            {
+                if( !bDocInitalized )
+                    DocumentDetected();
+                pDoc->InsertString( *pPam, aToken );
+
+                // wenn es noch vorlaefige Absatz-Attribute gibt, der Absatz aber
+                // nicht leer ist, dann sind die Absatz-Attribute entgueltig.
+                if( aParaAttrs.Count() )
+                    aParaAttrs.Remove( 0, aParaAttrs.Count() );
+
+                SetAttr();
+            }
+
             // Unbekannte Token im Header werden nur durch ein passendes
             // End-Token, </HEAD> oder <BODY> wieder beendet. Darin wird Text
             // ignoriert.
@@ -1254,6 +1269,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken )
             case HTML_TEXTTOKEN:
                 return;
             default:
+                aUnknownToken.Erase();
                 break;
             }
         }
commit 4b3a488ecb4e6810735825973bb9433249a19fb6
Author: CÃ©dric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Tue Sep 14 16:54:36 2010 +0200

    sw-paste-table.diff: Refresh the cell formatting after pasting in it
    
    n#564789

diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index 6d9b813..909decb 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -209,6 +209,16 @@ ULONG SwReader::Read( const Reader& rOptions )
             else
                 nEndCntnt = nLen - nEndCntnt;
             pPam->GetPoint()->nContent.Assign( pCNd, nEndCntnt );
+
+            const SwStartNode* pTblBoxStart = pCNd->FindTableBoxStartNode();
+            if ( pTblBoxStart )
+            {
+                SwTableBox* pBox = pTblBoxStart->GetTblBox();
+                if ( pBox )
+                {
+                    pDoc->ChkBoxNumFmt( *pBox, TRUE );
+                }
+            }
         }
 
         if( pCrsr )
