ooo-build r11401 - in trunk: . bin patches/ooxml patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Thu Jan 24 12:52:46 2008
New Revision: 11401
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11401&view=rev

Log:
2008-01-24  Rene Engelhard  <rene debian org>

        * patches/src680/apply,
          patches/ooxml/cws-xmlfilter-sc-m3.diff,
          patches/ooxml/cws-xmlfilter-sc.diff: ooh680-m4


Added:
   trunk/patches/ooxml/cws-xmlfilter02-sc-m3.diff
      - copied unchanged from r11394, /trunk/patches/ooxml/cws-xmlfilter02-sc.diff
Modified:
   trunk/ChangeLog
   trunk/bin/package-ooo
   trunk/patches/ooxml/cws-xmlfilter02-sc.diff
   trunk/patches/src680/apply

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Thu Jan 24 12:52:46 2008
@@ -331,7 +331,6 @@
     # a symlink
     mkdir -p $PREFIX/include
     mkdir -p $DATADIR/idl
-    mkdir -p $DATADIR/xml
     mkdir -p $DATADIR/$OOOINSTALLDIRNAME/sdk
     mkdir -p $DOCDIR/sdk
     mv $OOINSTDIR/sdk/include      $PREFIX/include/$OOOINSTALLDIRNAME
@@ -339,7 +338,6 @@
         mv $OOINSTDIR/sdk/classes      $DATADIR/$OOOINSTALLDIRNAME/sdk/classes
     fi
     mv $OOINSTDIR/sdk/idl          $DATADIR/idl/$OOOINSTALLDIRNAME
-    mv $OOINSTDIR/sdk/xml          $DATADIR/xml/$OOOINSTALLDIRNAME
     mv $OOINSTDIR/sdk/docs         $DOCDIR/sdk
     mv $OOINSTDIR/sdk/share/readme $DOCDIR/sdk
     mv $OOINSTDIR/sdk/LICENSE*     $DOCDIR/sdk
@@ -353,7 +351,6 @@
     ln -sf $PREFIXBASE/include/$OOOINSTALLDIRNAME      $OOINSTDIR/sdk/include
     ln -sf $DATADIRBASE/$OOOINSTALLDIRNAME/sdk/classes $OOINSTDIR/sdk/classes
     ln -sf $DATADIRBASE/idl/$OOOINSTALLDIRNAME         $OOINSTDIR/sdk/idl
-    ln -sf $DATADIRBASE/xml/$OOOINSTALLDIRNAME         $OOINSTDIR/sdk/xml
     ln -sf $DOCDIRBASE/sdk/docs                        $OOINSTDIR/sdk/
     ln -sf $DOCDIRBASE/sdk/index.html                  $OOINSTDIR/sdk/index.html
     ln -sf $OOINSTBASE/sdk/examples                    $DOCDIR/sdk/examples
@@ -362,7 +359,6 @@
     sed -e "s|^\(%dir \)\?$OOINSTBASE/sdk/include|\1$PREFIXBASE/include/$OOOINSTALLDIRNAME|" \
 	-e "s|^\(%dir \)\?$OOINSTBASE/sdk/classes|\1$DATADIRBASE/$OOOINSTALLDIRNAME/sdk/classes|" \
 	-e "s|^\(%dir \)\?$OOINSTBASE/sdk/idl|\1$DATADIRBASE/idl/$OOOINSTALLDIRNAME|" \
-	-e "s|^\(%dir \)\?$OOINSTBASE/sdk/xml|\1$DATADIRBASE/xml/$OOOINSTALLDIRNAME|" \
 	-e "s|^\(%dir \)\?$OOINSTBASE/sdk/docs|\1$DOCDIRBASE/sdk/docs|" \
 	-e "s|^\(%dir \)\?$OOINSTBASE/sdk/share/readme|\1$DOCDIRBASE/sdk/readme|" \
 	-e "s|^$OOINSTBASE/sdk/LICENSE\(.*\)$|$DOCDIRBASE/sdk/LICENSE\1|" \
@@ -384,7 +380,6 @@
     echo "$OOINSTBASE/sdk/include"     >>$OODESTDIR/gid_Module_Root_SDK
     echo "$OOINSTBASE/sdk/classes"     >>$OODESTDIR/gid_Module_Root_SDK
     echo "$OOINSTBASE/sdk/idl"         >>$OODESTDIR/gid_Module_Root_SDK
-    echo "$OOINSTBASE/sdk/xml"         >>$OODESTDIR/gid_Module_Root_SDK
     echo "$OOINSTBASE/sdk/docs"        >>$OODESTDIR/gid_Module_Root_SDK
     echo "$OOINSTBASE/sdk/index.html"  >>$OODESTDIR/gid_Module_Root_SDK
     echo "$DOCDIRBASE/sdk/examples"    >>$OODESTDIR/gid_Module_Root_SDK

Modified: trunk/patches/ooxml/cws-xmlfilter02-sc.diff
==============================================================================
--- trunk/patches/ooxml/cws-xmlfilter02-sc.diff	(original)
+++ trunk/patches/ooxml/cws-xmlfilter02-sc.diff	Thu Jan 24 12:52:46 2008
@@ -2014,22 +2014,6 @@
  
          if( *p++ != '!' )
              return start;   // syntax error
-@@ -616,9 +621,14 @@ lcl_ScRange_Parse_XL_A1( ScRange& r,
-     }
- 
-     // prepare as if it's a singleton, in case we want to fall back */
--    r.aEnd = r.aStart;
-+    r.aEnd.SetCol( r.aStart.Col() );
-+    r.aEnd.SetRow( r.aStart.Row() );    // don't overwrite sheet number as parsed in lcl_ScRange_Parse_XL_Header
-     if( *tmp2 != ':' )
-+    {
-+        if ( !bOnlyAcceptSingle )
-+            nFlags &= ~SCA_VALID;   // when looking for a double ref, a single-cell ref must not be accepted
-         return nFlags;
-+    }
- 
-     p = tmp2;
-     tmp1 = lcl_a1_get_col( p+1, &r.aEnd, &nFlags2 );
 --- sc/source/core/tool/compiler.cxx	6 Jul 2007 12:34:52 -0000	1.70
 +++ sc/source/core/tool/compiler.cxx	12 Oct 2007 15:51:45 -0000	1.68.18.17
 @@ -47,6 +47,10 @@
@@ -3085,25 +3069,28 @@
              if (aIntName.Len())
              {
                  ScRawToken aToken;
-@@ -1367,13 +2023,18 @@ BOOL ScCompiler::IsOpCode( const String&
+@@ -1369,14 +1369,20 @@
                  bFound = TRUE;
              }
          }
 -    }
 -    if ( bFound && pRawToken->GetOpCode() == ocSub &&
--            (eLastOp == ocOpen || eLastOp == ocArrayOpen ||
+-            (eLastOp == ocOpen || eLastOp == ocSep || eLastOp == ocNegSub ||
+-             (eLastOp > ocEndDiv && eLastOp < ocEndBinOp) ||
 +    OpCode eOp;
-+    if (bFound && ((eOp = pRawToken->GetOpCode()) == ocSub || eOp == ocNegSub))
++    if ( bFound && ((eOp = pRawToken->GetOpCode()) == ocSub || eOp == ocNegSub))
 +    {
-+        bool bShouldBeNegSub = (eLastOp == ocOpen || eLastOp == ocArrayOpen ||
-              eLastOp == ocSep || eLastOp == ocNegSub ||
--             (eLastOp > ocEndDiv && eLastOp < ocEndBinOp)))
-+                (SC_OPCODE_START_BIN_OP <= eLastOp && eLastOp < SC_OPCODE_END_BIN_OP));
-+        if (bShouldBeNegSub && eOp == ocSub)
++    	bool bShouldBeNegSub = (eLastOp == ocOpen || eLastOp == ocSep || 
++	     eLastOp == ocNegSub ||
++             (SC_OPCODE_START_BIN_OP <= eLastOp && eLastOp < SC_OPCODE_END_BIN_OP) ||
+              eLastOp == ocArrayOpen ||
+-             eLastOp == ocArrayColSep || eLastOp == ocArrayRowSep))
++             eLastOp == ocArrayColSep || eLastOp == ocArrayRowSep);
++	if (bShouldBeNegSub && eOp == ocSub)
          pRawToken->NewOpCode( ocNegSub );
          //! if ocNegSub had ForceArray we'd have to set it here
-+        else if (!bShouldBeNegSub && eOp == ocNegSub)
-+            pRawToken->NewOpCode( ocSub );
++	else if (!bShouldBeNegSub && eOp == ocNegSub)
++	    pRawToken->NewOpCode( ocSub );
 +    }
      return bFound;
  }

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Thu Jan 24 12:52:46 2008
@@ -1514,8 +1514,13 @@
 #scsolver-enable-extension.diff
 
 
-[ OOXML ]
+[ OOXML < ooh680-m4 ]
+cws-xmlfilter02-sc-m3.diff
+
+[ OOXML >= ooh680-m4 ]
 cws-xmlfilter02-sc.diff
+
+[ OOXML ]
 cws-xmlfilter02-config_office.diff
 cws-xmlfilter02-filter.diff
 cws-xmlfilter02-goodies.diff