[Libreoffice-commits] .: 2 commits - doc/sw-flr.otl patches/dev300

[Cédric Bosdonnat]

 doc/sw-flr.otl                           |    8 ++++----
 patches/dev300/fields-table-formula.diff |    5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 1db9795d26c32101314882acd91467507104a984
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?

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();
commit e151045653a003c8d86fc377b3f830d60243cd39
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Tue Mar 1 16:15:26 2011 +0100

    Some more precise infos on sw attributes

diff --git a/doc/sw-flr.otl b/doc/sw-flr.otl
index 79ede17..058cece 100644
--- a/doc/sw-flr.otl
+++ b/doc/sw-flr.otl
@@ -23,10 +23,10 @@ Core
 			: Text nodes are using tool strings, which are only 16bits index.
 			: Paragraphs can't then be longer than 65k characters.
 		Formatting
-			: The formatting is stored in SwTxtNode::m_pSwpHints. One
-			: formatting is one hint. A hint is composed by a start and an
-			: end. For example, if "Cell1" is bold on the "Cell" word, then
-			: the hint will be "Bold [0,4)"
+			: The formatting is stored in SwTxtNode::m_pSwpHints and/or
+			: SwTxtNode::mpAttrSet. One formatting is one hint. A hint is composed
+			: by a start and an end. For example, if "Cell1" is bold on the "Cell"
+			: word, then the hint will be "Bold [0,4)"
 			:
 			: Some text attributes have a CJK (or even BiDi) equivalent
 			: attribute. OOo and MSO seems to have some problems on that part