diff options
| author | Carsten Driesner <cd@openoffice.org> | 2011-01-17 15:06:54 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2011-01-17 15:06:54 +0100 |
| commit | 7f33ed417b2e29e5470724ea76967f64699a2662 (patch) | |
| tree | abfa1432c5ffffe4c7502d4ddcaee918c584c69c /sw/source/ui/ribbar/tbxanchr.cxx | |
| parent | 80731dbfcb48a2ffec30a4b2abe1ba8ada8f0169 (diff) | |
removetooltypes01: #i112600# Remove tools types from sw
Diffstat (limited to 'sw/source/ui/ribbar/tbxanchr.cxx')
| -rw-r--r-- | sw/source/ui/ribbar/tbxanchr.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/ui/ribbar/tbxanchr.cxx b/sw/source/ui/ribbar/tbxanchr.cxx index 6c20f9dd818d..31e3c21f5e13 100644 --- a/sw/source/ui/ribbar/tbxanchr.cxx +++ b/sw/source/ui/ribbar/tbxanchr.cxx @@ -61,7 +61,7 @@ SFX_IMPL_TOOLBOX_CONTROL(SwTbxAnchor, SfxUInt16Item); * Beschreibung: ******************************************************************************/ -SwTbxAnchor::SwTbxAnchor( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SwTbxAnchor::SwTbxAnchor( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), nActAnchorId(0) { @@ -80,7 +80,7 @@ SwTbxAnchor::SwTbxAnchor( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : * Beschreibung: ******************************************************************************/ -void SwTbxAnchor::StateChanged( USHORT /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) +void SwTbxAnchor::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) { GetToolBox().EnableItem( GetId(), (GetItemState(pState) != SFX_ITEM_DISABLED) ); @@ -148,8 +148,8 @@ void SwTbxAnchor::Click() aPopMenu.EnableItem( FN_TOOL_ANKER_FRAME, 0 != pWrtShell->IsFlyInFly() ); Rectangle aRect(GetToolBox().GetItemRect(GetId())); - USHORT nHtmlMode = ::GetHtmlMode((SwDocShell*)SfxObjectShell::Current()); - BOOL bHtmlModeNoAnchor = ( nHtmlMode & HTMLMODE_ON) && 0 == (nHtmlMode & HTMLMODE_SOME_ABS_POS); + sal_uInt16 nHtmlMode = ::GetHtmlMode((SwDocShell*)SfxObjectShell::Current()); + sal_Bool bHtmlModeNoAnchor = ( nHtmlMode & HTMLMODE_ON) && 0 == (nHtmlMode & HTMLMODE_SOME_ABS_POS); if (bHtmlModeNoAnchor || pWrtShell->IsInHeaderFooter()) aPopMenu.RemoveItem(aPopMenu.GetItemPos(FN_TOOL_ANKER_PAGE)); @@ -158,7 +158,7 @@ void SwTbxAnchor::Click() aPopMenu.CheckItem(nActAnchorId); - USHORT nSlotId = aPopMenu.Execute(&GetToolBox(), aRect); + sal_uInt16 nSlotId = aPopMenu.Execute(&GetToolBox(), aRect); GetToolBox().EndSelection(); if (nSlotId) |