summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedricbosdo@openoffice.org>2011-03-01 16:17:12 +0100
committerCédric Bosdonnat <cedricbosdo@openoffice.org>2011-03-01 16:17:47 +0100
commit1db9795d26c32101314882acd91467507104a984 (patch)
treebae4aae3a9344e4a4b1e0f2164128223053f1a47
parente151045653a003c8d86fc377b3f830d60243cd39 (diff)
fdo#34565: Why checking on the default attribute to set the formula?
-rw-r--r--patches/dev300/fields-table-formula.diff5
1 files changed, 2 insertions, 3 deletions
diff --git a/patches/dev300/fields-table-formula.diff b/patches/dev300/fields-table-formula.diff
index ccdeaf880..c404fedaa 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();