diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-11-02 10:36:12 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-02 10:36:12 +0000 |
commit | de04c92dea40c906fdf2b9058bd3139134d62f15 (patch) | |
tree | 8a0f47492ed06900fd9fa97ed2ab3b63ffb72aae | |
parent | 7297ec19950c48f498d22bd88c1d3fccbe7d77ea (diff) |
make this build
-rw-r--r-- | sw/inc/cmdid.h | 2 | ||||
-rw-r--r-- | sw/source/ui/shells/tabsh.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/uiview/formatclipboard.cxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index fae2a9506e09..94d9692bbd21 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -614,7 +614,7 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_TABLE_MODE_FIX (FN_FORMAT + 189) /* table mode */ #define FN_TABLE_MODE_FIX_PROP (FN_FORMAT + 190) /* -"- */ #define FN_TABLE_MODE_VARIABLE (FN_FORMAT + 191) /* -"- */ -#define FN_TABLE_BOX_TEXTDIRECTION (FN_FORMAT + 192) /* text direction of table cells */ +#define FN_TABLE_BOX_TEXTORIENTATION (FN_FORMAT + 192) /* text orientation of table cells */ #define FN_TABLE_AUTOSUM (FN_FORMAT + 195) /* */ #define FN_SET_CONTROL_HANDLER (FN_FORMAT + 199) /* set macro */ diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index 44500b80fdac..3c892ad78443 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -140,7 +140,7 @@ const sal_uInt16 aUITableAttrRange[] = FN_TABLE_SET_VERT_ALIGN, FN_TABLE_SET_VERT_ALIGN, RES_FRAMEDIR, RES_FRAMEDIR, RES_ROW_SPLIT, RES_ROW_SPLIT, - FN_TABLE_BOX_TEXTDIRECTION, FN_TABLE_BOX_TEXTDIRECTION, + FN_TABLE_BOX_TEXTORIENTATION, FN_TABLE_BOX_TEXTORIENTATION, // #i29550# RES_COLLAPSING_BORDERS, RES_COLLAPSING_BORDERS, // <-- collapsing borders @@ -188,7 +188,7 @@ static SwTableRep* lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh ) // text direction in boxes SvxFrameDirectionItem aBoxDirection( FRMDIR_ENVIRONMENT, RES_FRAMEDIR ); if(rSh.GetBoxDirection( aBoxDirection )) - rSet.Put(aBoxDirection, FN_TABLE_BOX_TEXTDIRECTION); + rSet.Put(aBoxDirection, FN_TABLE_BOX_TEXTORIENTATION); sal_Bool bTableSel = rSh.IsTableMode(); if(!bTableSel) @@ -309,7 +309,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet, const SfxPoolItem* pSplit = 0; sal_Bool bRowSplit = SFX_ITEM_SET == rSet.GetItemState( RES_ROW_SPLIT, sal_False, &pSplit ); const SfxPoolItem* pBoxDirection = 0; - sal_Bool bBoxDirection = SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_BOX_TEXTDIRECTION, sal_False, &pBoxDirection ); + sal_Bool bBoxDirection = SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_BOX_TEXTORIENTATION, sal_False, &pBoxDirection ); if( bBackground || bBorder || bRowSplit || bBoxDirection) { /* diff --git a/sw/source/ui/uiview/formatclipboard.cxx b/sw/source/ui/uiview/formatclipboard.cxx index 0fa7a6a00071..a9bfa3f97c39 100644 --- a/sw/source/ui/uiview/formatclipboard.cxx +++ b/sw/source/ui/uiview/formatclipboard.cxx @@ -117,7 +117,7 @@ SfxItemSet* lcl_CreateEmptyItemSet( int nSelectionType, SfxItemPool& rPool RES_KEEP, RES_KEEP, RES_FRAMEDIR, RES_FRAMEDIR, FN_PARAM_TABLE_HEADLINE, FN_PARAM_TABLE_HEADLINE, - FN_TABLE_BOX_TEXTDIRECTION, FN_TABLE_BOX_TEXTDIRECTION, + FN_TABLE_BOX_TEXTORIENTATION, FN_TABLE_BOX_TEXTORIENTATION, FN_TABLE_SET_VERT_ALIGN, FN_TABLE_SET_VERT_ALIGN, 0); } @@ -158,7 +158,7 @@ void lcl_getTableAttributes( SfxItemSet& rSet, SwWrtShell &rSh ) SvxFrameDirectionItem aBoxDirection( FRMDIR_ENVIRONMENT, RES_FRAMEDIR ); if(rSh.GetBoxDirection( aBoxDirection )) - rSet.Put(aBoxDirection, FN_TABLE_BOX_TEXTDIRECTION); + rSet.Put(aBoxDirection, FN_TABLE_BOX_TEXTORIENTATION); rSet.Put(SfxUInt16Item(FN_TABLE_SET_VERT_ALIGN, rSh.GetBoxAlign())); @@ -255,7 +255,7 @@ void lcl_setTableAttributes( const SfxItemSet& rSet, SwWrtShell &rSh ) pFrmFmt->SetFmtAttr( *pItem ); } - if( SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_BOX_TEXTDIRECTION, sal_False, &pItem) ) + if( SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_BOX_TEXTORIENTATION, sal_False, &pItem) ) { SvxFrameDirectionItem aDirection( FRMDIR_ENVIRONMENT, RES_FRAMEDIR ); aDirection.SetValue(static_cast< const SvxFrameDirectionItem* >(pItem)->GetValue()); |