Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 24244 → Rev 24243

/trunk/Scribus/scribus/text/scworditerator.cpp
23,11 → 23,6
delete m_wordIterator;
m_wordIterator = nullptr;
}
if (m_unicodeString)
{
delete m_unicodeString;
m_unicodeString = nullptr;
}
}
 
BreakIterator* ScWordIterator::getWordIterator()
44,13 → 39,7
return nullptr;
}
if (m_unicodeString)
{
delete m_unicodeString;
m_unicodeString = nullptr;
}
m_unicodeString = new icu::UnicodeString((const UChar*) m_story.plainText().utf16());
m_wordIterator->setText(*m_unicodeString);
m_wordIterator->setText((const UChar*) m_story.plainText().utf16());
return m_wordIterator;
}
 
/trunk/Scribus/scribus/text/scworditerator.h
16,7 → 16,6
 
U_NAMESPACE_BEGIN
class BreakIterator;
class UnicodeString;
U_NAMESPACE_END
 
class SCRIBUS_API ScWordIterator
33,7 → 32,6
QString word(int pos);
private:
icu::UnicodeString* m_unicodeString { nullptr };
icu::BreakIterator* m_wordIterator { nullptr };
StoryText& m_story;