mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Character conversion: do not destroy sequence while iterating on it

Browse Source 
Change-Id: Ib77e15b776384cc75880a907a6425c6105bc3fab
Reviewed-on: https://gerrit.libreoffice.org/1636
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
Matteo Casalin
2013-01-07 22:20:59 +01:00
committed by Michael Stahl
parent bbab2d8659
commit a0477d9916
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sw/source/core/txtnode/txtedt.cxx
View File

@@ -74,6 +74,7 @@
#include <com/sun/star/i18n/TransliterationModulesExtra.hpp> #include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
#include <vector> #include <vector>
#include <utility>
using rtl::OUString; using rtl::OUString;
using namespace ::com::sun::star; using namespace ::com::sun::star;
@@ -1073,6 +1074,12 @@ sal_uInt16 SwTxtNode::Convert( SwConversionArgs &rArgs )
{ {
SwLanguageIterator aIter( *this, nBegin ); SwLanguageIterator aIter( *this, nBegin );
// Implicit changes require setting new attributes, which in turn destroys
// the attribute sequence on which aIter iterates. We store the necessary
// coordinates and apply those changes after iterating through the text.
typedef std::pair<xub_StrLen, xub_StrLen> ImplicitChangesRange;
std::vector<ImplicitChangesRange> aImplicitChanges;
// find non zero length text portion of appropriate language // find non zero length text portion of appropriate language
do { do {
nLangFound = aIter.GetLanguage(); nLangFound = aIter.GetLanguage();
@@ -1108,13 +1115,22 @@ sal_uInt16 SwTxtNode::Convert( SwConversionArgs &rArgs )
if (!bIsAsianScript && rArgs.bAllowImplicitChangesForNotConvertibleText) if (!bIsAsianScript && rArgs.bAllowImplicitChangesForNotConvertibleText)
{ {
SetLanguageAndFont( aCurPaM, // Store for later use
rArgs.nConvTargetLang, RES_CHRATR_CJK_LANGUAGE, aImplicitChanges.push_back(ImplicitChangesRange(nBegin, nBegin+nLen));
rArgs.pTargetFont, RES_CHRATR_CJK_FONT );
} }
nBegin = nChPos; // start of next language portion nBegin = nChPos; // start of next language portion
} }
} while (!bFound && aIter.Next()); /* loop while nothing was found and still sth is left to be searched */ } while (!bFound && aIter.Next()); /* loop while nothing was found and still sth is left to be searched */
// Apply implicit changes, if any, now that aIter is no longer used
for (size_t i = 0; i < aImplicitChanges.size(); ++i)
{
SwPaM aPaM( *this, aImplicitChanges[i].first );
aPaM.SetMark();
aPaM.GetPoint()->nContent = aImplicitChanges[i].second;
SetLanguageAndFont( aPaM, rArgs.nConvTargetLang, RES_CHRATR_CJK_LANGUAGE, rArgs.pTargetFont, RES_CHRATR_CJK_FONT );
}
} }
// keep resulting text within selection / range of text to be converted // keep resulting text within selection / range of text to be converted