summaryrefslogtreecommitdiff
path: root/vcl/inc/textrender.hxx
AgeCommit message (Collapse)AuthorFilesLines
2017-12-18ServerFontLayout is already goneKhaled Hosny1-1/+1
Kill DrawServerFontLayout, and rename DrawSalLayout to DrawTextLayout, in parity with GetTextLayout. Change-Id: I3f61efd8c6ecde64f28301dca6a7c91eb0873702 Reviewed-on: https://gerrit.libreoffice.org/31224 Reviewed-by: Khaled Hosny <khaledhosny@eglug.org> Tested-by: Khaled Hosny <khaledhosny@eglug.org> (cherry picked from commit 59859a8aaa75384159e315ee2577d5cc7e2aa6e8) (cherry picked from commit 5609268b8104d207e89994a65ed8640bf52b1315)
2016-10-30Rename ServerFont to FreetypeFontKhaled Hosny1-1/+1
This is what it is actually is, we dropped support for server-side fonts for a long time now. Renamed also a few related classes, but left ServerFontLayout* ones as they will go away soonish. Change-Id: I68a6dad51b6972368b7bf85a0b9c8089cc12740e Reviewed-on: https://gerrit.libreoffice.org/30390 Reviewed-by: Khaled Hosny <khaledhosny@eglug.org> Tested-by: Khaled Hosny <khaledhosny@eglug.org>
2016-10-18GSoC: Modify DrawServerFontLayout and add DrawSalLayoutAkash Jain1-2/+1
Modify the definiton of the DrawServerFontLayout method. Add new DrawSalLayout method which will be used for drawing text independent of the platform. Change-Id: Ie3eefb172b1781c685def1ef549db2538f672a62
2016-09-02boost::intrusive_ptr->tools::SvRefCaolán McNamara1-2/+2
Change-Id: I4c913dc62efe3f3747e78670f4efb0216d95c4ad Reviewed-on: https://gerrit.libreoffice.org/28585 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-06-10tdf#96099 Remove various smart pointer typedefs in vclMark Page1-1/+1
Change-Id: I4ac1bb25d3d63f150b42d9e1708efc344bbdb6a7 Reviewed-on: https://gerrit.libreoffice.org/26113 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-05-11remove unused return type from SalGraphics::SetFontNoel Grandin1-1/+1
Change-Id: I0ca41130f5e1028a70f1242f7af3366b7c57c572 Reviewed-on: https://gerrit.libreoffice.org/24833 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-01-27vcl: remove extraneous included headers in textrender.hxxChris Sherlock1-6/+1
Change-Id: I865c48822c8e95c427318a4a26fb86a01b0df2b9
2016-01-18basebmp now only used from vcl/headless codeCaolán McNamara1-1/+0
Change-Id: I068d404431d3565f6ad5741edbd3693225824a4d
2016-01-14vcl: change ImplFontMetricData to be reference counted via intrusive_ptrChris Sherlock1-1/+1
Change-Id: Ie9f5fbd21a6223520cbea3af6436beb407d7a88c Reviewed-on: https://gerrit.libreoffice.org/21477 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
2016-01-12vcl: resplit FontAttributes from ImplFontMetricDataChris Sherlock1-1/+2
The change I made in commit 7b974e056df3 ("vcl: merge ImplFontMetricData with ImplFontAttributes") was... ill-advised. For starters, there really needs to be this split as FontSelectPattern needs it, and PhysicalFontFace only requires the font attributes, not the metric data. So the merge was unfortunately, in my mind, a failure and I'm manually backing it out now. Change-Id: Iac38f0815f984541e2f55099c965376dd88eeb43 Reviewed-on: https://gerrit.libreoffice.org/21380 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
2016-01-10vcl: promote ImplFontAttributes to FontAttributesChris Sherlock1-1/+1
ImplFontAttributes is no longer merely a pImpl (or "compilation firewall", take your pick) but is a fully fledged class in its own right that is used by a number of classes, including FontSelectPattern, LogicalFontInstance and PhysicalFontFace. Thus I'm "promoting" the use of this class in the codebase. Change-Id: I26866080a64796978d1c25efbcd16e3e6f94aaa5 Reviewed-on: https://gerrit.libreoffice.org/21305 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
2016-01-04Remove unused forward declarationsTor Lillqvist1-3/+0
Change-Id: Ic586d44d2ff0f913f655b8a7539326a6dea78477
2016-01-03vcl: rename variables from metric names to font attribute namesChris Sherlock1-1/+1
Change-Id: Ib0a3d82af858304bf63a20bcb30b8de741491935 Reviewed-on: https://gerrit.libreoffice.org/21054 Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
2016-01-03vcl: merge ImplFontMetricData with ImplFontAttributesChris Sherlock1-1/+1
Change-Id: Ia2fe20559745e705667f23cdd73cbe50c6371aaa Reviewed-on: https://gerrit.libreoffice.org/21053 Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
2015-12-24loplugin:unnecessaryvirtualNoel Grandin1-2/+0
and unwind some apparently now unused VCL OpenGL and GlyphCachePeer stuff. Change-Id: Ic85302d4e1ad4056dabc49c97a608891052e3167 Reviewed-on: https://gerrit.libreoffice.org/20920 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-12-15Get rid of :: prefix for basegfx in include/vcl and vclTor Lillqvist1-1/+1
We already used it without the :: prefix, in many cases in the same files even. It is nice to have some consistency. I was not bored enough to do it everywhere. Change-Id: Ic8ac5bd9b4b2c02c41e5ea937a3d9477824f21cf
2015-06-11Cleanup crossplatform cairoMox Soini1-0/+3
Mac / Win cairo is not built / used, this cairo code can be removed to reduce code bloat. 4th Revised version with Android fixes Change-Id: I6e56850f535ca13b77839b7d67e227c5f39d388e Reviewed-on: https://gerrit.libreoffice.org/16218 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-03-03render text with cairo under gtk3, not headless solutionCaolán McNamara1-1/+3
Change-Id: I309eaef08f597658c068170875733e5e1daa56ef Reviewed-on: https://gerrit.libreoffice.org/14715 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-01-27these are const inputs, we fill widths from pGlyphIds via pEncodingCaolán McNamara1-2/+2
Change-Id: I32d8bbc5083223b540f76a928de505d611627957 Reviewed-on: https://gerrit.libreoffice.org/14196 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-01-27rhbz#1177022: vcl: fix PDF embedding of Type 1 fontsMichael Stahl1-1/+1
Problem is that for the "CM Typewriter" font the Width for "space" (32) is exported as 0 instead of 525, which is the correct value in the AFM. The reason is that PDFWriterImpl::emitEmbeddedFont() has various arrays to map from font code points to Unicode code points, and there are duplicate mappings, so the 160->32 mapping overrides 32->32. The PrintFontManager::PrintFont::readAfmMetrics() actually creates a Unicode to font code mapping (which may legitimately be n:1) that is then inverted; add an additional hack to store a set of "preferred" Unicodes so that PDFWriterImpl can pick the right Unicode. Presumably the code that is stored explicitly via "C" or "CH" in the AFM should take priority over more generic mappings. Change-Id: Id4205a1cd45ba6a0a5facee1e39f70c3535e7dd4
2015-01-27add a length arg to GetEmbedFontDataCaolán McNamara1-0/+1
for the cases where we don't want the full result and mark some ultra-dubious code with a TODO Change-Id: I7cf57b8d44bbad2a6db86a8b862a757ae5062c50 Reviewed-on: https://gerrit.libreoffice.org/14189 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-01-10vcl: cleanup textrender.hxxChris Sherlock1-33/+38
Change-Id: Id8524328f1bdacbc37dd6846f053e5bcfbcd782c
2014-11-14Revert "vcl: Abstract the Windows text rendering into a TextRenderImpl ↵Jan Holesovsky1-2/+5
descendant." Turns out it might be easier to actually subclass only the various SalLayout's - let's try it first, and re-introduce this code again if not. This reverts commit 309257ddadfdc3e46506036ed81f6e0695211ebe.
2014-11-13vcl: Abstract the Windows text rendering into a TextRenderImpl descendant.Jan Holesovsky1-5/+2
Change-Id: I7ee9d7e705bb0344ba59c3edd10ed85390636cd4
2014-11-10fix buildMarkus Mohrhard1-1/+1
Change-Id: I2c5152dfffa8f29502b902fbdcb0eabdb1d31704
2014-11-10extract cairo rendering and abstract platform bitsMarkus Mohrhard1-0/+81
The text rendering is now abstracted into the TextRender abstract class. Additionally we have now an abstracted cairo rendering class CairoTextRender which is a subclass of the TextRender class. The CairoTextRender class is still platform independent and needs to be subclassed to implement the few platform dependent methods. You can reuse the cairo based text rendering now by subclassing CairoTextRender for the platform that you need. Conflicts: vcl/unx/generic/gdi/salgdi.cxx Change-Id: I8b07e3fe646a81563d308971d30e14a00fd921ad