diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-03-26 15:29:54 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-26 15:30:24 +0100 |
commit | 7d6656addebcaec4f8873e4a611a970a224a7bf5 (patch) | |
tree | 5d70ae4fe1001461895c8dc9baf7fd0bd3fcfb52 /vcl | |
parent | 226d310c1a31238b7f07d8e7e42ec75f0280fba5 (diff) |
merge getVerticalDeltaAngle and GetVerticalFlags
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/generic/print/text_gfx.cxx | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/generic/print/text_gfx.cxx index 06dbf7dd50c8..a270ac264ce4 100644 --- a/vcl/generic/print/text_gfx.cxx +++ b/vcl/generic/print/text_gfx.cxx @@ -87,31 +87,12 @@ Font3::Font3(const PrinterGfx &rGfx) static int getVerticalDeltaAngle( sal_Unicode nChar ) { - int nAngle = 0; - if( ( nChar >= 0x1100 && nChar < 0x11fa ) || - ( nChar >= 0x3000 && nChar < 0xfb00 ) || - ( nChar >= 0xfe20 && nChar < 0xfe70 ) || - ( nChar >= 0xff00 && nChar < 0xff64 ) - ) - { - /* #i52932# remember: - nChar == 0x2010 || nChar == 0x2015 - nChar == 0x2016 || nChar == 0x2026 - - are nAngle = 0 also, but already handled in the first if - */ - if( ( nChar >= 0x3008 && nChar < 0x3019 && nChar != 0x3012 ) || - nChar == 0xff3b || nChar == 0xff3d || - (nChar >= 0xff6b && nChar < 0xff64 ) || - nChar == 0xffe3 - ) - nAngle = 0; - else if( nChar == 0x30fc ) - nAngle = -900; - else - nAngle = 900; - } - return nAngle; + int nRotation = GetVerticalFlags(nChar); + if (nRotation == GF_ROTR) + return -900; + if (nRotation == GF_ROTL) + return 900; + return 0; } void |