Menu

#2910 MergeDocLineDiffs

Trunk
closed-accepted
nobody
GUI (476)
5
2009-12-26
2009-12-26
Matthias
No

this patch solves bug from ID 2894033 GUI Word Wrap missing text, differences not highlighted
by replaceing CString with String. So now also NULL are given to Stringdiff.

Discussion

  • Matthias

    Matthias - 2009-12-26

    MergeDocLineDiffs7054.patch

     
  • Kimmo Varis

    Kimmo Varis - 2009-12-26

    Looks like good cleanup (CString --> String). Just one nitpick:

    +#include <string.h>
    wrong include, should be:
    +#include "UnicodeString.h"

     
  • Matthias

    Matthias - 2009-12-26

    MergeDocLineDiffs7054a.patch

     
  • Matthias

    Matthias - 2009-12-26

    done

     
  • Kimmo Varis

    Kimmo Varis - 2009-12-26

    > done
    Can't see new attachment or replacement of old one?

     
  • Matthias

    Matthias - 2009-12-26

    it's there 'MergeDocLineDiffs7054a.patch '

     
  • Kimmo Varis

    Kimmo Varis - 2009-12-26

    Committed to SVN trunk:
    Completed: At revision: 7055

    It would be nice to optimize out those resize() calls for strings as they are expensive operations. Would it be possible to just reserve big enough string for once and avoid all that resizing?

     
  • Kimmo Varis

    Kimmo Varis - 2009-12-26
    • status: open --> closed-accepted
     
  • Matthias

    Matthias - 2009-12-26

    so fare I understand it's done
    1.) only for diffs.
    2.) in relation of EOF -style
    3.) seam to be /* Commented out code because GetLineActualLength is buggy*/

    I will see waht is buggy!

     
  • Matthias

    Matthias - 2009-12-26

    I think that is the problem: lineinfo.h Z56
    /** @brief Are the characters DOS EOL bytes? */
    static bool IsDosEol(LPCTSTR sz)
    {
    return ((sz[0]=='\r' && sz[1]=='\n') || (sz[0]=='\n' && sz[1]=='\r'));
    };
    we can have two diff style! (files created by sinumeric).

     
  • Kimmo Varis

    Kimmo Varis - 2009-12-26

    I've no idea what you are writing about. I just suggested to optimize string handling in one function.

     
  • Matthias

    Matthias - 2009-12-26

    You mist me, i was looking why we have such an shit codee.
    here is my solution.
    For one EOL_style it had ben not ok.(Lineinfo.h)

     
  • Matthias

    Matthias - 2009-12-26

    please reopen so I can add my file here.

     
  • Kimmo Varis

    Kimmo Varis - 2009-12-26

    If you start talking about something totally different you should mention that. I cannot read your mind.

    > please reopen so I can add my file here.

    No, it is clearly a something not related to bug fixed in this patch. So it needs to be a new patch item. With explanation.

     

Log in to post a comment.