[ooo-build-commit] .: 2 commits - bin/build-ooo patches/dev300

[Jan Holesovsky]

 bin/build-ooo                                        |    3 
 patches/dev300/oox-pptx-export-para-linespacing.diff |   66 +++++++++----------
 2 files changed, 34 insertions(+), 35 deletions(-)

New commits:
commit 02d7ce9793be3b830cf830c83b4ff1b187d2e08e
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Sep 17 17:09:03 2010 +0200

    Call autogen.sh in build-ooo, instead of only aclocal + configure.

diff --git a/bin/build-ooo b/bin/build-ooo
index 716718a..1d78ea2 100755
--- a/bin/build-ooo
+++ b/bin/build-ooo
@@ -45,13 +45,12 @@ else
 fi
 rm -f config.cache
 echo "configuring ...";
-autoconf || exit 1;
 
 echo "Env for configure:"
 set
 echo "Env for configure ends"
 
-eval ./configure "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1;
+eval ./autogen.sh "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1;
 
 # Final build preparation
 
commit 8b9a2760e907cd2d3364f79e3278b109ca04f43e
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Sep 17 16:34:40 2010 +0200

    Updated few patches to apply/build again.

diff --git a/patches/dev300/oox-pptx-export-para-linespacing.diff b/patches/dev300/oox-pptx-export-para-linespacing.diff
index 2e56295..b7997e8 100644
--- a/patches/dev300/oox-pptx-export-para-linespacing.diff
+++ b/patches/dev300/oox-pptx-export-para-linespacing.diff
@@ -84,31 +84,31 @@ index 752ead6..73f5f3e 100644
 +        OString name = OUStringToOString( props [i].Name, RTL_TEXTENCODING_UTF8);
 +        fprintf (stderr,"%30s = ", name.getStr() );
 +
-+    try {
-+        Any value = rXPropSet->getPropertyValue( props [i].Name );
-+
-+        OUString strValue;
-+        sal_Int32 intValue;
-+        bool boolValue;
-+    LineSpacing spacing;
-+//         RectanglePoint pointValue;
-+
-+        if( value >>= strValue )
-+            fprintf (stderr,"\"%s\"\n", USS( strValue ) );
-+        else if( value >>= intValue )
-+            fprintf (stderr,"%d            (hex: %x)\n", intValue, intValue);
-+        else if( value >>= boolValue )
-+            fprintf (stderr,"%d            (bool)\n", boolValue);
-+    else if( value >>= spacing ) {
-+        fprintf (stderr, "mode: %d value: %d\n", spacing.Mode, spacing.Height);
-+    }
-+//         else if( value >>= pointValue )
-+//             fprintf (stderr,"%d            (RectanglePoint)\n", pointValue);
-+        else
-+            fprintf (stderr,"???           <unhandled type>\n");
-+    } catch(Exception e) {
-+        fprintf (stderr,"unable to get '%s' value\n", USS(props [i].Name));
-+    }
++        try {
++            Any value = rXPropSet->getPropertyValue( props [i].Name );
++       
++            OUString strValue;
++            sal_Int32 intValue;
++            bool boolValue;
++            LineSpacing spacing;
++//             RectanglePoint pointValue;
++       
++            if( value >>= strValue )
++                fprintf (stderr,"\"%s\"\n", USS( strValue ) );
++            else if( value >>= intValue )
++                fprintf (stderr,"%d            (hex: %x)\n", intValue, intValue);
++            else if( value >>= boolValue )
++                fprintf (stderr,"%d            (bool)\n", boolValue);
++            else if( value >>= spacing ) {
++                fprintf (stderr, "mode: %d value: %d\n", spacing.Mode, spacing.Height);
++            }
++//             else if( value >>= pointValue )
++//                 fprintf (stderr,"%d            (RectanglePoint)\n", pointValue);
++            else
++                fprintf (stderr,"???           <unhandled type>\n");
++        } catch(Exception e) {
++            fprintf (stderr,"unable to get '%s' value\n", USS(props [i].Name));
++        }
 +    }
 +}
 +);
@@ -158,20 +158,20 @@ index 752ead6..73f5f3e 100644
      if( nLevel != -1
 -            || nLeftMargin > 0
 -            || nAlignment != style::ParagraphAdjust_LEFT ) {
-+    || nLeftMargin > 0
-+    || nAlignment != style::ParagraphAdjust_LEFT
-+    || bHasLinespacing ) {
++            || nLeftMargin > 0
++            || nAlignment != style::ParagraphAdjust_LEFT
++            || bHasLinespacing ) {
          mpFS->startElementNS( XML_a, XML_pPr,
                                XML_lvl, nLevel > 0 ? I32S( nLevel ) : NULL,
                                XML_marL, nLeftMargin > 0 ? IS( nLeftMargin ) : NULL,
                                XML_algn, GetAlignment( nAlignment ),
                                FSEND );
  
-+    if( bHasLinespacing ) {
-+        mpFS->startElementNS( XML_a, XML_lnSpc, FSEND );
-+        WriteLinespacing( aLineSpacing );
-+        mpFS->endElementNS( XML_a, XML_lnSpc );
-+    }
++        if( bHasLinespacing ) {
++            mpFS->startElementNS( XML_a, XML_lnSpc, FSEND );
++            WriteLinespacing( aLineSpacing );
++            mpFS->endElementNS( XML_a, XML_lnSpc );
++        }
 +
          WriteParagraphNumbering( rXPropSet, nLevel );