← Back to branch summary

~ubuntu-branches/ubuntu/maverick/anjuta-extras/maverick

« back to all changes in this revision

Viewing changes to plugins/scintilla/scintilla/PositionCache.cxx

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge, Luca Bruno, Sebastian Dröge
  • Date: 2010-04-11 16:07:33 UTC
  • mfrom: (1.1.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20100411160733-39gyr39iv8d071qm
Tags: 2.30.0-1
http://bugs.debian.org/572254
[ Luca Bruno ]
* New upstream release.
* debian/copyright:
  - Mention all authors and copyright notices. (Closes: #572254)
* debian/control.in:
  - Bump libgtk2.0-dev build-depend to 2.17.10 and libanjuta-dev to
    2.30.0.
  - Depend on libanjuta 2.30.0.
  - Update Standards-Version to 3.8.4, no changes needed.
* debian/patches/01_libtool_avoid_version.patch,
  debian/patches/90_relibtoolize.patch:
  - Removed, applied upstream.
* debian/patches/20_pathmax-hurd.patch:
  - Added, use either our my_getline or glibc getline.
* Switch to source format 3.0 (quilt).
  - Add debian/source/format.
  - Drop quilt from Build-Depends.
  - Remove /usr/share/cdbs/1/rules/simple-patchsys.mk include.

[ Sebastian Dröge ]
* debian/control.in:
  + Build depend on libanjuta-dev >= 2:2.30.0.0-2 for the fixed
    shlibs file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/scintilla/scintilla/PositionCache.cxx
386
386
        return -1;
387
387
}
388
388
 
389
 
BreakFinder::BreakFinder(LineLayout *ll_, int lineStart_, int lineEnd_, int posLineStart_, bool utf8_, int xStart) :
 
389
BreakFinder::BreakFinder(LineLayout *ll_, int lineStart_, int lineEnd_, int posLineStart_, bool utf8_, int xStart, bool breakForSelection) :
390
390
        ll(ll_),
391
391
        lineStart(lineStart_),
392
392
        lineEnd(lineEnd_),
412
412
                nextBreak--;
413
413
        }
414
414
 
415
 
        SelectionSegment segmentLine(SelectionPosition(posLineStart), SelectionPosition(posLineStart + lineEnd));
416
 
        for (size_t r=0; r<ll->psel->Count(); r++) {
417
 
                SelectionSegment portion = ll->psel->Range(r).Intersect(segmentLine);
418
 
                if (portion.start.IsValid())
419
 
                        Insert(portion.start.Position() - posLineStart - 1);
420
 
                if (portion.end.IsValid())
421
 
                        Insert(portion.end.Position() - posLineStart - 1);
 
415
        if (breakForSelection) {
 
416
                SelectionPosition posStart(posLineStart);
 
417
                SelectionPosition posEnd(posLineStart + lineEnd);
 
418
                SelectionSegment segmentLine(posStart, posEnd);
 
419
                for (size_t r=0; r<ll->psel->Count(); r++) {
 
420
                        SelectionSegment portion = ll->psel->Range(r).Intersect(segmentLine);
 
421
                        if (!(portion.start == portion.end)) {
 
422
                                if (portion.start.IsValid())
 
423
                                        Insert(portion.start.Position() - posLineStart - 1);
 
424
                                if (portion.end.IsValid())
 
425
                                        Insert(portion.end.Position() - posLineStart - 1);
 
426
                        }
 
427
                }
422
428
        }
423
429
 
424
430
        Insert(ll->edgeColumn - 1);