summaryrefslogtreecommitdiff
path: root/sw/source/ui/shells/txtattr.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/shells/txtattr.cxx')
-rw-r--r--sw/source/ui/shells/txtattr.cxx86
1 files changed, 43 insertions, 43 deletions
diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx
index 9d90ac5d5b26..f699e2cc3853 100644
--- a/sw/source/ui/shells/txtattr.cxx
+++ b/sw/source/ui/shells/txtattr.cxx
@@ -89,12 +89,12 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq)
SwWrtShell &rSh = GetShell();
const SfxItemSet *pArgs = rReq.GetArgs();
int eState = STATE_TOGGLE;
- USHORT nWhich = rReq.GetSlot();
+ sal_uInt16 nWhich = rReq.GetSlot();
if(pArgs )
{
const SfxPoolItem* pItem;
- pArgs->GetItemState(nWhich, FALSE, &pItem);
+ pArgs->GetItemState(nWhich, sal_False, &pItem);
eState = ((const SfxBoolItem &) pArgs->
Get( nWhich )).GetValue() ? STATE_ON : STATE_OFF;
}
@@ -126,10 +126,10 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq)
SfxBindings& rBind = GetView().GetViewFrame()->GetBindings();
if( nWhich == FN_SET_SUB_SCRIPT )
rBind.SetState( SfxBoolItem( FN_SET_SUPER_SCRIPT,
- FALSE ) );
+ sal_False ) );
else
rBind.SetState( SfxBoolItem( FN_SET_SUB_SCRIPT,
- FALSE ) );
+ sal_False ) );
}
break;
@@ -191,7 +191,7 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq)
rSh.DontExpandFmt();
break;
default:
- ASSERT(FALSE, falscher Dispatcher);
+ ASSERT(sal_False, falscher Dispatcher);
return;
}
}
@@ -199,10 +199,10 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq)
void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq)
{
- USHORT nSlot = rReq.GetSlot();
+ sal_uInt16 nSlot = rReq.GetSlot();
const SfxItemSet* pArgs = rReq.GetArgs();
- BOOL bArgs = pArgs != 0 && pArgs->Count() > 0;
- int bGrow = FALSE;
+ sal_Bool bArgs = pArgs != 0 && pArgs->Count() > 0;
+ int bGrow = sal_False;
SwWrtShell& rWrtSh = GetShell();
SwTxtFmtColl* pColl = 0;
@@ -214,7 +214,7 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq)
pColl = 0;
}
SfxItemPool& rPool = GetPool();
- USHORT nWhich = rPool.GetWhich(nSlot);
+ sal_uInt16 nWhich = rPool.GetWhich(nSlot);
switch ( nSlot )
{
case FN_TXTATR_INET:
@@ -243,7 +243,7 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq)
break;
case FN_GROW_FONT_SIZE:
- bGrow = TRUE;
+ bGrow = sal_True;
// kein break !!
case FN_SHRINK_FONT_SIZE:
{
@@ -252,10 +252,10 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq)
SfxItemSet aAttrSet( rPool, aSetItem.GetItemSet().GetRanges() );
const SfxPoolItem* pI;
- static const USHORT aScrTypes[] = {
+ static const sal_uInt16 aScrTypes[] = {
SCRIPTTYPE_LATIN, SCRIPTTYPE_ASIAN, SCRIPTTYPE_COMPLEX, 0 };
- USHORT nScriptType = rWrtSh.GetScriptType();
- for( const USHORT* pScrpTyp = aScrTypes; *pScrpTyp; ++pScrpTyp )
+ sal_uInt16 nScriptType = rWrtSh.GetScriptType();
+ for( const sal_uInt16* pScrpTyp = aScrTypes; *pScrpTyp; ++pScrpTyp )
if( ( nScriptType & *pScrpTyp ) &&
0 != ( pI = aSetItem.GetItemOfScript( *pScrpTyp )))
{
@@ -291,7 +291,7 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq)
break;
default:
- ASSERT(FALSE, falscher Dispatcher);
+ ASSERT(sal_False, falscher Dispatcher);
return;
}
}
@@ -307,7 +307,7 @@ void lcl_SetAdjust(SvxAdjust eAdjst, SfxItemSet& rSet)
-void lcl_SetLineSpace(BYTE ePropL,SfxItemSet& rSet)
+void lcl_SetLineSpace(sal_uInt8 ePropL,SfxItemSet& rSet)
{
SvxLineSpacingItem aLineSpacing(ePropL, RES_PARATR_LINESPACING );
aLineSpacing.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
@@ -360,7 +360,7 @@ void SwTextShell::ExecParaAttr(SfxRequest &rReq)
void SwTextShell::ExecParaAttr(SfxRequest &rReq)
{
SvxAdjust eAdjst;
- BYTE ePropL;
+ sal_uInt8 ePropL;
const SfxItemSet* pArgs = rReq.GetArgs();
// gleich beide Attribute holen, ist nicht teuerer !!
@@ -369,7 +369,7 @@ void SwTextShell::ExecParaAttr(SfxRequest &rReq)
RES_FRAMEDIR, RES_FRAMEDIR,
0 );
- USHORT nSlot = rReq.GetSlot();
+ sal_uInt16 nSlot = rReq.GetSlot();
switch (nSlot)
{
case SID_ATTR_PARA_ADJUST:
@@ -395,7 +395,7 @@ void SwTextShell::ExecParaAttr(SfxRequest &rReq)
SET_ADJUST:
{
aSet.Put(SvxAdjustItem(eAdjst,RES_PARATR_ADJUST));
- rReq.AppendItem( SfxBoolItem( GetPool().GetWhich(nSlot), TRUE ) );
+ rReq.AppendItem( SfxBoolItem( GetPool().GetWhich(nSlot), sal_True ) );
}
break;
@@ -427,7 +427,7 @@ SET_LINESPACE:
case SID_ATTR_PARA_LEFT_TO_RIGHT :
case SID_ATTR_PARA_RIGHT_TO_LEFT :
{
- BOOL bSet = TRUE;
+ sal_Bool bSet = sal_True;
int eState = pArgs ? pArgs->GetItemState(nSlot) : SFX_ITEM_DISABLED;
if (pArgs && SFX_ITEM_SET == eState)
bSet = ((const SfxBoolItem&)pArgs->Get(nSlot)).GetValue();
@@ -442,8 +442,8 @@ SET_LINESPACE:
SfxItemSet aAdjustSet( GetPool(),
RES_PARATR_ADJUST, RES_PARATR_ADJUST );
GetShell().GetCurAttr(aAdjustSet);
- BOOL bChgAdjust = FALSE;
- SfxItemState eAdjustState = aAdjustSet.GetItemState(RES_PARATR_ADJUST, FALSE);
+ sal_Bool bChgAdjust = sal_False;
+ SfxItemState eAdjustState = aAdjustSet.GetItemState(RES_PARATR_ADJUST, sal_False);
if(eAdjustState >= SFX_ITEM_DEFAULT)
{
int eAdjust = (int)(( const SvxAdjustItem& )
@@ -453,7 +453,7 @@ SET_LINESPACE:
(SVX_ADJUST_RIGHT == eAdjust && SID_ATTR_PARA_LEFT_TO_RIGHT == nSlot);
}
else
- bChgAdjust = TRUE;
+ bChgAdjust = sal_True;
SvxFrameDirection eFrmDirection =
(SID_ATTR_PARA_LEFT_TO_RIGHT == nSlot) ?
@@ -474,7 +474,7 @@ SET_LINESPACE:
{
SvxNumRule aRule = pCurRule->MakeSvxNumRule();
- for(USHORT i = 0; i < aRule.GetLevelCount(); i++)
+ for(sal_uInt16 i = 0; i < aRule.GetLevelCount(); i++)
{
SvxNumberFormat aFmt(aRule.GetLevel(i));
if(SVX_ADJUST_LEFT == aFmt.GetNumAdjust())
@@ -490,7 +490,7 @@ SET_LINESPACE:
pCurRule->Get( 0 ).GetPositionAndSpaceMode() );
// <--
aSetRule.SetSvxRule( aRule, GetShell().GetDoc());
- aSetRule.SetAutoRule( TRUE );
+ aSetRule.SetAutoRule( sal_True );
// --> OD 2008-03-17 #refactorlists#
// no start or continuation of a list - list style is only changed
GetShell().SetCurNumRule( aSetRule, false );
@@ -501,7 +501,7 @@ SET_LINESPACE:
break;
default:
- ASSERT(FALSE, falscher Dispatcher);
+ ASSERT(sal_False, falscher Dispatcher);
return;
}
SwWrtShell& rWrtSh = GetShell();
@@ -525,9 +525,9 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq)
const SfxItemSet *pArgs = rReq.GetArgs();
const SfxPoolItem *pItem = 0;
- USHORT nSlot = rReq.GetSlot();
+ sal_uInt16 nSlot = rReq.GetSlot();
if(pArgs)
- pArgs->GetItemState(GetPool().GetWhich(nSlot), FALSE, &pItem);
+ pArgs->GetItemState(GetPool().GetWhich(nSlot), sal_False, &pItem);
switch ( nSlot )
{
case FN_DROP_CHAR_STYLE_NAME:
@@ -567,7 +567,7 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq)
{
rSh.StartAction();
rSh.StartUndo( UNDO_START );
- if ( SFX_ITEM_SET == aSet.GetItemState(HINT_END,FALSE,&pItem) )
+ if ( SFX_ITEM_SET == aSet.GetItemState(HINT_END,sal_False,&pItem) )
{
if ( ((SfxStringItem*)pItem)->GetValue().Len() )
rSh.ReplaceDropTxt(((SfxStringItem*)pItem)->GetValue());
@@ -604,7 +604,7 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq)
break;
default:
- ASSERT(FALSE, falscher Dispatcher);
+ ASSERT(sal_False, falscher Dispatcher);
return;
}
}
@@ -619,12 +619,12 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
rSh.GetCurAttr(aCoreSet); // *alle* Textattribute von der Core erfragen
SfxWhichIter aIter(rSet);
- USHORT nSlot = aIter.FirstWhich();
+ sal_uInt16 nSlot = aIter.FirstWhich();
sal_Bool bFlag = sal_False;
SfxBoolItem aFlagItem;
const SfxPoolItem* pItem = 0;
int eAdjust = -1; // Illegaler Wert, um DONTCARE zu erkennen
- SfxItemState eState = aCoreSet.GetItemState(RES_PARATR_ADJUST, FALSE, &pItem);
+ SfxItemState eState = aCoreSet.GetItemState(RES_PARATR_ADJUST, sal_False, &pItem);
if( SFX_ITEM_DEFAULT == eState )
pItem = &rPool.GetDefaultItem(RES_PARATR_ADJUST);
@@ -632,14 +632,14 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
eAdjust = (int)(( SvxAdjustItem* ) pItem)->GetAdjust();
short nEsc = 0;
- eState = aCoreSet.GetItemState(RES_CHRATR_ESCAPEMENT, FALSE, &pItem);
+ eState = aCoreSet.GetItemState(RES_CHRATR_ESCAPEMENT, sal_False, &pItem);
if( SFX_ITEM_DEFAULT == eState )
pItem = &rPool.GetDefaultItem(RES_CHRATR_ESCAPEMENT);
if( eState >= SFX_ITEM_DEFAULT )
nEsc = ((SvxEscapementItem* )pItem)->GetEsc();
- USHORT nLineSpace = 0;
- eState = aCoreSet.GetItemState(RES_PARATR_LINESPACING, FALSE, &pItem);
+ sal_uInt16 nLineSpace = 0;
+ eState = aCoreSet.GetItemState(RES_PARATR_LINESPACING, sal_False, &pItem);
if( SFX_ITEM_DEFAULT == eState )
pItem = &rPool.GetDefaultItem(RES_PARATR_LINESPACING);
if( SFX_ITEM_DEFAULT <= eState &&
@@ -699,7 +699,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
else
{
bFlag = SVX_ADJUST_BLOCK == eAdjust;
- USHORT nHtmlMode = GetHtmlMode(rSh.GetView().GetDocShell());
+ sal_uInt16 nHtmlMode = GetHtmlMode(rSh.GetView().GetDocShell());
if((nHtmlMode & HTMLMODE_ON) && !(nHtmlMode & (HTMLMODE_FULL_STYLES|HTMLMODE_FIRSTLINE) ))
{
rSet.DisableItem( nSlot );
@@ -722,7 +722,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
{
SvxScriptSetItem aSetItem( SID_ATTR_CHAR_FONTHEIGHT,
*rSet.GetPool() );
- aSetItem.GetItemSet().Put( aCoreSet, FALSE );
+ aSetItem.GetItemSet().Put( aCoreSet, sal_False );
if( !aSetItem.GetItemOfScript( rSh.GetScriptType() ))
rSet.DisableItem( nSlot );
nSlot = 0;
@@ -761,9 +761,9 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
else
{
// is the item set?
- USHORT nHtmlMode = GetHtmlMode(rSh.GetView().GetDocShell());
+ sal_uInt16 nHtmlMode = GetHtmlMode(rSh.GetView().GetDocShell());
if((!(nHtmlMode & HTMLMODE_ON) || (0 != (nHtmlMode & HTMLMODE_SOME_STYLES))) &&
- aCoreSet.GetItemState( RES_FRAMEDIR, FALSE ) >= SFX_ITEM_DEFAULT)
+ aCoreSet.GetItemState( RES_FRAMEDIR, sal_False ) >= SFX_ITEM_DEFAULT)
{
SvxFrameDirection eFrmDir = (SvxFrameDirection)
((const SvxFrameDirectionItem& )aCoreSet.Get(RES_FRAMEDIR)).GetValue();
@@ -791,10 +791,10 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
case RES_PARATR_DROP:
{
#if OSL_DEBUG_LEVEL > 1
- const SfxPoolItem& rItem = aCoreSet.Get(GetPool().GetWhich(nSlot), TRUE);
+ const SfxPoolItem& rItem = aCoreSet.Get(GetPool().GetWhich(nSlot), sal_True);
rSet.Put(rItem);
#else
- rSet.Put(aCoreSet.Get( GetPool().GetWhich(nSlot), TRUE));
+ rSet.Put(aCoreSet.Get( GetPool().GetWhich(nSlot), sal_True));
#endif
nSlot = 0;
}
@@ -816,10 +816,10 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
SfxItemSet aSet(GetPool(), RES_TXTATR_INETFMT, RES_TXTATR_INETFMT);
rSh.GetCurAttr(aSet);
#if OSL_DEBUG_LEVEL > 1
- const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT, TRUE);
+ const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT, sal_True);
rSet.Put(rItem);
#else
- rSet.Put(aSet.Get( RES_TXTATR_INETFMT, TRUE));
+ rSet.Put(aSet.Get( RES_TXTATR_INETFMT, sal_True));
#endif
nSlot = 0;
}
@@ -840,7 +840,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
nSlot = aIter.NextWhich();
}
- rSet.Put(aCoreSet,FALSE);
+ rSet.Put(aCoreSet,sal_False);
}
generated by cgit (git 2.34.1) at 2024-07-24 00:14:50 +0000