Re: msevior - r24504 - in abiword/trunk: plugins/collab/backends/service/xp plugins/collab/core/packet/xp plugins/collab/core/session/xp src/af/gr/gtk src/af/xap/xp src/text/fmt/xp src/text/ptbl/xp src/wp/ap/xp

On Fri, 2008-07-25 at 02:03 +0200, cvs@abisource.com wrote:
> Author: msevior
> Date: 2008-07-25 02:03:12 +0200 (Fri, 25 Jul 2008)
> New Revision: 24504
>
> Modified:
> abiword/trunk/plugins/collab/backends/service/xp/AbiCollabSaveInterceptor.cpp
> abiword/trunk/plugins/collab/core/packet/xp/AbiCollab_Packet.cpp
> abiword/trunk/plugins/collab/core/session/xp/AbiCollab_Export.cpp
> abiword/trunk/plugins/collab/core/session/xp/AbiCollab_Export.h
> abiword/trunk/plugins/collab/core/session/xp/AbiCollab_Import.cpp
> abiword/trunk/src/af/gr/gtk/gr_UnixPangoGraphics.cpp
> abiword/trunk/src/af/xap/xp/xad_Document.cpp
> abiword/trunk/src/af/xap/xp/xad_Document.h
> abiword/trunk/src/text/fmt/xp/fl_BlockLayout.cpp
> abiword/trunk/src/text/fmt/xp/fl_DocLayout.cpp
> abiword/trunk/src/text/fmt/xp/fl_DocListener.cpp
> abiword/trunk/src/text/fmt/xp/fp_Run.cpp
> abiword/trunk/src/text/fmt/xp/fp_Run.h
> abiword/trunk/src/text/ptbl/xp/pd_Document.cpp
> abiword/trunk/src/text/ptbl/xp/pd_Document.h
> abiword/trunk/src/text/ptbl/xp/pp_AttrProp.cpp
> abiword/trunk/src/text/ptbl/xp/pt_PieceTable.cpp
> abiword/trunk/src/text/ptbl/xp/pt_PieceTable.h
> abiword/trunk/src/text/ptbl/xp/pt_Types.h
> abiword/trunk/src/text/ptbl/xp/pt_VarSet.cpp
> abiword/trunk/src/wp/ap/xp/ap_Dialog_MarkRevisions.cpp
> Log:
> Code to implement document properties changes across abicollab. Starting with revision marks.
>

Two questions (see below):

> Modified: abiword/trunk/src/af/gr/gtk/gr_UnixPangoGraphics.cpp
> ===================================================================
> --- abiword/trunk/src/af/gr/gtk/gr_UnixPangoGraphics.cpp 2008-07-23 23:01:46 UTC (rev 24503)
> +++ abiword/trunk/src/af/gr/gtk/gr_UnixPangoGraphics.cpp 2008-07-25 00:03:12 UTC (rev 24504)
> @@ -2033,6 +2033,14 @@
> for(i = 0; i < RI.m_iLength; ++i, ++(*(RI.m_pText)))
> {
> UT_return_val_if_fail(RI.m_pText->getStatus() == UTIter_OK, 0);
> + if(isSymbol())
> + {
> + utf8 += adobeToUnicode(RI.m_pText->getChar());
> + }
> + else if(isDingbat())
> + {
> + utf8 += adobeDingbatsToUnicode(RI.m_pText->getChar());
> + }
> utf8 += RI.m_pText->getChar();
> }
>
> @@ -2093,6 +2101,14 @@
> for(i = 0; i < RI.m_iLength; ++i, ++(*(RI.m_pText)))
> {
> UT_return_if_fail(RI.m_pText->getStatus() == UTIter_OK);
> + if(isSymbol())
> + {
> + utf8 += adobeToUnicode(RI.m_pText->getChar());
> + }
> + else if(isDingbat())
> + {
> + utf8 += adobeDingbatsToUnicode(RI.m_pText->getChar());
> + }
> utf8 += RI.m_pText->getChar();
> }
>
> @@ -2157,7 +2173,7 @@
> UT_return_if_fail(m_pXftDraw);
>
> UT_UTF8String utf8;
> -
> + xxx_UT_DEBUGMSG(("isDingBat %d \n",isDingbat()));
> if(isSymbol())
> {
> for(int i = iCharOffset; i < iCharOffset + iLength; ++i)

1. Should this ^^^ have gone in? It doesn't look related. If not, what
does it fix, and do we want it ?

2. Did you test this with a collaboration session? Afaics from looking
at the code, it should work; I'm surprised that we don't need to break
the protocol for this.

  Marc
Received on Mon Aug 4 12:09:13 2008