diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-04 09:38:25 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-04 09:38:25 +0000 |
| commit | 484928b52c190aad879aae7ca2e0352e23dbc681 (patch) | |
| tree | c59a4e25b637d8f219cd8e7c28b4db6f4414a6e1 /sc/source/filter/xml/xmlcelli.cxx | |
| parent | a6d424199e6ef6959abd0fdf8570f44c956fcabe (diff) | |
#i10000#:#i52188#: fix merge conflict resolution
Diffstat (limited to 'sc/source/filter/xml/xmlcelli.cxx')
| -rw-r--r-- | sc/source/filter/xml/xmlcelli.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 32488238cb40..b42de6af1d2c 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xmlcelli.cxx,v $ * - * $Revision: 1.86 $ + * $Revision: 1.87 $ * - * last change: $Author: hr $ $Date: 2005-09-28 12:05:52 $ + * last change: $Author: hr $ $Date: 2005-10-04 10:38:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -797,15 +797,15 @@ void ScXMLTableRowCellContext::SetAnnotation(const table::CellAddress& aCellAddr aEngine.SetParaAttribs(nPara, aSet); } } + ::std::auto_ptr< EditTextObject > pEditText( aEngine.CreateTextObject()); + aNote.SetEditTextObject(pEditText.get()); // if pEditText is NULL, then aNote.mpEditObj will be reset(). } - ::std::auto_ptr< EditTextObject > pEditText( aEngine.CreateTextObject()); - aNote.SetEditTextObject(pEditText.get()); // if pEditText is NULL, then aNote.mpEditObj will be reset(). + if (pMyAnnotation->pRect) + aNote.SetRectangle(*pMyAnnotation->pRect); + else + aNote.SetRectangle(aNote.MimicOldRectangle(ScAddress(static_cast<SCCOL>(aCellAddress.Column), static_cast<SCROW>(aCellAddress.Row), aCellAddress.Sheet))); + pDoc->SetNote(static_cast<SCCOL>(aCellAddress.Column), static_cast<SCROW>(aCellAddress.Row), aCellAddress.Sheet, aNote); } - if (pMyAnnotation->pRect) - aNote.SetRectangle(*pMyAnnotation->pRect); - else - aNote.SetRectangle(aNote.MimicOldRectangle(ScAddress(static_cast<SCCOL>(aCellAddress.Column), static_cast<SCROW>(aCellAddress.Row), aCellAddress.Sheet))); - pDoc->SetNote(static_cast<SCCOL>(aCellAddress.Column), static_cast<SCROW>(aCellAddress.Row), aCellAddress.Sheet, aNote); if (pMyAnnotation->bDisplay) { ScDetectiveFunc aDetFunc(pDoc, aCellAddress.Sheet); |