[ooo-build-commit] .: 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 454ce89cd3f799657c34136cbfd53b187a4fa5b8
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)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0de0685..a4b23d1 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -596,8 +596,7 @@ sw-preserve-char-style-on-reset-format.diff, i#47893, alvarezp2000
 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 81d4d15..110ed23 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.