Re: uwog - r23971 - abiword-plugins/branches/ABI-2-6-0-STABLE/wp/impexp/OpenDocument/imp/xp

Sorry guys, the commit message for plugins was wrong: it always
included 2 log entries, while only 1 backport was done. Since all plugin
backports are done 1 commit at the time, you will only need to look at
the log for the highest revision. All actual backports that were done
were correct.

I just fixed my backport scripts. Sorry for the confusion, and thanks
for sum1 for noticing it.
 
  Marc

On Tue, 2008-05-20 at 17:27 +0200, cvs@abisource.com wrote:
> Author: uwog
> Date: 2008-05-20 17:27:05 +0200 (Tue, 20 May 2008)
> New Revision: 23971
>
> Modified:
> abiword-plugins/branches/ABI-2-6-0-STABLE/wp/impexp/OpenDocument/imp/xp/ODi_TextContent_ListenerState.cpp
> Log:
> Backport:
> ------------------------------------------------------------------------
> r23943 | sum1 | 2008-05-18 16:03:20 +0200 (Sun, 18 May 2008) | 3 lines
>
> Replace a few UT_ASSERT calls to prevent potential crashes in the ODT importer. Please backport.
>
>
> ------------------------------------------------------------------------
> r23944 | sum1 | 2008-05-18 17:29:31 +0200 (Sun, 18 May 2008) | 3 lines
>
> Partial fix for Bug 10872, exported footnotes lose formatting when imported. Please backport.
>
>
> ------------------------------------------------------------------------
>
>
> Modified: abiword-plugins/branches/ABI-2-6-0-STABLE/wp/impexp/OpenDocument/imp/xp/ODi_TextContent_ListenerState.cpp
> ===================================================================
> --- abiword-plugins/branches/ABI-2-6-0-STABLE/wp/impexp/OpenDocument/imp/xp/ODi_TextContent_ListenerState.cpp 2008-05-20 15:26:51 UTC (rev 23970)
> +++ abiword-plugins/branches/ABI-2-6-0-STABLE/wp/impexp/OpenDocument/imp/xp/ODi_TextContent_ListenerState.cpp 2008-05-20 15:27:05 UTC (rev 23971)
> @@ -1027,7 +1027,10 @@
>
> if (pStyleName) {
> pStyle = m_pStyles->getParagraphStyle(pStyleName, m_bOnContentStream);
> - UT_ASSERT(pStyle);
> +
> + if (!pStyle) {
> + pStyle = m_pStyles->getTextStyle(pStyleName, m_bOnContentStream);
> + }
>
> // Damn, use the default style
> if (!pStyle) {
> @@ -1258,7 +1261,10 @@
>
> if (pStyleName) {
> pStyle = m_pStyles->getParagraphStyle(pStyleName, m_bOnContentStream);
> - UT_ASSERT(pStyle);
> +
> + if (!pStyle) {
> + pStyle = m_pStyles->getTextStyle(pStyleName, m_bOnContentStream);
> + }
>
> // Damn, use the default style
> if (!pStyle) {
>
> -----------------------------------------------
> To unsubscribe from this list, send a message to
> abisource-cvs-commit-request@abisource.com with the word
> unsubscribe in the message body.
Received on Tue May 20 17:50:05 2008