diff options
| author | Rene Engelhard <rene@debian.org> | 2010-09-03 11:27:55 +0200 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2010-09-03 11:33:43 +0200 |
| commit | 5d7fd4d28ce6d4fffb2d744024a051c93ccd0102 (patch) | |
| tree | 0796fb92544761848b31904e436a64593acb72fd | |
| parent | 095bd05ee8a5b9d33dedba9db2e5c93aa701d5f7 (diff) | |
fix sw-html-insert-unknown-tags.diff to build and reenable (Adrien Cunin)
* patches/dev300/apply:
* patches/dev300/sw-html-insert-unknown-tags.diff:
| -rw-r--r-- | patches/dev300/apply | 3 | ||||
| -rw-r--r-- | patches/dev300/sw-html-insert-unknown-tags.diff | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/patches/dev300/apply b/patches/dev300/apply index 4394b98aa..32870ad49 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 943d45ad3..f967d066b 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. |