[openoffice.org/f14/master] get this to build

Caolan McNamara caolanm at fedoraproject.org
Fri Jul 30 09:11:51 UTC 2010


commit 723002960e22668013ddebdc192ae9c95477172c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 30 10:11:43 2010 +0100

    get this to build

 workspace.cmcfixes77.patch |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/workspace.cmcfixes77.patch b/workspace.cmcfixes77.patch
index 34af232..c11154b 100644
--- a/workspace.cmcfixes77.patch
+++ b/workspace.cmcfixes77.patch
@@ -265,3 +265,14 @@ diff -r 85e7cfbbb08a solenv/config/sooo330.ini
  else
      AC_MSG_RESULT([internal])
      SYSTEM_LUCENE=NO
+--- a/vcl/source/glyphs/graphite_layout.cxx	2010-07-30 10:08:56.000000000 +0100
++++ b/vcl/source/glyphs/graphite_layout.cxx	2010-07-30 10:10:10.000000000 +0100
+@@ -659,7 +659,7 @@
+         return hash;
+     };
+ protected:
+-    virtual void UniqueCacheInfo(std::wstring & stuFace, bool & fBold, bool & fItalic)
++    virtual void UniqueCacheInfo(ext_std::wstring & stuFace, bool & fBold, bool & fItalic)
+     {
+ #ifdef WIN32
+         dynamic_cast<GraphiteWinFont&>(mrRealFont).UniqueCacheInfo(stuFace, fBold, fItalic);


More information about the scm-commits mailing list