sw/source/filter/ww8/ww8scan.cxx | 2 +-
vcl/source/gdi/outdev3.cxx | 5 ++++-
vcl/win/source/gdi/winlayout.cxx | 9 +++++----
xmloff/source/draw/sdxmlexp.cxx | 4 +++-
4 files changed, 13 insertions(+), 7 deletions(-)
New commits:
commit 4c8d4308d6e975c93d7d4bfb6f8a11d41c1f05a1
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Mar 1 12:43:55 2013 +0000
WaE: init variables
Change-Id: Ia9d120348787bd566a3c9049f7adaf76648d096e
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 5ffed47..86cdd8c 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2935,7 +2935,9 @@ XMLFontAutoStylePool*
SdXMLExport::CreateFontAutoStylePool()
for( int i = 0; i < nLen; i++ )
{
OUString sFamilyName, sStyleName;
- sal_Int16 eFamily, ePitch, eCharSet;
+ sal_Int16 eFamily(FAMILY_DONTKNOW),
+ ePitch(PITCH_DONTKNOW),
+ eCharSet(RTL_TEXTENCODING_DONTKNOW);
aAnySeq[nSeqIndex++] >>= sFamilyName;
aAnySeq[nSeqIndex++] >>= sStyleName;
commit ee5d620011152e6f260a1712f02cb48da34734d6
Author: Herbert Dürr <h...@apache.org>
Date: Fri May 4 07:24:43 2012 +0000
(cherry picked from commit c4ce6e92db9e784eed2c0863d4c30bf9eddf3da1)
Conflicts:
vcl/win/source/gdi/winlayout.cxx
Change-Id: I564e3d2186578041a70f329810173b82c8f1ce5b
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index c5de8ea..da6d40e 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -5972,7 +5972,10 @@ ImplLayoutArgs OutputDevice::ImplPrepareLayoutArgs(
String& rStr,
|| ((*pStr >= 0x1100) && (*pStr < 0x1200)) // hangul jamo
|| ((*pStr >= 0x1700) && (*pStr < 0x1900)) // many CTL scripts
|| ((*pStr >= 0xFB1D) && (*pStr < 0xFE00)) // middle east
presentation
- || ((*pStr >= 0xFE70) && (*pStr < 0xFEFF)) ) // arabic
presentation B
+ || ((*pStr >= 0xFE70) && (*pStr < 0xFEFF)) // arabic
presentation B
+ || ((*pStr >= 0xFE00) && (*pStr < 0xFE10)) // variation
selectors in BMP
+ || ((pStr + 1 < pEnd) && (pStr[0] == 0xDB40) && (0xDD00 <=
pStr[1]) && (pStr[1] < 0xDEF0)) // variation selector supplement
+ )
break;
if( pStr >= pEnd )
nLayoutFlags |= SAL_LAYOUT_COMPLEX_DISABLED;
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index abd5144..1404c2c 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -69,8 +69,8 @@ using ::rtl::OUStringToOString;
class ImplWinFontEntry : public ImplFontEntry
{
public:
- ImplWinFontEntry( FontSelectPattern& );
- ~ImplWinFontEntry();
+ explicit ImplWinFontEntry( FontSelectPattern& );
+ virtual ~ImplWinFontEntry();
private:
// TODO: also add HFONT??? Watch out for issues with too many active
fonts...
@@ -1189,6 +1189,7 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs )
SCRIPT_CONTROL aScriptControl =
{nLangId,false,false,false,false,false,false,false,false,0};
aScriptControl.fNeutralOverride = aScriptState.fOverrideDirection;
aScriptControl.fContextDigits = (0 != (rArgs.mnFlags &
SAL_LAYOUT_SUBSTITUTE_DIGITS));
+ aScriptControl.fMergeNeutralItems = true;
// determine relevant substring and work only on it
// when Bidi status is unknown we need to look at the whole string though
mnSubStringMin = 0;
@@ -1426,7 +1427,7 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs )
{
if( mpLogClusters[ c ] == i )
{
- // #i55716#
+ // #i55716# skip WORDJOINER
if( rArgs.mpStr[ c ] == 0x2060 )
mpOutGlyphs[ i + rVisualItem.mnMinGlyphPos
] = 1;
else
@@ -1441,7 +1442,7 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs )
{
if( mpLogClusters[ c ] == i )
{
- // #i55716#
+ // #i55716# skip WORDJOINER
if( rArgs.mpStr[ c ] == 0x2060 )
mpOutGlyphs[ i + rVisualItem.mnMinGlyphPos
] = 1;
else
commit 7f47f5bd09b8bb32de9fd38f941a621965c48045
Author: Herbert Dürr <h...@apache.org>
Date: Tue Jun 19 07:25:13 2012 +0000
#c704126# fix off-by-one when parsing WW8_STD's fHidden member
According to the header file ww8struc.hxx the fHidden member is at bit 1
(cherry picked from commit a428571aeecd1acee1b2d5a80cd1d9978f25aeb7)
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 7a204dd..80d6687 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -6060,7 +6060,7 @@ WW8_STD* WW8Style::Read1STDFixed( short& rSkip, short*
pcbStd )
a16Bit = 0;
rSt >> a16Bit;
pStd->fAutoRedef = a16Bit & 0x0001 ;
- pStd->fHidden = ( a16Bit & 0x0002 ) >> 2;
+ pStd->fHidden = ( a16Bit & 0x0002 ) >> 1;
// man kann nie wissen: vorsichtshalber ueberlesen
// wir eventuelle Fuellsel, die noch zum BASE-Part gehoeren...
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
