diff -ur icu.org/source/common/ubidi.cpp icu/source/common/ubidi.cpp --- icu.org/source/common/ubidi.cpp 2017-03-07 23:57:46.000000000 +0100 +++ icu/source/common/ubidi.cpp 2017-04-21 22:55:11.352659142 +0200 @@ -2125,6 +2125,14 @@ return DirProp_ON; } +static int +isolatesavailable(UBiDi *pBiDi) { + if (pBiDi->isolates == pBiDi->simpleIsolates) { + return pBiDi->isolateCount < SIMPLE_ISOLATES_COUNT-1; + } + return pBiDi->isolateCount < pBiDi->isolatesSize/sizeof(Isolate)-1; +} + static void resolveImplicitLevels(UBiDi *pBiDi, int32_t start, int32_t limit, @@ -2271,7 +2279,7 @@ /* look for the last char not a BN or LRE/RLE/LRO/RLO/PDF */ for(i=limit-1; i>start&&(DIRPROP_FLAG(dirProps[i])&MASK_BN_EXPLICIT); i--); dirProp=dirProps[i]; - if((dirProp==LRI || dirProp==RLI) && limitlength) { + if((dirProp==LRI || dirProp==RLI) && limitlength && isolatesavailable(pBiDi)) { pBiDi->isolateCount++; pBiDi->isolates[pBiDi->isolateCount].stateImp=stateImp; pBiDi->isolates[pBiDi->isolateCount].state=levState.state; ini/cg-4.1 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-09-18aFocusRect in CheckBoxControl is unusedNoel Grandin
2017-07-19loplugin:constparams in svtoolsNoel Grandin
2017-05-05loplugin:checkunusedparams in svtoolsNoel Grandin
2017-04-25tools: svstream.hxx needs only errcode.hxx & not errinf.hxxChris Sherlock
2017-03-31tdf#82580 tools: rename Rectangle to tools::RectangleMiklos Vajna
2017-03-03Remove redundant 'inline' keywordStephan Bergmann
2017-02-02convert method names in tools::SvRef to be more like our other..Noel Grandin
2016-12-21unwind RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX ImageListCaolán McNamara
2016-11-24vcl: rename Window::Notify to EventNotifyMichael Stahl
2016-11-21loplugin:countusersofdefaultparams in include/svtoolsNoel Grandin
2016-10-21loplugin:expandablemethodds in include/svtoolsNoel Grandin
2016-10-12no EditBrowseBox is loaded from .src anymoreCaolán McNamara
2016-10-11loplugin:unnnecessaryoverride in svtoolsNoel Grandin
2016-10-05Remove _TYPED suffix from tools/link.hxx macrosStephan Bergmann
2016-09-13loplugin:override: No more need for the "MSVC dtor override" workaroundStephan Bergmann
2016-09-05loplugin:countusersofdefaultparamsNoel Grandin
2016-07-15new loplugin unnecessary overrideNoel Grandin
2016-04-13loplugin:passstuffbyref in svtoolsNoel Grandin
2016-04-04loplugin:constantparam in svtoolsNoel Grandin
2016-01-13loplugin:unusedmethods unused return value in include/svtoolsNoel Grandin
2015-11-115th step to remove tools/rtti.hxxOliver Specht
2015-11-10loplugin:nullptr (automatic rewrite)Stephan Bergmann
2015-10-23com::sun::star->css in include/sot to include/typelibNoel Grandin
2015-10-16convert Link<> to typedNoel Grandin
2015-10-16convert Link<> to typedNoel Grandin
2015-10-15simplify the CellController modify Link<> handlingNoel Grandin
2015-10-12Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY codeStephan Bergmann
2015-10-12Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY codeStephan Bergmann
2015-10-12convert Link<> to typedNoel Grandin
2015-08-28make PostUserEvent Link<> typedNoel Grandin
2015-08-26Convert vcl Button Link<> click handler to typed Link<Button*,void>Noel Grandin
2015-08-17make Link<> typedNoel Grandin
2015-08-11loplugin:constantfunctionNoel Grandin
2015-07-30loplugin:unusedmethodsNoel Grandin
2015-07-14loplugin:unusedmethods svtoolsNoel Grandin
2015-06-18Fix typosAndrea Gelmini
2015-06-09loplugin:unnecessaryvirtualsNoel Grandin
2015-06-08loplugin:cstylecast: deal with remaining pointer castsStephan Bergmann
2015-05-28convert GETFOCUS constants to scoped enumNoel Grandin
2015-05-27convert WINDOW_DRAW flags to scoped enumNoel Grandin
2015-04-30Gradually typed LinkStephan Bergmann
2015-04-29mass rewrite Paint(Rect&) to Paint(RenderContext&, Rect&)Tomaž Vajngerl
2015-04-28Merge remote-tracking branch 'origin/feature/vclptr'Michael Meeks
2015-04-22convert EBBF_ constants to scoped enumNoel Grandin
2015-04-22convert BROWSER_ constants to scoped enumNoel Grandin
2015-04-17svtools: convert new to ::Create.Noel Grandin
2015-04-17svx: convert new to ::Create.Noel Grandin
2015-04-10vclwidget: change all vcl::window fields to be wrapped in VclPtrNoel Grandin
2015-04-09svtools: apply vcl::window refcounting changesNoel Grandin
2015-04-09loplugin:staticmethodsNoel Grandin