diff options
| author | maho <maho@FreeBSD.org> | 2004-03-12 20:30:22 +0800 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2004-03-12 20:30:22 +0800 |
| commit | 4da7d0868b205ed8f91b1a5a71f42c0ddae56c05 (patch) | |
| tree | ace7f30a83cc24e432a1e7ce3e6bb91de8f68c0d | |
| parent | d51b72eaa89f69f6f2c1bb2518d2cc75765b44ee (diff) | |
| download | freebsd-ports-gnome-4da7d0868b205ed8f91b1a5a71f42c0ddae56c05.tar.gz freebsd-ports-gnome-4da7d0868b205ed8f91b1a5a71f42c0ddae56c05.tar.zst freebsd-ports-gnome-4da7d0868b205ed8f91b1a5a71f42c0ddae56c05.zip | |
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
4 files changed, 64 insertions, 44 deletions
diff --git a/editors/openoffice-1.1-devel/files/patch-sw+source+filter+ww8+ww8scan.cxx b/editors/openoffice-1.1-devel/files/patch-sw+source+filter+ww8+ww8scan.cxx index 0cfbc156cf11..fad83b3f2be0 100644 --- a/editors/openoffice-1.1-devel/files/patch-sw+source+filter+ww8+ww8scan.cxx +++ b/editors/openoffice-1.1-devel/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 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 diff --git a/editors/openoffice.org-1.1-devel/files/patch-sw+source+filter+ww8+ww8scan.cxx b/editors/openoffice.org-1.1-devel/files/patch-sw+source+filter+ww8+ww8scan.cxx index 0cfbc156cf11..fad83b3f2be0 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-sw+source+filter+ww8+ww8scan.cxx +++ b/editors/openoffice.org-1.1-devel/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 diff --git a/editors/openoffice.org-1.1/files/patch-sw+source+filter+ww8+ww8scan.cxx b/editors/openoffice.org-1.1/files/patch-sw+source+filter+ww8+ww8scan.cxx index 0cfbc156cf11..fad83b3f2be0 100644 --- a/editors/openoffice.org-1.1/files/patch-sw+source+filter+ww8+ww8scan.cxx +++ b/editors/openoffice.org-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 |