summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-09-05Version 5.0.2.1, tag libreoffice-5.0.2.1libreoffice-5.0.2.1Robinson Tryon3-0/+0
Change-Id: Ie2c8d5e928722a04f6e20977c061964057f2f7c3
2015-09-05bump product version to 5.0.2.1Robinson Tryon1-1/+1
Change-Id: Ib9d7da60f94b1c9101dcae085e2f71947407743a
2015-09-05update emoji autocorrect entries from po-filesRobinson Tryon10-86/+293
Change-Id: Ia10e07e428bce001da8fd7e38e07ace820b42153
2015-09-04Updated coreRobinson Tryon1-0/+0
Project: translations 33da995f33241d35f6d1a74509f57cd8555b2fe2 Update translations for 5-0-2 Change-Id: Iaa61ea72368a4619c69c9ec64bb559d30bd495d2
2015-09-03 Branch libreoffice-5-0-2Robinson Tryon4-1/+1
This is 'libreoffice-5-0-2' - the stable branch for the 5.0.2 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.0.x release, please use the 'libreoffice-5-0' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ifc544905e8a8b8c05cc0118ca15efeccb10c6a82
2015-09-03Fix mis-mergeStephan Bergmann1-6/+6
...where fb6f2e1109abdd09e80dbcd6660a9530fc06ff0f "Resolves: #i121407# Gallery reorganizations..." first cherry-picked the younger 8012fae6cedcf325130d70adf0a486e8918f452f before f7d373d18f965b36f310d44044bdba6476f6eb03 "Added ColorDepth change test with assertion to the Bitmap::Scale method" then cherry-picked the older 4be8cc079667cca2cae91dba9e46c16ccff1537f, leading to the two checks at the top of Bitmap::Scale to not return early as intended. Thanks to clang-tidy clang-analyzer-deadcode.DeadStores for flagging this. Change-Id: Id89cc517a9f7efdff040c70f3b0e640d969cf24d (cherry picked from commit 0aa9cd69598e1c022aa676f81dc7bc2f03e58b2c) Reviewed-on: https://gerrit.libreoffice.org/18310 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-03tdf#93892: Un-share maUserBuffer when the BitmapWriteAccess is requested.Jan Holesovsky1-1/+17
Otherwise Bad Things Happen, and we may accidentally overwrite random other / shared data. Change-Id: I463354a6e910a2cb43faa229708fe5c14c79535a Reviewed-on: https://gerrit.libreoffice.org/18309 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-03officecfg: blacklist one more intel opencl driver versionMiklos Vajna1-1/+1
My machine has both an intel and an nvidia vga card, and both support opencl. When the intel one is not blacklisted, then CppunitTest_sc_opencl_test's testFinancialXirrFormula() fails all the time. With the blacklist the nvidia one is used during the tests and the test passes just fine. Change-Id: Ib539faebcaf51867bdc1923f896219afcf92b5ef (cherry picked from commit 452b1872af72d7fb31101aa2fa35aeaf18e41a10) Reviewed-on: https://gerrit.libreoffice.org/18307 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2015-09-03disable caching of virtual devices when OpenGL is enabledTomaž Vajngerl1-1/+7
Change-Id: I15c5cca8c31d81026111a3fa3f050f53057d76b7 (cherry picked from commit 6eff03b7d8b77b797f57f2344163ff67a99631f9) Reviewed-on: https://gerrit.libreoffice.org/18308 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2015-09-03doc para property ranges cannot be 0 lengthCaolán McNamara2-0/+13
Change-Id: If946204873343d8bbc0c1d391ca2c65d8b2f8561 (cherry picked from commit ed7d22049596ac91ad75bfad1a5675c13714e203) Reviewed-on: https://gerrit.libreoffice.org/18299 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-03tdf#91882 - make this hideous busy-loop lower priority and less busy.Michael Meeks1-1/+2
This way the rendering code can get a look in. Change-Id: Id100031ffe1c4b415ed4ef1272a0772ec99ab4a9 Reviewed-on: https://gerrit.libreoffice.org/18301 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-03tdf#93870 - GL accel. via VCL canvas for presentations when GL enabled.Michael Meeks8-3/+53
Change-Id: Ia31a88cb3d9e6baa987b22f77f407a3f592031f1 Reviewed-on: https://gerrit.libreoffice.org/18285 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/18295
2015-09-03tdf#79018: Prevent line break as footnote labelOliver Specht1-3/+8
footnote labels must not contain line breaks Change-Id: I00d334197b960c4ed17fdee3ea8a1c734cbfa4c1 Reviewed-on: https://gerrit.libreoffice.org/18292 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 089d7f53ea232972961c14706a54187f075fa973) Reviewed-on: https://gerrit.libreoffice.org/18297 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-03Fix tdf#93781 Impress copy wrong style name to clipboard whenMark Hung1-1/+2
style name contains Chinese character. Encode style name in multibyte sring (ex,Chinese) properly with RTFOutFuncs::Out_String(). Change-Id: Ibdd1010e28c711d7829643b60b32637ebce58bdb Reviewed-on: https://gerrit.libreoffice.org/18247 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 85c62a36a907bc5ff31627349a80baa51efbd443) Reviewed-on: https://gerrit.libreoffice.org/18296
2015-09-03sc: fix number format button highlighting in sidebarTomaž Vajngerl1-1/+1
When a number format for a cell (for example percent) is applied it is highlighted in the toolbar but not the equal button in the sidebar. This patch fixes this issue. Change-Id: I958b1fd152bc2b756a6320b7cb4ebb15ac601f2c Reviewed-on: https://gerrit.libreoffice.org/18283 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-03tdf#93662 - allow GL by default only on recent drivers on recent windows.Michael Meeks2-101/+63
Feature for triple review for 5.0.2 - enables GL by default for some subset of very recent GL drivers, on Windows 7+. Change-Id: I8777c84920b7cb7b19686e3cd8e943e6967a9a16 Reviewed-on: https://gerrit.libreoffice.org/18289 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-03WaE: loplugin:staticmethods in the non-Java caseTor Lillqvist1-0/+10
Change-Id: I1fe771f01edb0ce14da01146191cfe3f48958966 (cherry picked from commit 8002f0ddc805251e6f0f550bf8526aab8603c5df)
2015-09-03Tweak VCL unit tests for OpenGL.Michael Meeks2-7/+22
Change-Id: Ia36f8424226da4e66ae991abd4d6f24604db324c Reviewed-on: https://gerrit.libreoffice.org/18284 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2015-09-03opengl: let OutputDevice do the bezier subdivisionTomaž Vajngerl1-22/+8
(cherry picked from commit 796b2d6b20e3e9d6ca7f095a49d9b3a54f58645f) Conflicts: vcl/opengl/gdiimpl.cxx Change-Id: I0620cd29695d792320c6e3209dff84822485d883 Reviewed-on: https://gerrit.libreoffice.org/18287 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-09-02tdf#92612 Right-clicking after applying "paint buckets" leads to multiple UndoAshod Nakashian5-14/+37
In paint bucket mode the user can undo by right-clicking. Undoing, however, is only possible after the first paint op. After undoing is enabled, the user can undo indefinetely by righ-clicking. This is not consistent and can be confusing. This patch tracks the changes done after entering the paint bucket mode, and allows the user to undo them using right-clicking until they reach the first operation before entering this context. Because the user can undo/redo using other means, the patch takes it into account and will reset its tracking to accomodate this. Ultimately, the user is able to make any changes in paint bucket mode and undo them all by right-clicking, but no further than that. Change-Id: I93380fb60db83aee37a1d324218ba6ab1700a2e5 Reviewed-on: https://gerrit.libreoffice.org/16951 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit d0489d0827fc6cef04d0f3602023d82ceda82480) Reviewed-on: https://gerrit.libreoffice.org/18257 Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-09-02tdf#93867 - clear current GL context before thread switch.Michael Meeks6-4/+24
Fixes regression from otherwise a nice cleanup in: d20092259c7ea63885a539f911788715f8147ee9 Also get polarity of debug logging only with a context right. Change-Id: Id322471f01e5656e758aefc57b0d4d5ad073ec54 Reviewed-on: https://gerrit.libreoffice.org/18282 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-09-02detect if new offsets are the same as the previous ones and avoid loopCaolán McNamara1-0/+9
Change-Id: I4c53d4bce9a69d79e34bdd634c296d9b495e1904 (cherry picked from commit 137cf76573c89ea1b0b1f716a50731419a187473) Reviewed-on: https://gerrit.libreoffice.org/18273 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-02opengl: Don't cache the menubar background.Jan Holesovsky1-0/+6
It can change based on the _toolbar_ size. The toolbar itself is fine though; it may depend on the menubar size, but that should be constant. Change-Id: Id2c68c89f4ec0774bc74b8c4a5b9a5e59e22137f Reviewed-on: https://gerrit.libreoffice.org/18279 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2015-09-02Don't call GL debugging methods if there is no context.Michael Meeks3-16/+37
Change-Id: Ie6b824953b8ad19fd1b6a146cb6bf52bbb152ef7 Reviewed-on: https://gerrit.libreoffice.org/18277 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2015-09-02Add SAL_DISABLE_GL_WATCHDOG env. var for obvious reasons.Michael Meeks2-1/+3
Change-Id: Iec7cb6504a389972d8187954d5ed7aff94f2e01c Reviewed-on: https://gerrit.libreoffice.org/18272 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2015-09-02tdf#93859 opengl - don't cache radiobuttons, refactor code dupl.Tomaž Vajngerl4-3/+19
Radio buttons and check boxes can't be cached with current framework as they have an additional rendering state provided in additional data. Refactor code to control which controls can be cached in one place only. Change-Id: I095a01cbf5dde013247d70ada89020f64c8c6510 (cherry picked from commit 54962518fa2ca3860fcb4d2c772dea21b22a184e) Reviewed-on: https://gerrit.libreoffice.org/18271 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2015-09-02tdf#93830 txXfrm offset workaround works in rounded rectangle case as wellAndras Timar3-1/+27
Change-Id: I5d8df5c0d55e8dfd7c978b16b2b220c127f3dac9 Reviewed-on: https://gerrit.libreoffice.org/18226 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit cc88a88caad591270760d947848ad0a032d32bdb) Reviewed-on: https://gerrit.libreoffice.org/18270 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-02tdf#93857 opengl: adapt UniscribeLayout's DrawCachedGlyphs() to FillDXArray()Miklos Vajna1-1/+7
The problem was UniscribeLayout::DrawCachedGlyphs() counted the total advance value unconditionally from mpGlyphAdvances, while UniscribeLayout::FillDXArray() (which provides advance values to e.g. Writer) only used mpGlyphAdvances in case of NULL mpJustifications. Fix this by first checking mpJustifications in UniscribeLayout::DrawCachedGlyphs(), too. With this, e.g. typing "x" in Writer 10 times will not result in a "misplaced" cursor caret. Change-Id: I16c7a258ff77b25c5121b9b974e72ad6efe5e9fc (cherry picked from commit 53a40c43a1ac88e761e97a2832367525ee6b0426) Reviewed-on: https://gerrit.libreoffice.org/18268 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2015-09-02tdf#93839 - Encourage vdevs to pick up new GL Contexts for Linux.Michael Meeks1-0/+2
Change-Id: I1c40df21a1b1b6d0637f399cf29ca4f49a81d183 Reviewed-on: https://gerrit.libreoffice.org/18264 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2015-09-02tdf#93850 - Defer watchdog during shader compiles.Michael Meeks1-16/+55
Shader compilation can take a while the first time; best not to disable GL at that point. Have more of a hair trigger at other times. Also explicitly exit if we appear to have hung in std::abort handling. Conflicts: vcl/source/opengl/OpenGLHelper.cxx Change-Id: I45f0873672f950fb3baba0ca859d854a0bb25064 Reviewed-on: https://gerrit.libreoffice.org/18265 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-02SwViewShell::ImplEndAction: still paint directly when non-double-bufferingMiklos Vajna1-1/+4
It turns out that in this case we miss repainting if we go via invaliation-then-paint instead of direct painting when double-buffering is not enabled. Related commits: - beb4aa21d61f0d66392d596be86fb57b4b167239 (SwViewShell::ImplEndAction: avoid direct paint, 2015-06-29) and c9175a1bd3249ad573ae6827bf19963a3ebe2fbc (SwViewShell::ImplEndAction: avoid direct PaintDesktop(), 2015-07-03) globally avoided direct paints - 222f10e773ba51a19880be1b798990260c198147 (tdf#93096 sw: fix selection with keyboard outside current view, 2015-08-18) restored direct paint when non-double-buffering for the second commit, this one does the same for the first Change-Id: Ida0c6917a8cdec74209bd64813c7876d4fa61b8a Signed-off-by: László Németh <laszlo.nemeth@collabora.com>
2015-09-02tdf#93233 fix clockface emoji entriesChristian Lohmaier1-12/+12
this fixes the template only - the actual autocorrect entries for en-US will be processed on next translation merge Change-Id: Ib898897e448914ca334d7c34a45e18f787a8aa14 (cherry picked from commit b14680fbdde35ed60a2bde21fcfc839cb7c1ffd3)
2015-09-02tdf#83546 Expand the sidebar if it's hiddenMaxim Monastirsky1-12/+11
Change-Id: I92620cb1439bd13efcdbafcdc584abd8d7bb4345 (cherry picked from commit e38c4105077b396b0b53e0296ae9cf142f51dd52) Reviewed-on: https://gerrit.libreoffice.org/18245 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-02windows opengl: Avoid an unnecessary wglMakeCurrent() call.Jan Holesovsky1-2/+2
Change-Id: I1c1287a29067c053565c49c0ce96918a2d27d87f Reviewed-on: https://gerrit.libreoffice.org/18260 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-09-02loplugin:staticmethodsStephan Bergmann1-1/+1
Change-Id: Idfc691a92d0cba72289699609cb99bce35aaade9 (cherry picked from commit f3f42bcede27ed78ac1216ca099a5971dc4ff300)
2015-09-02check for legal field sizes before readingCaolán McNamara2-6/+19
Change-Id: I3cdb647e1a057be5bb4b32d119ee5bcbbedf7473 (cherry picked from commit ad6d83defb33c414885ce6d4bfa85571d463f3c3) Reviewed-on: https://gerrit.libreoffice.org/18169 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-02check for over long record len and check readsCaolán McNamara2-18/+26
Change-Id: Ib77ce1b95db2dc4396f4fd2fdcff4c0344b20c9e (cherry picked from commit 0c191e2b757555b147ebab1688e72acde28062a1) Reviewed-on: https://gerrit.libreoffice.org/18179 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-02loplugin:simplifyboolStephan Bergmann1-1/+1
Change-Id: I19e96b882a5cc8991035a8275aebd4ff586bf9f3 (cherry picked from commit 57e7f48633f820223e8dd1dd06af42dc164dfe26)
2015-09-02WaE: C-style cast from const sal_uInt64 * to sal_uInt8 * [loplugin:cstylecast]Tor Lillqvist3-5/+5
More useful param type for arg that ultimately ends up as const GLVoid *pixels arg to glTexImage2D Change-Id: I69ba2f1dd397fa103f3f59638bec727add3caed7 (cherry picked from commit 086aec27ddfd72dc21fffb0466cb5c815e2b4169) (cherry picked from commit 84eafb6a051863a775f122cec1bc27d9f5fef6e4)
2015-09-02WaE: 'updateChecksum' overrides a member function but is not marked 'override'Tor Lillqvist1-1/+1
Change-Id: Ic2230e1d1f54e27d4189fc56b525a7e76ddab649 (cherry picked from commit a5493ee2ec1dbc49acdd376bb5e869ed4a80cce7)
2015-09-02WaE: this method can be declared static [loplugin:staticmethods]Tor Lillqvist1-1/+1
Change-Id: I39d63811d154b849708f1254642fd0eb04a9848b
2015-09-02tdf#93532 - Bitmap CRC unit tests.Michael Meeks1-0/+60
Change-Id: Ic75801d7ad941ba802ffe418d5c666b1e7b0e94f Reviewed-on: https://gerrit.libreoffice.org/18202 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-02tdf#93750 allow for EMF+ record padding up to 11 bytesMike Kaganski4-15/+45
When an array of EMF+ has extra bytes in the end, that are less than 12, they should not be treated as another EMF+ record, but simply ignored. Change-Id: I34701c00916812c8a6a4b69730f602da81719b35 Reviewed-on: https://gerrit.libreoffice.org/18110 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit daecb93affd5e5ec89eec0d18f433a296b9aed1d) Reviewed-on: https://gerrit.libreoffice.org/18200 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-02tdf#93532 - Switching to 64-bit checksumMarco Cecchetti37-215/+681
Added a C++ and a GLSL implementation of a 64-bit CRC algorithm. Changed hardcoded checksum value in ooxmlimport unit test (testN777345). Change-Id: I16bb985a14866775efda49e21fe033ff64645896 Reviewed-on: https://gerrit.libreoffice.org/18254 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-02windows opengl: When the 2nd param is NULL, the 1st is ignored anyway.Jan Holesovsky1-2/+2
Change-Id: I840e8bb2d2ccae869c330bb32dba484b4a835a51 Reviewed-on: https://gerrit.libreoffice.org/18248 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-09-01tdf#93600: Avoid crash on entering '=' as a cell valueKatarina Behrens1-1/+1
To match formulas, 'formula is' condition should be used instead Change-Id: I37a9a2680c49bffcb8b25a11faedc1421cfa2d00 Reviewed-on: https://gerrit.libreoffice.org/18126 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-on: https://gerrit.libreoffice.org/18159 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2015-09-01check for ridiculous lengths and check stream statusCaolán McNamara2-9/+13
Change-Id: Iefe943794e005f03b2a6ea5fc642b8c3d21b3334 (cherry picked from commit 858257d465b7e7ce54819cc2f631efcb20632863) Reviewed-on: https://gerrit.libreoffice.org/18173 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2015-09-01check stream statusCaolán McNamara2-1/+1
Change-Id: I27bb289288d319a93201e9c3d703114924ca258c (cherry picked from commit daf1578d752531e2b48d183531d9a4a7cedfc37e) Reviewed-on: https://gerrit.libreoffice.org/18177 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2015-09-01sd: Don't crash when the sidebar is hiddenMaxim Monastirsky3-5/+6
Change-Id: I09a5019a98b529ba11f07392906a3e0fb7bc1bac (cherry picked from commit c511b2795dbf47186c0f7d83fe7a4cd737d4d765) Reviewed-on: https://gerrit.libreoffice.org/18243 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2015-09-01tdf#93838 windows opengl: fix vertical text position in UniscribeLayoutMiklos Vajna1-3/+3
For one, aPos.Y() is meant to be the baseline position of the text. Based on the MSDN documentation and <https://www-user.tu-chemnitz.de/~ygu/petzold/ch05c.htm>, that means if we want to get top position, we have to only extract tmAscent and not tmInternalLeading. For another, ImplWinFontEntry::AddChunkOfGlyphs() adds a border of 2 pixels both horizontally and vertically, which means that then we need to undo that when counting the vertical position, too. Change-Id: I4ac8e881ea5910662674c2a1b53ece943487ccd9 (cherry picked from commit b1a918ae8aca9e9a1eaebecef3b82e011b10665f) Reviewed-on: https://gerrit.libreoffice.org/18244 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>