[Libreoffice-commits] .: 4 commits - autogen.sh patches/dev300

[Jan Holesovsky]

 autogen.sh                               |    2 --
 patches/dev300/apply                     |    5 +++--
 patches/dev300/fields-table-formula.diff |    2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit f9599ec26546a4bdb0a64fe4c51a9deb88c0940a
Merge: abbb12e... a200122...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Nov 25 21:21:33 2010 +0100

    Merge remote branch 'origin/libreoffice-3-3'

commit a2001222b8e0a11c86a8db975c603dfe41a9c859
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Nov 25 21:17:27 2010 +0100

    autogen: Do not setup autorebase for git's pull any more.

diff --git a/autogen.sh b/autogen.sh
index c4bdb86..141e4cb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -47,6 +47,4 @@ if [ -d .git ] ; then
             ln -s "../../git-hooks/$file" "$hook"
         fi
     done
-    git config branch.master.rebase true
-    git config branch.autosetuprebase always
 fi
commit 87be615e7da9a05412e221b6f32205d7d1ca7f6e
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Nov 25 21:04:56 2010 +0100

    fix fields-table-formula.diff to apply after the OSL_ENSURE change

diff --git a/patches/dev300/fields-table-formula.diff b/patches/dev300/fields-table-formula.diff
index b00fdab..e809488 100644
--- a/patches/dev300/fields-table-formula.diff
+++ b/patches/dev300/fields-table-formula.diff
@@ -993,7 +993,7 @@ index c3beb63..1278fc7 100644
 +                                    sal_Bool bTextValue,
 +                                    sal_Bool bWWFormula )
  {
-     ASSERT( nCurCol < GetColumnCount(),
+     OSL_ENSURE( nCurCol < GetColumnCount(),
              "SwXMLTableContext::InsertCell: row is full" );
 @@ -1686,7 +1700,7 @@ void SwXMLTableContext::InsertCell( const OUString& rStyleName,
              GetCell( nRowsReq-j, nColsReq-i )
commit 84c313f10077b506f380ee6ddca90c67e61d629d
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Nov 25 20:13:55 2010 +0100

    do not enable the layout dialogs by default
    
    there are still problems with them (resizing, look, ...)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index e9713c5..cce9df3 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1665,8 +1665,9 @@ layout-localize-fix-sc.diff
 toolkit-layout-gcc-4.3.2-hack.diff, pmladek
 
 # Enable layout'ed dialogs.
-layout-default-enable-config_office.diff, janneke
-layout-disable-experimental.diff
+# FIXME: do not enable the layout dialogs by default; there are still problems with them (resizing, look, ...)
+#layout-default-enable-config_office.diff, janneke
+#layout-disable-experimental.diff
 layout-accessibility-dispose-only-once.diff, n#500267, janneke
 buildfix-toolkit-workben-layout.diff
 buildfix-svx-uiconfig-layout.diff