strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS impress111 (1.94.20); FILE MERGED

Browse source 
2006/10/30 18:14:14 sj 1.94.20.1: #i39516# added patch, Closing parentasis misplaced on export to ppt
This commit is contained in:
Kurt Zenker 2006-12-12 15:04:47 +00:00
parent d5c790b480
commit d6fb1dbeb6
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sd/source/filter/eppt/epptso.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: epptso.cxx,v $
*
* $Revision: 1.94 $
* $Revision: 1.95 $
*
* last change: $Author: obo $ $Date: 2006-10-13 11:12:15 $
* last change: $Author: kz $ $Date: 2006-12-12 16:04:47 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -1805,6 +1805,7 @@ PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text
{
String aString( rXTextRange->getString() );
String aURL;
BOOL bRTL_endingParen = FALSE;
mnTextSize = aString.Len();
if ( bLast )
@ -1853,8 +1854,15 @@ PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text
}
else
{
mpText = new sal_uInt16[ mnTextSize ];
const sal_Unicode* pText = aString.GetBuffer();
// For i39516 - a closing parenthesis that ends an RTL string is displayed backwards by PPT
// Solution: add a Unicode Right-to-Left Mark, following the method described in i18024
if ( bLast && pText[ aString.Len() - 1 ] == sal_Unicode(')') && mnAsianOrComplexFont )
{
mnTextSize++;
bRTL_endingParen = TRUE;
}
mpText = new sal_uInt16[ mnTextSize ];
sal_uInt16 nChar;
for ( int i = 0; i < aString.Len(); i++ )
{
@ -1905,6 +1913,9 @@ PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text
mpText[ i ] = nChar;
}
}
if ( bRTL_endingParen )
mpText[ mnTextSize - 2 ] = 0x200F; // Unicode Right-to-Left mark
if ( bLast )
mpText[ mnTextSize - 1 ] = 0xd;