[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/dev300

[Petr Mladek]

 patches/dev300/fields-table-formula.diff |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit a7ad9dfb29bc6096584880ee1a58356b083f44db
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Tue Mar 1 16:17:12 2011 +0100

    fdo#34565: Why checking on the default attribute to set the formula?
    
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/patches/dev300/fields-table-formula.diff b/patches/dev300/fields-table-formula.diff
index ccdeaf8..c404fed 100644
--- a/patches/dev300/fields-table-formula.diff
+++ b/patches/dev300/fields-table-formula.diff
@@ -1041,7 +1041,7 @@ diff --git sw/source/ui/shells/textsh1.cxx sw/source/ui/shells/textsh1.cxx
 index 760e4d7..50267b1 100644
 --- sw/source/ui/shells/textsh1.cxx
 +++ sw/source/ui/shells/textsh1.cxx
-@@ -769,8 +769,15 @@ void SwTextShell::Execute(SfxRequest &rReq)
+@@ -769,8 +769,14 @@ void SwTextShell::Execute(SfxRequest &rReq)
                  {
                      if( rWrtSh.IsCrsrInTbl() )
                      {
@@ -1052,8 +1052,7 @@ index 760e4d7..50267b1 100644
 +                        SwTblBoxFormula aTblBoxFormula( (SwTblBoxFormula&)aSet.Get( RES_BOXATR_FORMULA ) );
 +                        aTblBoxFormula.SetFormula( sFormula );
 +
-+                        if ( aSet.GetItemState( RES_BOXATR_FORMULA ) == SFX_ITEM_DEFAULT )
-+                            aSet.Put( aTblBoxFormula );
++                        aSet.Put( aTblBoxFormula );
 +
                          rWrtSh.SetTblBoxFormulaAttrs( aSet );
                          rWrtSh.UpdateTable();