ooo-build r15579 - in branches/ooo-build-3-0-1: . bin patches/dev300

[rcabral svn gnome org]

Author: rcabral
Date: Thu Mar 19 16:41:26 2009
New Revision: 15579
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15579&view=rev

Log:
2009-03-19  Rafael Cabral  <cabral mandriva com>

        * patches/dev300/sw-table-crash-fix-i99564.diff,
        * patches/dev300/apply: fix some crashes on documents with
        certain complex table - backport from CWS fwk105 i#99564.
        * bin/package-ooo: these fixes affects only Mandriva:
        remove some gnome duplicates;
        push vclgtk on common for better look;
        move help files from lang to help;
        get rid of en_US help content from common - it was causing
        packaging conflicts and that content is already on help-en_US;
        place lang-en_US files on common since it's our default ooo lang;



Added:
   branches/ooo-build-3-0-1/patches/dev300/sw-table-crash-fix-i99564.diff
Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/bin/package-ooo
   branches/ooo-build-3-0-1/patches/dev300/apply

Modified: branches/ooo-build-3-0-1/bin/package-ooo
==============================================================================
--- branches/ooo-build-3-0-1/bin/package-ooo	(original)
+++ branches/ooo-build-3-0-1/bin/package-ooo	Thu Mar 19 16:41:26 2009
@@ -846,6 +846,36 @@
 		mv_file_between_flists /dev/null common_list.txt $OOINSTBASE/basis$VERSION/share/config/images_industrial.zip
 		mv_file_between_flists /dev/null common_list.txt $OOINSTBASE/basis$VERSION/share/config/images_tango.zip
 		mv_file_between_flists /dev/null common_list.txt $OOINSTBASE/basis$VERSION/share/config/images.zip
+
+               # mono
+               echo "$OOINSTBASE/ure/lib/cli_uno_bridge.dll.config" >> mono_list.txt
+               # gnome duplicates
+               mv gnome_list.txt gnome_list.txt_old
+               sed 's/^.*ucpgvfs1.*$//' gnome_list.txt_old > gnome_list.txt
+               echo $OOINSTBASE/basis$VERSION/program/ucpgvfs1.uno.so >> gnome_list.txt
+               rm -rf gnome_list.txt_old
+
+               # for a better look put lib gtk as default vcl plug
+               mv_file_between_flists common_list.txt gnome_list.txt $OOINSTBASE/basis$VERSION/program/libvclplug_gtkl.*.so
+
+               # moving some help files from lang to help packages
+               for l in `echo $OOO_LANGS_LIST`; do
+                   f=`echo $l | sed -e s/-/_/g `
+                   mv_file_between_flists help_${f}_list.txt lang_${f}_list.txt %dir.*/basis$VERSION/help.*
+                   mv_file_between_flists help_${f}_list.txt lang_${f}_list.txt $OOINSTBASE/basis$VERSION/help.*
+                   mv_file_between_flists help_${f}_list.txt lang_${f}_list.txt %dir.*/basis$VERSION/help/${l}.*
+                   mv_file_between_flists help_${f}_list.txt lang_${f}_list.txt $OOINSTBASE/basis$VERSION/help/${l}.*
+	       done
+               mv_file_between_flists help_en_US_list.txt lang_en_US_list.txt %dir.*/basis$VERSION/help/en.*
+               mv_file_between_flists help_en_US_list.txt lang_en_US_list.txt $OOINSTBASE/basis$VERSION/help/en.*
+               
+	       #get rid of help files from common since they are alredy in help_en_US
+               mv_file_between_flists /dev/null common_list.txt %dir.*/basis$VERSION/help.*
+	       mv_file_between_flists /dev/null common_list.txt $OOINSTBASE/basis$VERSION/help/en.*
+	       
+	       cat $BUILDDIR/lang_en_US_list.txt >> $BUILDDIR/common_list.txt
+               rm -rf $BUILDDIR/lang_en_US_list.txt
+
 	fi
 
 	# remove known duplicities to do not have files packaged in two packages

Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply	Thu Mar 19 16:41:26 2009
@@ -390,6 +390,9 @@
 # printf argumetns cleanup
 buildfix-fmtargs.diff, cabral
 
+# fix crashing tables on docs - i#99564,  mdv#48629
+sw-table-crash-fix-i99564.diff, cabral
+
 # some versions of neon report DAV:Collection instead of Collection
 # thanks Caolan for the fix
 ucb-neon-different-name.diff, i#98288, pmladek

Added: branches/ooo-build-3-0-1/patches/dev300/sw-table-crash-fix-i99564.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0-1/patches/dev300/sw-table-crash-fix-i99564.diff	Thu Mar 19 16:41:26 2009
@@ -0,0 +1,44 @@
+diff --git a/inc/pam.hxx b/inc/pam.hxx
+index 39a9343..1aee1ac 100644
+--- sw/inc/pam.hxx
++++ sw/inc/pam.hxx
+@@ -256,6 +256,8 @@ public:
+     { return *Start() <= rPos && rPos <= *End(); }
+     
+     static BOOL Overlap(const SwPaM & a, const SwPaM & b);
++    
++    static BOOL LessThan(const SwPaM & a, const SwPaM & b);
+ 
+ 	DECL_FIXEDMEMPOOL_NEWDEL(SwPaM);
+ 
+diff --git a/source/core/crsr/pam.cxx b/source/core/crsr/pam.cxx
+index 04de143..15cf4d9 100644
+--- sw/source/core/crsr/pam.cxx
++++ sw/source/core/crsr/pam.cxx
+@@ -1154,3 +1154,8 @@ BOOL SwPaM::Overlap(const SwPaM & a, const SwPaM & b)
+ {
+     return !(*b.End() <= *a.Start() || *a.End() <= *b.End());
+ }
++
++BOOL SwPaM::LessThan(const SwPaM & a, const SwPaM & b)
++{
++    return (*a.Start() < *b.Start()) || (*a.Start() == *b.Start() && *a.End() < *b.End()); 
++}
+diff --git a/source/filter/ww8/ww8par2.cxx b/source/filter/ww8/ww8par2.cxx
+index ff3ddb5..af0114c 100644
+--- sw/source/filter/ww8/ww8par2.cxx
++++ sw/source/filter/ww8/ww8par2.cxx
+@@ -3532,8 +3532,11 @@ void SwWW8ImplReader::TabCellEnd()
+     {
+         pTableDesc->TableCellEnd();
+ 
+-        if (bReadTable &&  pWFlyPara == NULL && mpTableEndPaM.get() != NULL && 
+-            ! SwPaM::Overlap(*pPaM, *mpTableEndPaM))
++        if (bReadTable 
++            && pWFlyPara == NULL 
++            && mpTableEndPaM.get() != NULL 
++            && (! SwPaM::Overlap(*pPaM, *mpTableEndPaM))
++            && SwPaM::LessThan(*mpTableEndPaM, *pPaM))
+         {
+             if (mpTableEndPaM->GetPoint()->nNode.GetNode().IsTxtNode())
+             {