ooo-build r12143 - in trunk: . patches/src680

[michael svn gnome org]

Author: michael
Date: Thu Apr 10 09:24:59 2008
New Revision: 12143
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12143&view=rev

Log:
2008-04-10  Michael Meeks  <michael meeks novell com>

        * autogen.sh: re-use previous configure options if no options
        passed; sorry Radek, but ... had to commit.

        * patches/src680/spellcheck-fix.diff,
        * patches/src680/apply: fix spell-checking strangeness; thanks
        * to
        Petr & Florian for most of the isolation work.



Added:
   trunk/patches/src680/spellcheck-fix.diff
Modified:
   trunk/ChangeLog
   trunk/autogen.sh
   trunk/patches/src680/apply

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Thu Apr 10 09:24:59 2008
@@ -11,16 +11,18 @@
     exit 1;
 fi
 
-# autover=`automake --version | sed 's/^.*[      ]\([0-9.]*[a-z]*\).*$/\1/'`;
-# echo "autover: '$autover'";
-# exit 1;
+old_args=""
+if test "z$@" = "z" && test -f config.log; then
+    old_args=`grep '\$ ./configure' config.log | sed -e 's/.*configure //'`
+    echo "re-using arguments from last configure: $old_args";
+fi
 
 aclocal $ACLOCAL_FLAGS || exit 1;
 automake --gnu --add-missing --copy || exit 1;
 # intltoolize --copy --force --automake
 autoconf || exit 1;
 if test "x$NOCONFIGURE" = "x"; then
-    ./configure "$@"
+    ./configure "$@" "$old_args"
 else
     echo "Skipping configure process."
 fi

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Thu Apr 10 09:24:59 2008
@@ -355,6 +355,9 @@
 
 
 [ Fixes ]
+# fix strage spell-checking behaviour, n#377345, i#88120, michael
+spellcheck-fix.diff
+
 # sd printing fixes
 printing-bugfix-254573.diff, n#254573, rodo
 

Added: trunk/patches/src680/spellcheck-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/spellcheck-fix.diff	Thu Apr 10 09:24:59 2008
@@ -0,0 +1,15 @@
+Index: sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx,v
+retrieving revision 1.11.130.1
+diff -u -p -r1.11.130.1 SwSpellDialogChildWindow.cxx
+--- sw/source/ui/dialog/SwSpellDialogChildWindow.cxx	17 Jan 2008 16:08:49 -0000	1.11.130.1
++++ sw/source/ui/dialog/SwSpellDialogChildWindow.cxx	10 Apr 2008 08:17:11 -0000
+@@ -162,6 +162,7 @@ struct SpellState
+     SpellState() :
+         m_bInitialCall(true),
+         m_bLockFocus(false),
++        m_bLostFocus(false),
+         m_SpellStartPosition(SPELL_START_BODY),
+         m_bBodySpelled(false),
+         m_bOtherSpelled(false),