unoedprx.cxx (4d7c9de0) | unoedprx.cxx (3ea0c3d5) |
---|---|
1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 494 unchanged lines hidden (view full) --- 503 "SvxAccessibleTextIndex::GetText: index value overflow"); 504 505 sStr = sStr.Copy(0, static_cast< sal_uInt16 > (sStr.Len() - (aEndIndex.GetFieldLen() - aEndIndex.GetFieldOffset())) ); 506 } 507 508 EBulletInfo aBulletInfo1 = GetBulletInfo( static_cast< sal_uInt16 >(aStartIndex.GetParagraph()) ); 509 EBulletInfo aBulletInfo2 = GetBulletInfo( static_cast< sal_uInt16 >(aEndIndex.GetParagraph()) ); 510 | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 494 unchanged lines hidden (view full) --- 503 "SvxAccessibleTextIndex::GetText: index value overflow"); 504 505 sStr = sStr.Copy(0, static_cast< sal_uInt16 > (sStr.Len() - (aEndIndex.GetFieldLen() - aEndIndex.GetFieldOffset())) ); 506 } 507 508 EBulletInfo aBulletInfo1 = GetBulletInfo( static_cast< sal_uInt16 >(aStartIndex.GetParagraph()) ); 509 EBulletInfo aBulletInfo2 = GetBulletInfo( static_cast< sal_uInt16 >(aEndIndex.GetParagraph()) ); 510 |
511 // MT: This was done in OOo, commented out in IA2 CWS... 512 /* 513 if( aStartIndex.InBullet() ) 514 { 515 // prepend leading bullet 516 String sBullet = aBulletInfo1.aText; 517 518 DBG_ASSERT(aStartIndex.GetBulletOffset() >= 0 && 519 aStartIndex.GetBulletOffset() <= USHRT_MAX, 520 "SvxAccessibleTextIndex::GetText: index value overflow"); 521 522 sBullet.Erase(0, static_cast< sal_uInt16 > (aStartIndex.GetBulletOffset()) ); 523 524 sBullet += sStr; 525 sStr = sBullet; 526 }*/ | |
527 if( aEndIndex.InBullet() ) 528 { 529 // append trailing bullet 530 sStr += aBulletInfo2.aText;; 531 532 DBG_ASSERT(sStr.Len() - (aEndIndex.GetBulletLen() - aEndIndex.GetBulletOffset()) >= 0 && 533 sStr.Len() - (aEndIndex.GetBulletLen() - aEndIndex.GetBulletOffset()) <= USHRT_MAX, 534 "SvxAccessibleTextIndex::GetText: index value overflow"); --- 785 unchanged lines hidden --- | 511 if( aEndIndex.InBullet() ) 512 { 513 // append trailing bullet 514 sStr += aBulletInfo2.aText;; 515 516 DBG_ASSERT(sStr.Len() - (aEndIndex.GetBulletLen() - aEndIndex.GetBulletOffset()) >= 0 && 517 sStr.Len() - (aEndIndex.GetBulletLen() - aEndIndex.GetBulletOffset()) <= USHRT_MAX, 518 "SvxAccessibleTextIndex::GetText: index value overflow"); --- 785 unchanged lines hidden --- |