summaryrefslogtreecommitdiff
path: root/vcl/source/gdi/sallayout.cxx
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2013-05-22 15:30:36 +0300
committerTor Lillqvist <tlillqvist@suse.com>2013-05-22 15:30:36 +0300
commitd664f279602ae6ea9275b222f3f33634aeec97b3 (patch)
treebe0b93453018e1ba4b35626b19e40b34074162b6 /vcl/source/gdi/sallayout.cxx
parentd19421db942cd08cc378e1b4dfea583f9bd5cd79 (diff)
Revert "fdo#62846 incorrect glyph to Unicode mappings in PDFs"
Breaks the build for Windows: vcl/win/source/gdi/winlayout.cxx(1897) : error C2065: 'nCharPos' : undeclared identifier This reverts commit 0b70e4ea4fcf0adccdfdf4886e5cc45d46479692.
Diffstat (limited to 'vcl/source/gdi/sallayout.cxx')
-rw-r--r--vcl/source/gdi/sallayout.cxx8
1 files changed, 2 insertions, 6 deletions
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 705b8cc8c2e0..6955679350ad 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -1427,11 +1427,7 @@ int GenericSalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos
nOldFlags = pG->mnGlyphIndex; // &GF_FLAGMASK not needed for test above
}
- // Calculate final pCharPosAry item
- if( pCharPosAry )
- *pCharPosAry = pG->mnCharPos;
-
- aRelativePos.X() /= mnUnitsPerPixel;
+ aRelativePos.X() /= mnUnitsPerPixel;
aRelativePos.Y() /= mnUnitsPerPixel;
rPos = GetDrawPosition( aRelativePos );
@@ -1679,7 +1675,7 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
// prepare "merge sort"
int nStartOld[ MAX_FALLBACK ];
int nStartNew[ MAX_FALLBACK ];
- int nCharPos[ MAX_FALLBACK+1 ];
+ int nCharPos[ MAX_FALLBACK ];
sal_Int32 nGlyphAdv[ MAX_FALLBACK ];
int nValid[ MAX_FALLBACK ] = {0};