[openoffice.org/f14/master] adjust patches

[Caolan McNamara]

commit d3fbefe8dd00a8983a5a6dca256044a33f2fe6b2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 20 16:37:45 2010 +0100

    adjust patches

 .gitignore                 |    1 +
 workspace.cmcfixes77.patch |   11 -----------
 2 files changed, 1 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7ac8510..a3466fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
 description.xml
 manifest.xml
 OOO330_m5.tar.bz2
+/OOO330_m5.tar.bz2
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 @@