Re: riverae - r21691 - in abiword/branches/RiveraESoC/src: af/xap/xp text/fmt/xp wp/ap/unix wp/ap/xp

Yup, they are commented.

The problem was I was working exactly on the same functionalities as
Martin was, but it took me longer to try to commit.

I solved the conflicts, trying to make it fast before some other
conflicting code was committed again.

Now I am trying to us some code I wrote and is now commented with
Martin's implementation.

Cheers,

Ernesto

On 2007年08月09日, at 0:15, J.M. Maurer wrote:

>
> On Wed, 2007-08-08 at 14:45 +0200, cvs@abisource.com wrote:
>>
>> +/*<<<<<<< .mine TODO check
>> + // RIVERA kill annotation preview on change of mouse context
>> + if ((m_prevMouseContext != EV_EMC_HYPERLINK) &&
>> + (m_bAnnotationPreviewActive==true) &&
>> + (m_pAnnotationPview != NULL))
>> + {
>> + UT_DEBUGMSG(("getMouseContext: Deleting annotation
>> preview...\n"));
>> + killAnnotationPreview();
>> + }
>> +
>> +=======*/
>
> There still seem to be quite some merge errors committed (even though
> they are comments)
>
> Marc
>
Received on Thu Aug 9 02:30:07 2007