[ooo-build-commit] .: 2 commits - patches/dev300

Tue Sep 14 08:08:18 PDT 2010

patches/dev300/apply                            |    6 ---
 patches/dev300/sw-html-insert-unknown-tags.diff |   37 ------------------------
 patches/dev300/sw-paste-table.diff              |   28 ------------------
 3 files changed, 71 deletions(-)

New commits:
commit a2d2c4e6718299589188bcbd58424bd35b34d810
Author: CÃ©dric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Tue Sep 14 17:06:42 2010 +0200

    sw-html-insert-unknown-tags.diff: moved to git repos

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a0b554c..934af8e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -540,9 +540,6 @@ sw-ww8-field-fix.diff, i#61075, i#89667, i#11684 cbosdo
 # Upstreamed in cbosdo06
 sw-ww8-styles-import-fix.diff, i#21939, cbosdo
 
-# Allows to copy/paste html text which is between 2 unknown tags.
-sw-html-insert-unknown-tags.diff, i#59064, mloiseleur
-
 [ CalcFixes ]
 
 # Replace usability numb Zoom dialog with a Combo Box
diff --git a/patches/dev300/sw-html-insert-unknown-tags.diff b/patches/dev300/sw-html-insert-unknown-tags.diff
deleted file mode 100644
index 38656f3..0000000
--- a/patches/dev300/sw-html-insert-unknown-tags.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: sw/source/filter/html/swhtml.cxx
-===================================================================
-RCS file: /cvs/sw/sw/source/filter/html/swhtml.cxx,v
-retrieving revision 1.43
-diff -u -p -r1.43 swhtml.cxx
---- sw/source/filter/html/swhtml.cxx	27 Sep 2007 09:51:55 -0000	1.43
-+++ sw/source/filter/html/swhtml.cxx	17 Dec 2007 16:26:18 -0000
-@@ -1348,6 +1348,21 @@ void __EXPORT SwHTMLParser::NextToken( i
- 		}
- 		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.
-@@ -1365,6 +1380,7 @@ void __EXPORT SwHTMLParser::NextToken( i
- 			case HTML_TEXTTOKEN:
- 				return;
- 			default:
-+                aUnknownToken.Erase();
- 				break;
- 			}
- 		}
commit 0bd4573b26d26d98de27e5cbe21db65a45f6b3ac
Author: CÃ©dric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Tue Sep 14 17:06:20 2010 +0200

    sw-paste-table.diff: moved to git repos

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3b5b977..a0b554c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -540,9 +540,6 @@ sw-ww8-field-fix.diff, i#61075, i#89667, i#11684 cbosdo
 # Upstreamed in cbosdo06
 sw-ww8-styles-import-fix.diff, i#21939, cbosdo
 
-# Refresh the cell formatting after pasting in it
-sw-paste-table.diff, n#564789, cbosdo
-
 # Allows to copy/paste html text which is between 2 unknown tags.
 sw-html-insert-unknown-tags.diff, i#59064, mloiseleur
 
diff --git a/patches/dev300/sw-paste-table.diff b/patches/dev300/sw-paste-table.diff
deleted file mode 100644
index 984a7ca..0000000
--- a/patches/dev300/sw-paste-table.diff
+++ /dev/null
@@ -1,28 +0,0 @@
----
- sw/source/filter/basflt/shellio.cxx |   10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git sw/source/filter/basflt/shellio.cxx sw/source/filter/basflt/shellio.cxx
-index 6d9b813..909decb 100644
---- sw/source/filter/basflt/shellio.cxx
-+++ 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 )
--- 
-1.7.0.1
-
