diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 11:38:37 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 11:38:37 +0000 |
| commit | 209ee0bc3732fcf1fde47034c6ba5f848279a19e (patch) | |
| tree | 92f9a3ce05dd5a2b4cadb1e40e5ed1efa79c55e3 /sc/source/core | |
| parent | 756e9e795ad4b1a536a32e806a0642a35c16e932 (diff) | |
INTEGRATION: CWS calc27 (1.18.10); FILE MERGED
2004/12/17 14:38:51 jmarmion 1.18.10.1: #i36667# - support the EditTextObject() paragraph alignment for Notes.
Diffstat (limited to 'sc/source/core')
| -rw-r--r-- | sc/source/core/tool/detfunc.cxx | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx index b0aaba6d5ccb..b4b31c39a3e0 100644 --- a/sc/source/core/tool/detfunc.cxx +++ b/sc/source/core/tool/detfunc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: detfunc.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: obo $ $Date: 2004-11-15 16:42:44 $ + * last change: $Author: rt $ $Date: 2005-01-11 12:38:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,9 +69,6 @@ #include "scitems.hxx" #include <svtools/colorcfg.hxx> -#ifndef _SVX_ADJITEM_HXX -#include <svx/adjitem.hxx> -#endif #include <svx/eeitem.hxx> #include <svx/outlobj.hxx> #include <svx/sdshitm.hxx> @@ -901,6 +898,7 @@ SdrObject* ScDetectiveFunc::DrawCaption( SCCOL nCol, SCROW nRow, const String& r else { pPage->InsertObject( pCaption ); + pCaption->SetMergedItemSetAndBroadcast(rAttrSet); // Keep the existing rectangle size. if(!bNewNote) @@ -914,16 +912,8 @@ SdrObject* ScDetectiveFunc::DrawCaption( SCCOL nCol, SCROW nRow, const String& r OutlinerParaObject* pOPO = new OutlinerParaObject( *pEditText ); pOPO->SetOutlinerMode( OUTLINERMODE_TEXTOBJECT ); pCaption->NbcSetOutlinerParaObject( pOPO ); - // EE_* items must be applied after NbcSetOutlinerParaObject() - const SfxPoolItem* pItem = NULL; - if (rAttrSet.GetItemState(EE_PARA_JUST,TRUE,&pItem) == SFX_ITEM_SET) - { - SvxAdjust eEEAlign = static_cast< const SvxAdjustItem& >( rAttrSet.Get( EE_PARA_JUST ) ).GetAdjust() ; - pCaption->SetMergedItem( SvxAdjustItem( eEEAlign, EE_PARA_JUST)); - } } } - pCaption->SetMergedItemSetAndBroadcast(rAttrSet); } if (bHasUserText) |