diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-05-10 16:00:34 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-05-10 16:00:34 +0000 |
| commit | 7588961606dbe20ebe32cf483f8124030ca16898 (patch) | |
| tree | 302d200d48853c1a70710b70af2205db2e2447f5 /sc | |
| parent | aa8f64dd7dbb662e77b2ff30dce17d29d1a8c106 (diff) | |
INTEGRATION: CWS pchfix04 (1.32.104); FILE MERGED
2007/04/26 04:25:23 hjs 1.32.104.2: RESYNC: (1.32-1.33); FILE MERGED
2007/02/05 08:35:36 os 1.32.104.1: #i73604# usage of ITEMID_* removed
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/view/formatsh.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 83b21d7918d8..3a1a063f4cef 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -4,9 +4,9 @@ * * $RCSfile: formatsh.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: rt $ $Date: 2007-04-26 09:56:52 $ + * last change: $Author: kz $ $Date: 2007-05-10 17:00:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -69,7 +69,7 @@ #include "scitems.hxx" #include <svx/eeitem.hxx> -#define ITEMID_FIELD EE_FEATURE_FIELD + #include <sfx2/app.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/objface.hxx> @@ -1074,13 +1074,13 @@ void ScFormatShell::ExecuteAlignment( SfxRequest& rReq ) case SID_ALIGN_ANY_HCENTER: case SID_ALIGN_ANY_RIGHT: case SID_ALIGN_ANY_JUSTIFIED: - pTabViewShell->ApplyAttr( SvxHorJustifyItem( lclConvertSlotToHAlign( nSlot ) ) ); + pTabViewShell->ApplyAttr( SvxHorJustifyItem( lclConvertSlotToHAlign( nSlot ), ATTR_HOR_JUSTIFY ) ); break; case SID_ALIGN_ANY_VDEFAULT: case SID_ALIGN_ANY_TOP: case SID_ALIGN_ANY_VCENTER: case SID_ALIGN_ANY_BOTTOM: - pTabViewShell->ApplyAttr( SvxVerJustifyItem( lclConvertSlotToVAlign( nSlot ) ) ); + pTabViewShell->ApplyAttr( SvxVerJustifyItem( lclConvertSlotToVAlign( nSlot ), ATTR_VER_JUSTIFY ) ); break; default: @@ -1104,10 +1104,10 @@ void ScFormatShell::ExecuteAlignment( SfxRequest& rReq ) break; case SID_H_ALIGNCELL: - pTabViewShell->ApplyAttr( SvxHorJustifyItem( (SvxCellHorJustify)((const SvxHorJustifyItem*)pItem)->GetValue() ) ); + pTabViewShell->ApplyAttr( SvxHorJustifyItem( (SvxCellHorJustify)((const SvxHorJustifyItem*)pItem)->GetValue(), ATTR_HOR_JUSTIFY ) ); break; case SID_V_ALIGNCELL: - pTabViewShell->ApplyAttr( SvxVerJustifyItem( (SvxCellVerJustify)((const SvxVerJustifyItem*)pItem)->GetValue() ) ); + pTabViewShell->ApplyAttr( SvxVerJustifyItem( (SvxCellVerJustify)((const SvxVerJustifyItem*)pItem)->GetValue(), ATTR_VER_JUSTIFY ) ); break; default: DBG_ERROR( "ExecuteAlignment: invalid slot" ); @@ -1183,7 +1183,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) if ( pCore && ((const SvxWeightItem*)pCore)->GetWeight() == WEIGHT_BOLD ) eWeight = WEIGHT_NORMAL; - aSetItem.PutItemForScriptType( nScript, SvxWeightItem( eWeight ) ); + aSetItem.PutItemForScriptType( nScript, SvxWeightItem( eWeight, ATTR_FONT_WEIGHT ) ); } pTabViewShell->ApplyUserItemSet( aSetItem.GetItemSet() ); pNewSet->Put( aSetItem.GetItemSet(), FALSE ); @@ -1208,7 +1208,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) if ( pCore && ((const SvxPostureItem*)pCore)->GetPosture() == ITALIC_NORMAL ) eItalic = ITALIC_NONE; - aSetItem.PutItemForScriptType( nScript, SvxPostureItem( eItalic ) ); + aSetItem.PutItemForScriptType( nScript, SvxPostureItem( eItalic, ATTR_FONT_POSTURE ) ); } pTabViewShell->ApplyUserItemSet( aSetItem.GetItemSet() ); pNewSet->Put( aSetItem.GetItemSet(), FALSE ); |