diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2004-03-12 12:30:22 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2004-03-12 12:30:22 +0000 |
| commit | 27439155e275ff1b0a84ddd8c2722df5b5a07813 (patch) | |
| tree | 04ab8144705d747f066b1abb9f33000354e4e1bc /editors/openoffice-1.1/files | |
| parent | Really stop looking for tkConfig.sh (sorry, I forgot to add this (diff) | |
build fails sw/source/filter/ww8/ww8scan.cxx debug=true
http://www.openoffice.org/issues/show_bug.cgi?id=23856
Correct patch is:
http://www.openoffice.org/issues/show_bug.cgi?id=24123
Notes
Notes:
svn path=/head/; revision=103774
Diffstat (limited to 'editors/openoffice-1.1/files')
| -rw-r--r-- | editors/openoffice-1.1/files/patch-sw+source+filter+ww8+ww8scan.cxx | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/editors/openoffice-1.1/files/patch-sw+source+filter+ww8+ww8scan.cxx b/editors/openoffice-1.1/files/patch-sw+source+filter+ww8+ww8scan.cxx index 0cfbc156cf11..fad83b3f2be0 100644 --- a/editors/openoffice-1.1/files/patch-sw+source+filter+ww8+ww8scan.cxx +++ b/editors/openoffice-1.1/files/patch-sw+source+filter+ww8+ww8scan.cxx @@ -1,11 +1,16 @@ ---- ../sw/source/filter/ww8/ww8scan.cxx.orig Wed Sep 3 04:12:28 2003 -+++ ../sw/source/filter/ww8/ww8scan.cxx Wed Sep 3 04:12:49 2003 -@@ -163,7 +163,7 @@ - { - ASSERT(mnNoElems && pWwSprmTab, "WW8: empty Array: Don't do that"); - std::sort(mpWwSprmTab, mpWwSprmTab + mnNoElems); --#if OSL_DEBUG_LEVEL > 1 -+#if OSL_DEBUG_LEVEL > 10 // XXX pass compilation with WITH_DEBUG=2 - bool bBroken=false; - rtl::OUString sError; - const C *pIter = mpWwSprmTab; +--- ../sw/source/filter/ww8/ww8scan.cxx.orig 2003-12-17 19:32:50.000000000 +0100 ++++ ../sw/source/filter/ww8/ww8scan.cxx 2004-01-06 06:29:48.000000000 +0100 +@@ -198,8 +198,13 @@ + ++pIter; + } + if (bBroken) ++#if defined( UNX ) && !defined( DBG_UTIL ) ++ DBG_ERROR(rtl::OUStringToOString(sError, RTL_TEXTENCODING_ASCII_US)); ++#else + DbgError(rtl::OUStringToOString(sError, RTL_TEXTENCODING_ASCII_US)); + #endif ++ ++#endif + } + + //Find an entry, return its address if found and 0 if not |