[openoffice.org] adjust patches

Caolan McNamara caolanm at fedoraproject.org
Fri Aug 20 15:38:22 UTC 2010


commit 962b45cf41d0d15fa7f9e73ab71ca13b7965ad37
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 20 16:38:14 2010 +0100

    adjust patches

 workspace.cmcfixes77.patch |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)
---
diff --git a/workspace.cmcfixes77.patch b/workspace.cmcfixes77.patch
index 6614841..4cf107c 100644
--- a/workspace.cmcfixes77.patch
+++ b/workspace.cmcfixes77.patch
@@ -265,17 +265,6 @@ 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);
 --- a/svtools/source/config/menuoptions.cxx	2010-07-30 12:52:42.000000000 +0100
 +++ b/svtools/source/config/menuoptions.cxx	2010-07-30 12:52:53.000000000 +0100
 @@ -245,8 +245,15 @@


More information about the scm-commits mailing list