[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

[René Engelhard]

 patches/dev300/apply                            |    3 +--
 patches/dev300/sw-html-insert-unknown-tags.diff |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 5d7fd4d28ce6d4fffb2d744024a051c93ccd0102
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Sep 3 11:27:55 2010 +0200

    fix sw-html-insert-unknown-tags.diff to build and reenable (Adrien Cunin)
    
    * patches/dev300/apply:
    * patches/dev300/sw-html-insert-unknown-tags.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4394b98..32870ad 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -678,8 +678,7 @@ sw-rtf-num-fix.diff, n#569266, cbosdo
 sw-paste-table.diff, n#564789, cbosdo
 
 # Allows to copy/paste html text which is between 2 unknown tags.
-# FIXME: This one applies, but doesn't build in dev300-m60.
-#sw-html-insert-unknown-tags.diff, i#59064, mloiseleur
+sw-html-insert-unknown-tags.diff, i#59064, mloiseleur
 
 [ CalcFixes ]
 
diff --git a/patches/dev300/sw-html-insert-unknown-tags.diff b/patches/dev300/sw-html-insert-unknown-tags.diff
index 943d45a..f967d06 100644
--- a/patches/dev300/sw-html-insert-unknown-tags.diff
+++ b/patches/dev300/sw-html-insert-unknown-tags.diff
@@ -14,7 +14,7 @@ diff -u -p -r1.43 swhtml.cxx
 +			{
 +				if( !bDocInitalized )
 +					DocumentDetected();
-+				pDoc->Insert( *pPam, aToken, true );
++				pDoc->InsertString( *pPam, aToken, true );
 +
 +				// wenn es noch vorlaefige Absatz-Attribute gibt, der Absatz aber
 +				// nicht leer ist, dann sind die Absatz-Attribute entgueltig.