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

Resolves: fdo#70725 calc export to pdf broken

Browse Source 
Change-Id: Ibfe1d3a319fc82223f340ebd705a1966b8250089
This commit is contained in:
Caolán McNamara
2013-10-21 16:49:24 +01:00
parent d4b20d5c99
commit e03e9bfda7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vcl/source/gdi/cvtsvm.cxx
View File

@@ -1705,7 +1705,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
MetaTextArrayAction* pAct = (MetaTextArrayAction*)pAction; MetaTextArrayAction* pAct = (MetaTextArrayAction*)pAction;
OString aText(OUStringToOString(pAct->GetText(), OString aText(OUStringToOString(pAct->GetText(),
rActualCharSet)); rActualCharSet));
OUString aUniText = pAct->GetText().copy( pAct->GetIndex(), pAct->GetLen() ); OUString aUniText = pAct->GetText().copy( pAct->GetIndex(), std::min<sal_Int32>(pAct->GetText().getLength() - pAct->GetIndex(), pAct->GetLen()) );
sal_uLong nAryLen; sal_uLong nAryLen;
sal_uLong nLen = pAct->GetLen(); sal_uLong nLen = pAct->GetLen();
const sal_uLong nTextLen = aText.getLength(); const sal_uLong nTextLen = aText.getLength();

2
vcl/source/gdi/pdfwriter_impl2.cxx
View File

@@ -842,7 +842,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
case( META_TEXT_ACTION ): case( META_TEXT_ACTION ):
{ {
const MetaTextAction* pA = (const MetaTextAction*) pAction; const MetaTextAction* pA = (const MetaTextAction*) pAction;
m_rOuterFace.DrawText( pA->GetPoint(), pA->GetText().copy( pA->GetIndex(), pA->GetLen() ) ); m_rOuterFace.DrawText( pA->GetPoint(), pA->GetText().copy( pA->GetIndex(), std::min<sal_Int32>(pA->GetText().getLength() - pA->GetIndex(), pA->GetLen()) ) );
} }
break; break;