Merging feature/commonsallayout branch
Khaled Hosny
khaledhosny at eglug.org
Tue Oct 18 18:52:08 UTC 2016
On Mon, Oct 17, 2016 at 09:30:14PM +0200, Khaled Hosny wrote:
> I believe that feature/commonsallayout (AKA unified text layout) is now
> feature complete with no known major bugs, and should be ready to be
> merged on master. I’ll try merge it tomorrow night and hope for the
> best, unless someone objects loudly.
I just pushed the code into master, here is the summary of changes:
RepositoryExternal.mk | 20 +--
config_host.mk.in | 1 -
configure.ac | 47 +++---
external/harfbuzz/ExternalProject_harfbuzz.mk | 5 +
vcl/CppunitTest_vcl_wmf_test.mk | 5 +-
vcl/Library_vcl.mk | 6 +-
vcl/README.vars | 1 +
vcl/headless/svptext.cxx | 10 +-
vcl/inc/CommonSalLayout.hxx | 82 +++++++++++
vcl/inc/headless/svpgdi.hxx | 3 +-
vcl/{ => inc}/quartz/ctfonts.hxx | 6 +-
vcl/inc/quartz/salgdi.h | 18 ++-
vcl/inc/salgdi.hxx | 6 +-
vcl/inc/sallayout.hxx | 6 +-
vcl/{unx/generic/glyphs => inc}/scrptrun.h | 4 +-
vcl/inc/textrender.hxx | 3 +-
vcl/inc/unx/cairotextrender.hxx | 2 +-
vcl/inc/unx/genpspgraphics.h | 4 +-
vcl/inc/unx/glyphcache.hxx | 4 +
vcl/inc/unx/salgdi.h | 3 +-
vcl/inc/win/salgdi.h | 11 +-
vcl/{win/gdi => inc/win}/winlayout.hxx | 283 +++++++++++++++++++++++++++++++++++-
vcl/quartz/ctfonts.cxx | 6 +-
vcl/quartz/ctlayout.cxx | 2 +-
vcl/quartz/salgdi.cxx | 212 +++++++++++++++++++++++----
vcl/source/gdi/CommonSalLayout.cxx | 784 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
vcl/source/gdi/sallayout.cxx | 6 +
vcl/{unx/generic/glyphs => source/gdi}/scrptrun.cxx | 0
vcl/unx/generic/gdi/cairotextrender.cxx | 28 +++-
vcl/unx/generic/gdi/font.cxx | 10 +-
vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 6 +-
vcl/unx/generic/glyphs/gcach_layout.cxx | 3 +-
vcl/unx/generic/print/genpspgraphics.cxx | 2 +-
vcl/win/gdi/salfont.cxx | 29 +++-
vcl/win/gdi/winlayout.cxx | 429 +++++++++++++-----------------------------------------
35 files changed, 1606 insertions(+), 441 deletions(-)
Regards,
Khaled
More information about the LibreOffice
mailing list