summaryrefslogtreecommitdiff
path: root/sd/source/ui/view/drtxtob1.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/view/drtxtob1.cxx')
-rwxr-xr-xsd/source/ui/view/drtxtob1.cxx52
1 files changed, 26 insertions, 26 deletions
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 4a6d83e376e7..9c2fc112cf3c 100755
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -94,15 +94,15 @@ void TextObjectBar::Execute( SfxRequest &rReq )
{
const SfxItemSet* pArgs = rReq.GetArgs();
const SfxPoolItem* pPoolItem = NULL;
- USHORT nSlot = rReq.GetSlot();
- BOOL bOutlineMode = FALSE;
+ sal_uInt16 nSlot = rReq.GetSlot();
+ sal_Bool bOutlineMode = sal_False;
OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
std::auto_ptr< OutlineViewModelChangeGuard > aGuard;
if (mpView->ISA(OutlineView))
{
- bOutlineMode = TRUE;
+ bOutlineMode = sal_True;
pOLV = static_cast<OutlineView*>(mpView)
->GetViewByWindow(mpViewShell->GetActiveWindow());
@@ -148,14 +148,14 @@ void TextObjectBar::Execute( SfxRequest &rReq )
{
ESelection aSel = pOLV->GetSelection();
aSel.Adjust();
- ULONG nStartPara = aSel.nStartPara;
- ULONG nEndPara = aSel.nEndPara;
+ sal_uLong nStartPara = aSel.nStartPara;
+ sal_uLong nEndPara = aSel.nEndPara;
if( !aSel.HasRange() )
{
nStartPara = 0;
nEndPara = pOLV->GetOutliner()->GetParagraphCount() - 1;
}
- for( ULONG nPara = nStartPara; nPara <= nEndPara; nPara++ )
+ for( sal_uLong nPara = nStartPara; nPara <= nEndPara; nPara++ )
{
SfxStyleSheet* pStyleSheet = NULL;
if (pOLV->GetOutliner() != NULL)
@@ -163,8 +163,8 @@ void TextObjectBar::Execute( SfxRequest &rReq )
if (pStyleSheet != NULL)
{
SfxItemSet aAttr( pStyleSheet->GetItemSet() );
- SfxItemSet aTmpSet( pOLV->GetOutliner()->GetParaAttribs( (USHORT) nPara ) );
- aAttr.Put( aTmpSet, FALSE ); // FALSE= InvalidItems nicht als Default, sondern als "Loecher" betrachten
+ SfxItemSet aTmpSet( pOLV->GetOutliner()->GetParaAttribs( (sal_uInt16) nPara ) );
+ aAttr.Put( aTmpSet, sal_False ); // sal_False= InvalidItems nicht als Default, sondern als "Loecher" betrachten
const SvxULSpaceItem& rItem = (const SvxULSpaceItem&) aAttr.Get( EE_PARA_ULSPACE );
SvxULSpaceItem* pNewItem = (SvxULSpaceItem*) rItem.Clone();
@@ -176,7 +176,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
nUpper -= 100;
nUpper = Max( (long) nUpper, 0L );
}
- pNewItem->SetUpper( (USHORT) nUpper );
+ pNewItem->SetUpper( (sal_uInt16) nUpper );
long nLower = pNewItem->GetLower();
if( nSlot == SID_PARASPACE_INCREASE )
@@ -186,12 +186,12 @@ void TextObjectBar::Execute( SfxRequest &rReq )
nLower -= 100;
nLower = Max( (long) nLower, 0L );
}
- pNewItem->SetLower( (USHORT) nLower );
+ pNewItem->SetLower( (sal_uInt16) nLower );
SfxItemSet aNewAttrs( aAttr );
aNewAttrs.Put( *pNewItem );
delete pNewItem;
- pOLV->GetOutliner()->SetParaAttribs( (USHORT)nPara, aNewAttrs );
+ pOLV->GetOutliner()->SetParaAttribs( (sal_uInt16)nPara, aNewAttrs );
}
}
}
@@ -217,7 +217,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
nUpper -= 100;
nUpper = Max( (long) nUpper, 0L );
}
- pNewItem->SetUpper( (USHORT) nUpper );
+ pNewItem->SetUpper( (sal_uInt16) nUpper );
long nLower = pNewItem->GetLower();
if( nSlot == SID_PARASPACE_INCREASE )
@@ -227,7 +227,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
nLower -= 100;
nLower = Max( (long) nLower, 0L );
}
- pNewItem->SetLower( (USHORT) nLower );
+ pNewItem->SetLower( (sal_uInt16) nLower );
aNewAttrs.Put( *pNewItem );
delete pNewItem;
@@ -240,7 +240,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
Invalidate();
// Um die Preview (im Gliederungsmodus) zu aktualisieren muss
// der Slot invalidiert werden:
- mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE );
+ mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, sal_True, sal_False );
}
break;
@@ -253,7 +253,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
// Ensure bold/italic etc. icon state updates
Invalidate();
// #96551# trigger preview refresh
- mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE );
+ mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, sal_True, sal_False );
}
rReq.Done();
}
@@ -268,7 +268,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
// Ensure bold/italic etc. icon state updates
Invalidate();
// #96551# trigger preview refresh
- mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE );
+ mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, sal_True, sal_False );
}
rReq.Done();
}
@@ -281,7 +281,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
pOLV->AdjustHeight( -1 );
// #96551# trigger preview refresh
- mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE );
+ mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, sal_True, sal_False );
}
rReq.Done();
}
@@ -294,7 +294,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
pOLV->AdjustHeight( 1 );
// #96551# trigger preview refresh
- mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE );
+ mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, sal_True, sal_False );
}
rReq.Done();
}
@@ -312,7 +312,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
rReq.Done( aAttr );
mpView->SetAttributes( aAttr );
Invalidate();
- mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE );
+ mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, sal_True, sal_False );
}
break;
@@ -488,7 +488,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
{
if( pArgs )
{
- if( SFX_ITEM_SET == pArgs->GetItemState( EE_CHAR_FONTINFO, TRUE, &pPoolItem ) )
+ if( SFX_ITEM_SET == pArgs->GetItemState( EE_CHAR_FONTINFO, sal_True, &pPoolItem ) )
aNewAttr.Put( *pPoolItem );
}
else
@@ -500,7 +500,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
{
if( pArgs )
{
- if( SFX_ITEM_SET == pArgs->GetItemState( EE_CHAR_FONTHEIGHT, TRUE, &pPoolItem ) )
+ if( SFX_ITEM_SET == pArgs->GetItemState( EE_CHAR_FONTHEIGHT, sal_True, &pPoolItem ) )
aNewAttr.Put( *pPoolItem );
}
else
@@ -510,7 +510,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
break;
case SID_ATTR_CHAR_COLOR:
{
- if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( EE_CHAR_COLOR, TRUE, &pPoolItem ) )
+ if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( EE_CHAR_COLOR, sal_True, &pPoolItem ) )
aNewAttr.Put( *pPoolItem );
}
break;
@@ -550,8 +550,8 @@ void TextObjectBar::Execute( SfxRequest &rReq )
{
sal_Bool bLeftToRight = nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT;
- USHORT nAdjust = SVX_ADJUST_LEFT;
- if( SFX_ITEM_ON == aEditAttr.GetItemState(EE_PARA_JUST, TRUE, &pPoolItem ) )
+ sal_uInt16 nAdjust = SVX_ADJUST_LEFT;
+ if( SFX_ITEM_ON == aEditAttr.GetItemState(EE_PARA_JUST, sal_True, &pPoolItem ) )
nAdjust = ( (SvxAdjustItem*)pPoolItem)->GetEnumValue();
if( bLeftToRight )
@@ -578,7 +578,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
nSlot == SID_ATTR_CHAR_WEIGHT )
{
// #i78017 establish the same behaviour as in Writer
- USHORT nScriptType = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX;
+ sal_uInt16 nScriptType = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX;
if (nSlot == SID_ATTR_CHAR_FONT)
nScriptType = mpView->GetScriptType();
@@ -598,7 +598,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
// Um die Preview (im Gliederungsmodus) zu aktualisieren muss
// der Slot invalidiert werden:
- mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE );
+ mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, sal_True, sal_False );
}
break;
}
generated by cgit (git 2.34.1) at 2024-07-18 09:21:18 +0000