Skip to content

Address bug #126768 #402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ardovm merged 2 commits into from
Dec 8, 2025
Merged

Address bug #126768 #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
228d609
XMLTextFrameContext::EndElement() applies all properties to the ``win…
ardovm Aug 30, 2025
5f25d23
Do not assume that mvGlyph2Char and mvChar2BaseGlyph are the same size
ardovm Dec 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion main/vcl/source/glyphs/graphite_layout.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,7 +1048,11 @@ void GraphiteLayout::expandOrCondense(ImplLayoutArgs &rArgs)
size_t nCharIndex = mvGlyph2Char[i];
mvCharDxs[nCharIndex] += nOffset;
// adjust char dxs for rest of characters in cluster
while (++nCharIndex < mvGlyph2Char.size())
// Bug #126768: vectors mvGlyph2Char and mvChar2BaseGlyph may have different sizes
size_t nMaxCharIndex = mvGlyph2Char.size();
if ( nMaxCharIndex > mvChar2BaseGlyph.size() )
nMaxCharIndex = mvChar2BaseGlyph.size();
while ( ++nCharIndex < nMaxCharIndex )
{
int nChar2Base = (mvChar2BaseGlyph[nCharIndex] == -1)? -1 : (int)(mvChar2BaseGlyph[nCharIndex] & GLYPH_INDEX_MASK);
if (nChar2Base == -1 || nChar2Base == static_cast<int>(i))
Expand Down
14 changes: 10 additions & 4 deletions main/xmloff/source/text/XMLTextFrameContext.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1477,17 +1477,17 @@ void XMLTextFrameContext::EndElement()
{
/// solve if multiple image child contexts were imported
/// the winner is returned, if something has yet to be done with it
const SvXMLImportContext* pWinner = solveMultipleImages();
SvXMLImportContext* pWinner = const_cast< SvXMLImportContext* >( solveMultipleImages() );

// #123261# see if the winner is a XMLTextFrameContext_Impl
const XMLTextFrameContext_Impl* pImplWinner = dynamic_cast< const XMLTextFrameContext_Impl* >(pWinner);
XMLTextFrameContext_Impl* pImplWinner = dynamic_cast< XMLTextFrameContext_Impl* >(pWinner);

if(pImplWinner)
{
// #123261# if yes, set name now, after the winner is identified (setting at each
// candidate may run into problems due to colliding with efforts in the target to
// avoid double names, so only set one name at one image and not at each)
const_cast< XMLTextFrameContext_Impl* >(pImplWinner)->SetNameForFrameFromPropSet();
pImplWinner->SetNameForFrameFromPropSet();
}

SvXMLImportContext *pContext = &m_xImplContext;
Expand All @@ -1496,11 +1496,17 @@ void XMLTextFrameContext::EndElement()
if( pImpl )
{
pImpl->CreateIfNotThere();

}
// --> OD 2009-07-22 #i73249#
// // alternative text
// if( m_sDesc.getLength() )
// pImpl->SetDesc( m_sDesc );

// Bug #126768: set all properties to the winner
if ( pImplWinner ) {
pImpl = pImplWinner;
}
if ( pImpl ) {
// svg:title
if( m_sTitle.getLength() )
{
Expand Down