[ooo-build-commit] Branch 'ooo/master' - 2 commits - vcl/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue Aug 18 19:06:03 PDT 2009
vcl/source/glyphs/graphite_textsrc.cxx | 2 +-
vcl/source/glyphs/makefile.mk | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 0f1f7a11567086527e307b5c9882887cbe54f77e
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Aug 18 15:00:01 2009 +0000
#i10000# build fix
diff --git a/vcl/source/glyphs/makefile.mk b/vcl/source/glyphs/makefile.mk
index 3c3ba62..13da4a6 100644
--- a/vcl/source/glyphs/makefile.mk
+++ b/vcl/source/glyphs/makefile.mk
@@ -55,17 +55,17 @@ SLOFILES=\
$(SLO)$/gcach_layout.obj \
$(SLO)$/gcach_ftyp.obj
-.IF "$(ENABLE_GRAPHITE)" != ""
-CFLAGS+=-DENABLE_GRAPHITE
-SLOFILES+= $(SLO)$/graphite_adaptors.obj \
+#.IF "$(ENABLE_GRAPHITE)" != ""
+#CFLAGS+=-DENABLE_GRAPHITE
+#SLOFILES+= $(SLO)$/graphite_adaptors.obj \
$(SLO)$/graphite_features.obj \
$(SLO)$/graphite_cache.obj \
$(SLO)$/graphite_textsrc.obj \
$(SLO)$/graphite_serverfont.obj \
$(SLO)$/graphite_layout.obj
-.ENDIF
+#.ENDIF
-.ELSE
+#.ELSE
.IF "$(ENABLE_GRAPHITE)" == "TRUE"
# make use of stlport headerfiles
EXT_USE_STLPORT=TRUE
commit 5071fef70e461f2cced5bf4ed263795386d74cbc
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Aug 18 10:12:49 2009 +0000
#i10000# build fix
diff --git a/vcl/source/glyphs/graphite_textsrc.cxx b/vcl/source/glyphs/graphite_textsrc.cxx
index d2987e5..adc2ae9 100644
--- a/vcl/source/glyphs/graphite_textsrc.cxx
+++ b/vcl/source/glyphs/graphite_textsrc.cxx
@@ -69,7 +69,7 @@ size_t TextSourceAdaptor::fetch(gr::toffset, size_t, gr::utf32 *)
size_t TextSourceAdaptor::fetch(gr::toffset offset, size_t char_count, gr::utf16 * char_buffer)
{
- assert(char_buf);
+ assert(char_buffer);
size_t copy_count = std::min(size_t(maLayoutArgs.mnLength), char_count);
std::copy(maLayoutArgs.mpStr + offset, maLayoutArgs.mpStr + offset + copy_count, char_buffer);
More information about the ooo-build-commit
mailing list