[ooo-build-commit] 3 commits - bin/gob patches/dev300 scratch/mso-dumper

[Thorsten Behrens]

 bin/gob                                    |    3 +++
 patches/dev300/apply                       |    6 ------
 patches/dev300/build-fix.diff              |   15 ---------------
 patches/dev300/fit-list-to-size-popup.diff |    4 ++--
 scratch/mso-dumper/src/pptrecord.py        |   11 +++++++++++
 scratch/mso-dumper/src/pptstream.py        |    4 ++--
 6 files changed, 18 insertions(+), 25 deletions(-)

New commits:
commit c57d3807c43e54ec13d04011ed0c0709ef29829f
Author: Thorsten Behrens <thb at openoffice.org>
Date:   Wed Sep 16 07:49:28 2009 +0200

    Hoisted last build fix hunk to the patch introducing it
    
    * patches/dev300/apply: removed build-fix patch
    * patches/dev300/build-fix.diff: deleted
    * patches/dev300/fit-list-to-size-popup.diff: changes incorporated
      here

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 80472dd..1acf8ee 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3360,12 +3360,6 @@ cws-mysqlnative-20090828.diff
 # Needs a libmysqlcppconn-stlport.so etc built with STLport
 debian-mysqlc-build-against-stlport-hack.diff
 
-[ BuildFix ]
-# FIXME: 2009-09-10: various hacks to get the build to build, should be removed
-# the changes in this patch should be integrated into existing patches or
-# the underlying problem these patches avoid should be fixex --noelp
-build-fix.diff
-
 [ BuildFixLinux ]
 # FIXME: 2009-09-10: various hacks to get the build to build, should be removed
 # the changes in this patch should be integrated into existing patches or
diff --git a/patches/dev300/build-fix.diff b/patches/dev300/build-fix.diff
deleted file mode 100644
index c07aeff..0000000
--- a/patches/dev300/build-fix.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git sd/source/ui/inc/res_bmp.hrc sd/source/ui/inc/res_bmp.hrc
-index ec8bb6b..89841d7 100644
---- sd/source/ui/inc/res_bmp.hrc
-+++ sd/source/ui/inc/res_bmp.hrc
-@@ -308,8 +308,8 @@
- 
- #define RID_DRAW_TABLEOBJ_INSIDE_POPUP		RID_APP_START+94
- 
--#define RID_DRAW_OUTLINETEXTOBJ_POPUP		RID_APP_START+94
--#define RID_GRAPHIC_OUTLINETEXTOBJ_POPUP	RID_APP_START+95
-+#define RID_DRAW_OUTLINETEXTOBJ_POPUP		RID_APP_START+95
-+#define RID_GRAPHIC_OUTLINETEXTOBJ_POPUP	RID_APP_START+96
- 
- /*
-  * Pointer (Mauszeiger)
diff --git a/patches/dev300/fit-list-to-size-popup.diff b/patches/dev300/fit-list-to-size-popup.diff
index 6c4d986..a18a9e4 100644
--- a/patches/dev300/fit-list-to-size-popup.diff
+++ b/patches/dev300/fit-list-to-size-popup.diff
@@ -167,8 +167,8 @@ index d4914a3..8565e1b 100644
  
  #define RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP	RID_APP_START+93
  
-+#define RID_DRAW_OUTLINETEXTOBJ_POPUP		RID_APP_START+94
-+#define RID_GRAPHIC_OUTLINETEXTOBJ_POPUP	RID_APP_START+95
++#define RID_DRAW_OUTLINETEXTOBJ_POPUP		RID_APP_START+95
++#define RID_GRAPHIC_OUTLINETEXTOBJ_POPUP	RID_APP_START+96
 +
  /*
   * Pointer (Mauszeiger)
commit 27648fe9fc0e3a284e4fcca8e4638d91de9f05ab
Author: Thorsten Behrens <thb at openoffice.org>
Date:   Sat Sep 12 04:04:25 2009 +0200

    Prune dots from branch names
    
    * bin/gob:

diff --git a/bin/gob b/bin/gob
index 48731d0..2c30b50 100755
--- a/bin/gob
+++ b/bin/gob
@@ -248,6 +248,9 @@ def patch_get_branch (patch):
     # Patches with a module suffix are aggregated into one branch
     base = re.sub ('-(%(module_re)s)$' % locals (), '', base)
 
+    # git does not like dots in branch names
+    base = base.replace('.','-') 
+
     return base
 
 # Hard handy work for m19 gets quickly bit rotten
commit dc8a82e6c9186cc671123ff56b11821214306f38
Author: Thorsten Behrens <thb at openoffice.org>
Date:   Sat Sep 12 04:02:31 2009 +0200

    Added handling of fontentity atom
    
    * scratch/mso-dumper/src/pptrecord.py:
    * scratch/mso-dumper/src/pptstream.py:

diff --git a/scratch/mso-dumper/src/pptrecord.py b/scratch/mso-dumper/src/pptrecord.py
index 3490b78..ba4c1c0 100644
--- a/scratch/mso-dumper/src/pptrecord.py
+++ b/scratch/mso-dumper/src/pptrecord.py
@@ -128,6 +128,17 @@ class ZipRecord(BaseRecordHandler):
     def parseBytes (self):
         globals.outputZipContent(self.readRemainingBytes(), self.appendLine, 61)
 
+class FontEntity(BaseRecordHandler):
+    """Font entity."""
+
+    def parseBytes (self):
+        faceName       = globals.getUTF8FromUTF16(globals.getTextBytes(self.readBytes(64)))
+        charSet        = self.readUnsignedInt(1)
+        flags          = self.readUnsignedInt(1)
+        fontType       = self.readUnsignedInt(1)
+        pitchAndFamily = self.readUnsignedInt(1)
+        self.appendLine("Font: name=%s charset=%d flags=0x%x type=%d family=%d"%(faceName, charSet, flags, fontType, pitchAndFamily))
+
 # -------------------------------------------------------------------
 # special record handler: properties
 
diff --git a/scratch/mso-dumper/src/pptstream.py b/scratch/mso-dumper/src/pptstream.py
index 44432d3..270836c 100644
--- a/scratch/mso-dumper/src/pptstream.py
+++ b/scratch/mso-dumper/src/pptstream.py
@@ -81,7 +81,7 @@ recData = {
  1059:  ["DFF_PST_RoundTripOArtTextStyles", pptrecord.ZipRecord],
  1064:  ["DFF_PST_RoundTripCustomTableStyles"],
  2000:  ["DFF_PST_List"],
- 2005:  ["DFF_PST_FontCollection"],
+ 2005:  ["DFF_PST_FontCollection"], 
  2017:  ["DFF_PST_ListPlaceholder"],
  2019:  ["DFF_PST_BookmarkCollection"],
  2020:  ["DFF_PST_SoundCollection"],
@@ -118,7 +118,7 @@ recData = {
  4009:  ["DFF_PST_TxSIStyleAtom"],
  4010:  ["DFF_PST_TextSpecInfoAtom"],
  4011:  ["DFF_PST_DefaultRulerAtom"],
- 4023:  ["DFF_PST_FontEntityAtom"],
+ 4023:  ["DFF_PST_FontEntityAtom", pptrecord.FontEntity],
  4024:  ["DFF_PST_FontEmbedData"],
  4025:  ["DFF_PST_TypeFace"],
  4026:  ["DFF_PST_CString", pptrecord.UniString],